Merge pull request #40 from ChenglongMa/fix-dialog-bug

Fix dialog bug

README.md

@@ -44,21 +44,35 @@ A plugin that does one thing only: **Detect** and **Manage** duplicate items in
 
 # Changelog
 
-## v3.0.1
+## v3.0.2
 
 <details markdown="1" open>
   <summary><i>Click here to show more.</i></summary>
 
 In this version, we have made the following changes:
 
+1. 🐛 **FIX!**: We have fixed the progress window icon bug in Zotero 7.0.0-beta.77.
+2. 🧬 **CHANGE!**: We have updated the style of duplicate detection dialog.
+3. 🧬 **CHANGE!**: We have updated the icon style in preference pane.
+4. 🧬 **CHANGE!**: Items with different `itemType` will not be considered as duplicates.
+
+</details>
+
+## v3.0.1
+
+<details markdown="1">
+  <summary><i>Click here to show more.</i></summary>
+
+In this version, we have made the following changes:
+
 1. 🧬 **CHANGE!**: We have updated the UI of buttons in the duplicate pane.
 2. 🐛 **FIX!**: We have optimized the performance of duplicate search and detection.
 
 </details>
 
 ## v3.0.0
 
-<details markdown="1" open>
+<details markdown="1">
   <summary><i>Click here to show more.</i></summary>
 
 In this version, we have made the following changes:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoplicate",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Detect and manage duplicate items in Zotero.",
   "config": {
     "addonName": "Zoplicate",

src/modules/duplicates.ts

@@ -158,6 +158,25 @@ export class Duplicates {
       savePreference: false,
       defaultAction: Action.CANCEL,
       loadCallback: () => {
+        const cssFiles = [
+          "chrome://global/skin/",
+          "chrome://zotero/skin/zotero.css",
+          "chrome://zotero/skin/overlay.css",
+          "chrome://zotero-platform/content/overlay.css",
+          "chrome://zotero-platform/content/zotero.css",
+        ];
+        ztoolkit.log("this.document", this.document)
+        cssFiles.forEach((css) => {
+          this.document?.head.appendChild(
+            ztoolkit.UI.createElement(this.document, "link", {
+              properties: {
+                rel: "stylesheet",
+                href: css,
+              },
+            }),
+          );
+        });
+
         const defaultActionOptions = this.document?.getElementById(
           `act_${this.dialogData.defaultAction}`,
         ) as HTMLInputElement;

src/modules/merger.ts

@@ -2,11 +2,16 @@ export async function merge(
   masterItem: Zotero.Item,
   otherItems: Zotero.Item[], // Already sorted
 ): Promise<any> {
-
   Zotero.CollectionTreeCache.clear();
 
-  const masterJSON = masterItem.toJSON();
+  const masterItemType = masterItem.itemTypeID;
+  otherItems = otherItems.filter((item) => item.itemTypeID === masterItemType);
+  if (otherItems.length === 0) {
 
+    return;
+  }
+
+  const masterJSON = masterItem.toJSON();
   const candidateJSON: {
     [field in Zotero.Item.DataType]?: string | unknown;
   } = otherItems.reduce((acc, obj) => ({ ...acc, ...obj.toJSON() }), {});

src/utils/ztoolkit.ts

@@ -22,7 +22,8 @@ function initZToolkit(_ztoolkit: ReturnType<typeof createZToolkit>) {
   _ztoolkit.UI.basicOptions.ui.enableElementDOMLog = enableUILog;
   _ztoolkit.basicOptions.debug.disableDebugBridgePassword = __env__ === "development";
   _ztoolkit.basicOptions.api.pluginID = config.addonID;
-  _ztoolkit.ProgressWindow.setIconURI("default", `chrome://${config.addonRef}/content/icons/preficon.svg`);
+  // TODO: Uncomment the following line to set the icon URI for the progress window
+  // _ztoolkit.ProgressWindow.setIconURI("default", `chrome://${config.addonRef}/content/icons/preficon.svg`);
 }
 
 import { BasicTool, makeHelperTool, unregister } from "zotero-plugin-toolkit/dist/basic";

update-beta.json

@@ -3,7 +3,7 @@
     "zoplicate@chenglongma.com": {
       "updates": [
         {
-          "version": "3.0.1",
+          "version": "3.0.2",
           "update_link": "https://github.com/ChenglongMa/zoplicate/releases/latest/download/zoplicate.xpi",
           "applications": {
             "zotero": {

update.json

@@ -3,7 +3,7 @@
     "zoplicate@chenglongma.com": {
       "updates": [
         {
-          "version": "3.0.1",
+          "version": "3.0.2",
           "update_link": "https://github.com/ChenglongMa/zoplicate/releases/latest/download/zoplicate.xpi",
           "applications": {
             "zotero": {