@truedat/dd 8.10.5 → 8.10.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.10.5",
+  "version": "8.10.7",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -54,7 +54,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.10.5",
+    "@truedat/test": "8.10.7",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -89,5 +89,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "59a1ba19e914ae07d503aa2eea46d77ea11f05ab"
+  "gitHead": "9b9c72e7d3045158547a4ae9fbc4b73a62283ed8"
 }

package/src/components/GrantRequestsDownloadButton.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import { useEffect } from "react";
 import PropTypes from "prop-types";
-import { Button } from "semantic-ui-react";
+import { Button, Icon } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { useGrantRequestsDownload } from "../hooks/useGrantRequest";
@@ -47,8 +47,9 @@ export const GrantRequestsDownloadButton = ({
   return (
     <Button
       secondary
-      icon="download"
-      onClick={() =>
+      icon={true}
+      onClick={() => {
+        if (grantRequestsDownloading) return;
         triggerDownload({
           search_by: searchBy,
           header_labels: headerLabels,
@@ -56,11 +57,11 @@ export const GrantRequestsDownloadButton = ({
           ...(_.isEmpty(selectedGrantRequests)
             ? searchParams
             : { must: { id: selectedGrantRequests } }),
-        })
-      }
-      loading={grantRequestsDownloading}
+        });
+      }}
       disabled={
         grantRequestsLoading ||
+        grantRequestsDownloading ||
         (_.isEmpty(selectedGrantRequests) &&
           (_.isEmpty(grantRequests) || _.isEmpty(searchParams)))
       }
@@ -68,7 +69,12 @@ export const GrantRequestsDownloadButton = ({
         id: "grantRequest.actions.download.tooltip",
       })}
       data-position="top right"
-    />
+    >
+      <Icon
+        name={grantRequestsDownloading ? "spinner" : "download"}
+        loading={grantRequestsDownloading}
+      />
+    </Button>
   );
 };
 

package/src/components/GrantsDownloadButton.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import { useEffect } from "react";
 import PropTypes from "prop-types";
-import { Button, Popup } from "semantic-ui-react";
+import { Button, Popup, Icon } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { useGrantDownload } from "../hooks/useGrant";
@@ -59,7 +59,7 @@ export const GrantsDownloadButton = ({
             <span className="trigger-right">
               <Button
                 secondary
-                icon="download"
+                icon={true}
                 onClick={() =>
                   triggerDownload({
                     search_by: onlyMyGrants ? "user" : "permissions",
@@ -69,9 +69,15 @@ export const GrantsDownloadButton = ({
                     ...searchParams,
                   })
                 }
-                loading={grantsDownloading}
-                disabled={_.isEmpty(grants) || !hasFilterApplied}
-              />
+                disabled={
+                  grantsDownloading || _.isEmpty(grants) || !hasFilterApplied
+                }
+              >
+                <Icon
+                  name={grantsDownloading ? "spinner" : "download"}
+                  loading={grantsDownloading}
+                />
+              </Button>
             </span>
           }
         />

package/src/components/LineageDownloadButton.js

@@ -1,7 +1,7 @@
 import _ from "lodash/fp";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Button, Popup } from "semantic-ui-react";
+import { Button, Popup, Icon } from "semantic-ui-react";
 import { useIntl } from "react-intl";
 import { downloadCsvGraph } from "../routines";
 
@@ -49,18 +49,22 @@ export const LineageDownloadButton = ({
               className={className}
               compact={compact}
               content={content}
-              icon="download"
+              icon={true}
               labelPosition={content ? labelPosition : undefined}
               onClick={() => {
-                if (downloadDisabled) return;
+                if (downloadDisabled || csvGraphDownloading) return;
 
                 downloadCsvGraph({ headerLabels, id: _.prop("id")(graph) });
               }}
-              loading={csvGraphDownloading}
-              disabled={downloadDisabled}
+              disabled={downloadDisabled || csvGraphDownloading}
               secondary={!basic}
               size={size}
-            />
+            >
+              <Icon
+                name={csvGraphDownloading ? "spinner" : "download"}
+                loading={csvGraphDownloading}
+              />
+            </Button>
           </span>
         }
       />

package/src/components/StructureNotesDownloadButton.js

@@ -29,14 +29,19 @@ export const StructureNotesDownloadButton = ({ structureId }) => {
     <Modal
       trigger={
         <Button
-          icon="download"
+          icon={true}
           onClick={() => setOpen(true)}
-          loading={isDownloading}
+          disabled={isDownloading}
           className="basic structureButton profile"
           data-tooltip={formatMessage({
             id: "structure.actions.downloadNotes.tooltip",
           })}
-        />
+        >
+          <Icon
+            name={isDownloading ? "spinner" : "download"}
+            loading={isDownloading}
+          />
+        </Button>
       }
       open={open}
       onClose={() => setOpen(false)}
@@ -62,8 +67,19 @@ export const StructureNotesDownloadButton = ({ structureId }) => {
         <Button onClick={() => setOpen(false)}>
           {formatMessage({ id: "actions.cancel" })}
         </Button>
-        <Button primary onClick={handleDownload} loading={isDownloading}>
-          <Icon name="download" />
+        <Button
+          primary
+          icon={true}
+          onClick={() => {
+            if (isDownloading) return;
+            handleDownload();
+          }}
+          disabled={isDownloading}
+        >
+          <Icon
+            name={isDownloading ? "spinner" : "download"}
+            loading={isDownloading}
+          />
           {formatMessage({ id: "actions.download" })}
         </Button>
       </Modal.Actions>

package/src/components/__tests__/StructureNotesDownloadButton.spec.js

@@ -191,7 +191,9 @@ describe("StructureNotesDownloadButton", () => {
     );
 
     const button = screen.getByRole("button");
-    expect(button).toHaveAttribute("class", expect.stringContaining("loading"));
+    expect(button).toBeDisabled();
+    const icon = button.querySelector("i");
+    expect(icon).toHaveAttribute("class", expect.stringContaining("loading"));
   });
 
   it("closes modal when cancel button is clicked", () => {