@truedat/dd 7.3.2 → 7.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "7.3.2",
+  "version": "7.3.3",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -34,7 +34,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "7.3.2",
+    "@truedat/test": "7.3.3",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -88,9 +88,9 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@truedat/auth": "7.3.2",
-    "@truedat/core": "7.3.2",
-    "@truedat/df": "7.3.2",
+    "@truedat/auth": "7.3.3",
+    "@truedat/core": "7.3.3",
+    "@truedat/df": "7.3.3",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "path-to-regexp": "^1.7.0",
@@ -115,5 +115,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "3a5d8fc5160ffabc1ef86251883070331045f738"
+  "gitHead": "23b3cc6b8c2749a173f779390866b715d653d377"
 }

package/src/components/PendingStructureNotes.js

@@ -17,11 +17,12 @@ import translations from "../utils/structureCustomTranslations";
 import PendingStructureNotesPagination from "./PendingStructureNotesPagination";
 import PendingStructureNotesLabelResults from "./PendingStructureNotesLabelResults";
 import PendingStructureNotesTable from "./PendingStructureNotesTable";
+import StructuresOptions from "./StructuresOptions";
 
 export const PendingStructureNotesContent = () => {
   const { formatMessage } = useIntl();
-  const { loading } = useSearchContext();
-
+  const { searchData, loading } = useSearchContext();
+  const actions = _.propOr({}, "_actions")(searchData);
   return (
     <Segment>
       <Header as="h2">
@@ -40,6 +41,7 @@ export const PendingStructureNotesContent = () => {
         </Header.Content>
       </Header>
 
+      <StructuresOptions {...actions} pendingStructureNotes={true} />
       <SearchWidget />
       <Dimmer.Dimmable dimmed={loading}>
         <Dimmer active={loading} inverted>

package/src/components/StructuresEditableDownloadOption.js

@@ -7,7 +7,10 @@ import { useIntl } from "react-intl";
 import { useSearchContext } from "@truedat/core/search/SearchContext";
 import { useDataStructureDownload } from "../hooks/useStructures";
 
-export const StructuresEditableDownloadOption = ({ setDownloading }) => {
+export const StructuresEditableDownloadOption = ({
+  setDownloading,
+  pendingStructureNotes,
+}) => {
   const { formatMessage, locale } = useIntl();
   const {
     searchData,
@@ -49,6 +52,7 @@ export const StructuresEditableDownloadOption = ({ setDownloading }) => {
             ...searchParams,
             structure_url_schema: window.location.origin + STRUCTURE,
             download_type: "editable",
+            note_type: pendingStructureNotes ? "non_published" : "published",
           })
         }
         disabled={isDisabled || structuresDownloading}
@@ -59,6 +63,7 @@ export const StructuresEditableDownloadOption = ({ setDownloading }) => {
 
 StructuresEditableDownloadOption.propTypes = {
   setDownloading: PropTypes.func,
+  pendingStructureNotes: PropTypes.bool,
 };
 
 export default StructuresEditableDownloadOption;

package/src/components/StructuresOptions.js

@@ -12,6 +12,7 @@ export const StructuresOptions = ({
   autoPublish,
   bulkUpload,
   bulkUploadDomains,
+  pendingStructureNotes,
 }) => {
   const [downloading, setDownloading] = useState(false);
   return (
@@ -24,16 +25,30 @@ export const StructuresOptions = ({
       disabled={downloading}
     >
       <Dropdown.Menu>
-        <SystemCreateOption />
-        <Dropdown.Divider />
-        <StructuresDownloadOption setDownloading={setDownloading} />
-        <StructuresEditableDownloadOption setDownloading={setDownloading} />
-        {bulkUpload ? (
-          <StructuresUploadOption canAutoPublish={!!autoPublish} />
-        ) : null}
-        {bulkUploadDomains ? <StructuresDomainsUploadOption /> : null}
-        <Dropdown.Divider />
-        <StructuresUpdateOption />
+        {pendingStructureNotes ? (
+          <>
+            <StructuresEditableDownloadOption
+              setDownloading={setDownloading}
+              pendingStructureNotes
+            />
+            {bulkUpload ? (
+              <StructuresUploadOption canAutoPublish={!!autoPublish} />
+            ) : null}
+          </>
+        ) : (
+          <>
+            <SystemCreateOption />
+            <Dropdown.Divider />
+            <StructuresDownloadOption setDownloading={setDownloading} />
+            <StructuresEditableDownloadOption setDownloading={setDownloading} />
+            {bulkUpload ? (
+              <StructuresUploadOption canAutoPublish={!!autoPublish} />
+            ) : null}
+            {bulkUploadDomains ? <StructuresDomainsUploadOption /> : null}
+            <Dropdown.Divider />
+            <StructuresUpdateOption />
+          </>
+        )}
       </Dropdown.Menu>
     </Dropdown>
   );
@@ -43,6 +58,7 @@ StructuresOptions.propTypes = {
   autoPublish: PropTypes.object,
   bulkUpload: PropTypes.object,
   bulkUploadDomains: PropTypes.object,
+  pendingStructureNotes: PropTypes.bool,
 };
 
 export default StructuresOptions;

package/src/components/StructuresView.js

@@ -74,7 +74,7 @@ export const StructuresViewContent = ({ embedded, customView }) => {
     <>
       {!customView ? (
         <>
-          <StructuresOptions {...actions} />
+          <StructuresOptions {...actions} pendingStructureNotes={false} />
           <SearchWidget dateFilter searchField="last_change_at" />
         </>
       ) : null}

package/src/components/__tests__/__snapshots__/PendingStructureNotes.spec.js.snap

@@ -23,6 +23,36 @@ exports[`<PendingStructureNotes /> matches the latest snapshot 1`] = `
         </div>
       </div>
     </h2>
+    <div
+      aria-busy="false"
+      aria-disabled="false"
+      aria-expanded="false"
+      class="ui floating dropdown button icon group-actions button-update"
+      role="listbox"
+      tabindex="0"
+    >
+      <i
+        aria-hidden="true"
+        class="ellipsis vertical icon"
+      />
+      <div
+        class="menu transition left"
+      >
+        <div
+          aria-disabled="false"
+          class="item"
+          role="option"
+        >
+          <i
+            aria-hidden="true"
+            class="download icon"
+          />
+          <span>
+            structures.actions.editableDownload.tooltip
+          </span>
+        </div>
+      </div>
+    </div>
     <div
       class="ui action left icon input"
     >