Allow picking the same widget in custom widget gallery (#1327)

gristlabs · Dec 3, 2024 · 40ff38f · 40ff38f
1 parent ef3e816
commit 40ff38f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/app/client/ui/CustomWidgetGallery.ts b/app/client/ui/CustomWidgetGallery.ts
@@ -102,20 +102,9 @@ class CustomWidgetGallery extends Disposable {
       }
     });
 
-    this._saveDisabled = Computed.create(this, use => {
+    this._saveDisabled = Computed.create(this, (use) => {
       const selectedWidgetId = use(this._selectedWidgetId);
-      if (!selectedWidgetId) { return true; }
-      if (!this._section) { return false; }
-
-      const savedWidgetId = use(this._savedWidgetId);
-      if (selectedWidgetId === CUSTOM_URL_WIDGET_ID) {
-        return (
-          use(this._savedWidgetId) === CUSTOM_URL_WIDGET_ID &&
-          use(this._customUrl) === use(this._section.customDef.url)
-        );
-      } else {
-        return selectedWidgetId === savedWidgetId;
-      }
+      return selectedWidgetId === null;
     });
 
     this._initializeWidgets().catch(reportError);

diff --git a/test/nbrowser/CustomWidgets.ts b/test/nbrowser/CustomWidgets.ts
@@ -674,6 +674,13 @@ describe('CustomWidgets', function () {
         (done: any) => (window as any).gristApp?.topAppModel.testReloadWidgets().then(done).catch(done) || done()
       );
     });
+
+    it("allows picking the same widget", async () => {
+      await gu.setCustomWidget(/W1/);
+      assert.equal(await gu.getCustomWidgetName(), "W1");
+      await gu.setCustomWidget(/W1/);
+      assert.equal(await gu.getCustomWidgetName(), "W1");
+    });
   });
 
   describe('gristApiSupport', async ()=>{