@truedat/dd 8.6.1 → 8.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/dd",
-  "version": "8.6.1",
+  "version": "8.6.3",
   "description": "Truedat Web Data Dictionary",
   "sideEffects": false,
   "module": "src/index.js",
@@ -51,7 +51,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@truedat/test": "8.6.1",
+    "@truedat/test": "8.6.3",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "redux-saga-test-plan": "^4.0.6"
@@ -86,5 +86,5 @@
     "svg-pan-zoom": "^3.6.2",
     "swr": "^2.3.3"
   },
-  "gitHead": "932eb0895ec71961f52a09309b99ae017977a899"
+  "gitHead": "3a4e629e4c63fdec993dfe357f9b11fdf7a62e8b"
 }

package/src/api/queries.js

@@ -243,6 +243,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
     $dataStructureId: ID!
     $version: String!
     $note_fields: [String]
+    $withoutGrants: Boolean!
   ) {
     dataStructureVersion(dataStructureId: $dataStructureId, version: $version) {
       id
@@ -324,7 +325,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
       }
       ancestry
 
-      grants {
+      grants @skip(if: $withoutGrants) {
         data_structure {
           external_id
           id
@@ -355,7 +356,7 @@ export const LEGACY_DATA_STRUCTURE_VERSION_QUERY = gql`
         }
         user_id
       }
-      grant {
+      grant @skip(if: $withoutGrants) {
         data_structure {
           external_id
           id

package/src/components/GrantApprovalRuleConditions.js

@@ -30,7 +30,13 @@ export default function GrantApprovalRuleConditions({
                       id: "grantApprovalRule.conditions.field_prefix",
                     })}
                     selection
-                    options={["request", "note", "metadata"].map((o) => ({
+                    options={[
+                      "request",
+                      "note",
+                      "metadata",
+                      "user",
+                      "created_by",
+                    ].map((o) => ({
                       key: o,
                       value: o,
                       text: formatMessage({

package/src/components/ImplementationStructuresLoader.js

@@ -14,7 +14,7 @@ export const ImplementationStructuresLoader = ({
   const structures = _.flow(
     _.concat(structuresFields),
     _.map(_.toInteger),
-    _.uniq
+    _.uniq,
   )(structuresSiblings);
   const [structureIndex, setStructureIndex] = useState(0);
   const [requestedStructures, setRequestedStructures] = useState([]);
@@ -23,7 +23,7 @@ export const ImplementationStructuresLoader = ({
     // check structure_ids, will be undefined if structureIds is an empty Array
     if (structure_id && !_.includes(structure_id)(structures)) {
       if (!_.includes(structure_id)(requestedStructures)) {
-        legacyFetchStructure({ id: structure_id });
+        legacyFetchStructure({ id: structure_id, withoutGrants: true });
         setRequestedStructures([...requestedStructures, structure_id]);
       }
     } else if (structureIndex + 1 < _.size(structureIds)) {
@@ -57,6 +57,7 @@ export const mapStateToProps = ({ structuresFields, structuresSiblings }) => ({
   structuresSiblings: _.keys(structuresSiblings),
 });
 
-export default connect(mapStateToProps, { legacyFetchStructure, clearStructure })(
-  ImplementationStructuresLoader
-);
+export default connect(mapStateToProps, {
+  legacyFetchStructure,
+  clearStructure,
+})(ImplementationStructuresLoader);

package/src/components/StructureSelectorInputField.js

@@ -25,7 +25,8 @@ export const StructureSelectorInputField = ({
 }) => {
   const { formatMessage } = useIntl();
   const handleSelectStructure = (value) => {
-    value && legacyFetchStructure({ id: _.prop("id")(value) });
+    value &&
+      legacyFetchStructure({ id: _.prop("id")(value), withoutGrants: true });
     value && onChange(value);
   };
 
@@ -40,7 +41,7 @@ export const StructureSelectorInputField = ({
   const aliasIsNeeded =
     _.flow(
       _.map(_.path("structure.id")),
-      _.filter((s) => s === selectedStructure?.structure?.id)
+      _.filter((s) => s === selectedStructure?.structure?.id),
     )(structures).length > 1;
 
   return (
@@ -140,5 +141,5 @@ StructureSelectorInputField.propTypes = {
 };
 
 export default connect(null, { legacyFetchStructure })(
-  StructureSelectorInputField
+  StructureSelectorInputField,
 );

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

@@ -28,6 +28,8 @@ jest.mock("@truedat/core/components/SystemsLoader", () => () => (
 jest.mock("@truedat/core/components/TemplatesLoader", () => () => (
   <div>TemplatesLoader</div>
 ));
+jest.mock("@truedat/core/components/UploadJobs", () => () => <div>UploadJobs</div>);
+jest.mock("@truedat/core/components/UploadJob", () => () => <div>UploadJob</div>);
 
 jest.mock("../CatalogViewConfigs", () => () => <div>CatalogViewConfigs</div>);
 jest.mock("../CatalogViewConfigForm", () => ({

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

@@ -11,7 +11,10 @@ describe("<ImplementationStructuresLoader/>", () => {
     const { unmount } = render(<ImplementationStructuresLoader {...props} />);
     expect(props.clearStructure).toHaveBeenCalledTimes(0);
     expect(props.legacyFetchStructure).toHaveBeenCalledTimes(1);
-    expect(props.legacyFetchStructure).toHaveBeenCalledWith({ id: 42 });
+    expect(props.legacyFetchStructure).toHaveBeenCalledWith({
+      id: 42,
+      withoutGrants: true,
+    });
 
     unmount();
     expect(props.clearStructure).toHaveBeenCalledTimes(1);

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

@@ -120,45 +120,8 @@ exports[`<DictionaryRoutes /> renders correctly with structures route 1`] = `
 
 exports[`<DictionaryRoutes /> renders correctly with structures upload events route 1`] = `
 <div>
-  <div
-    class="ui breadcrumb"
-  >
-    <a
-      class="section"
-      data-discover="true"
-      href="/structureNotes/uploadJobs"
-    >
-      uploadJobs.notes.header
-    </a>
-  </div>
-  <div
-    class="ui segment"
-  >
-    <h2
-      class="ui header"
-    >
-      <i
-        aria-hidden="true"
-        class="cogs circular icon"
-      />
-      <div
-        class="content"
-      >
-        uploadJobs.notes.header
-        <div
-          class="sub header"
-        >
-          uploadJobs.subheader
-        </div>
-      </div>
-    </h2>
-    <div
-      class="dimmable"
-    >
-      <div
-        class="ui bottom attached segment"
-      />
-    </div>
+  <div>
+    UploadJobs
   </div>
 </div>
 `;

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

@@ -81,6 +81,32 @@ exports[`<GrantApprovalRuleConditions /> matches the last snapshot disable 1`] =
                     Structure metadata
                   </span>
                 </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Requester
+                  </span>
+                </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Creator
+                  </span>
+                </div>
               </div>
             </div>
           </div>
@@ -320,6 +346,32 @@ exports[`<GrantApprovalRuleConditions /> matches the last snapshot with empty va
                     Structure metadata
                   </span>
                 </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Requester
+                  </span>
+                </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Creator
+                  </span>
+                </div>
               </div>
             </div>
           </div>
@@ -581,6 +633,32 @@ exports[`<GrantApprovalRuleConditions /> matches the last snapshot with values 1
                     Structure metadata
                   </span>
                 </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Requester
+                  </span>
+                </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Creator
+                  </span>
+                </div>
               </div>
             </div>
           </div>
@@ -817,6 +895,32 @@ exports[`<GrantApprovalRuleConditions /> matches the last snapshot with values 1
                     Structure metadata
                   </span>
                 </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Requester
+                  </span>
+                </div>
+                <div
+                  aria-checked="false"
+                  aria-selected="false"
+                  class="item"
+                  role="option"
+                  style="pointer-events: all;"
+                >
+                  <span
+                    class="text"
+                  >
+                    Creator
+                  </span>
+                </div>
               </div>
             </div>
           </div>

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

@@ -352,6 +352,32 @@ exports[`<GrantApprovalRuleEdit /> matches the last snapshot 1`] = `
                         grantApprovalRule.conditions.field_prefix.metadata
                       </span>
                     </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.user
+                      </span>
+                    </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.created_by
+                      </span>
+                    </div>
                   </div>
                 </div>
               </div>

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

@@ -352,6 +352,32 @@ exports[`<GrantApprovalRuleForm /> matches the last snapshot 1`] = `
                         grantApprovalRule.conditions.field_prefix.metadata
                       </span>
                     </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.user
+                      </span>
+                    </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.created_by
+                      </span>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -591,6 +617,32 @@ exports[`<GrantApprovalRuleForm /> matches the last snapshot 1`] = `
                         grantApprovalRule.conditions.field_prefix.metadata
                       </span>
                     </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.user
+                      </span>
+                    </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.created_by
+                      </span>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1146,6 +1198,32 @@ exports[`<GrantApprovalRuleForm /> matches the last snapshot for new rule 1`] =
                         grantApprovalRule.conditions.field_prefix.metadata
                       </span>
                     </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.user
+                      </span>
+                    </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.created_by
+                      </span>
+                    </div>
                   </div>
                 </div>
               </div>

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

@@ -327,6 +327,32 @@ exports[`<GrantApprovalRuleNew /> matches the last snapshot 1`] = `
                         grantApprovalRule.conditions.field_prefix.metadata
                       </span>
                     </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.user
+                      </span>
+                    </div>
+                    <div
+                      aria-checked="false"
+                      aria-selected="false"
+                      class="item"
+                      role="option"
+                      style="pointer-events: all;"
+                    >
+                      <span
+                        class="text"
+                      >
+                        grantApprovalRule.conditions.field_prefix.created_by
+                      </span>
+                    </div>
                   </div>
                 </div>
               </div>

package/src/messages/en.js

@@ -93,6 +93,8 @@ export default {
   "grantApprovalRule.conditions.field_prefix.note": "Structure note",
   "grantApprovalRule.conditions.field_prefix.null": "-",
   "grantApprovalRule.conditions.field_prefix.metadata": "Structure metadata",
+  "grantApprovalRule.conditions.field_prefix.user": "Requester",
+  "grantApprovalRule.conditions.field_prefix.created_by": "Creator",
   "grantApprovalRule.conditions.field_prefix.placeholder": "Context",
   "grantApprovalRule.domain": "Domain",
   "grantApprovalRule.subheader": "Grant approval rule",

package/src/messages/es.js

@@ -101,6 +101,8 @@ export default {
   "grantApprovalRule.conditions.field_prefix.null": "-",
   "grantApprovalRule.conditions.field_prefix.metadata":
     "Metadata de la estructura",
+  "grantApprovalRule.conditions.field_prefix.user": "Solicitante",
+  "grantApprovalRule.conditions.field_prefix.created_by": "Creador",
   "grantApprovalRule.conditions.field_prefix.placeholder": "Contexto",
   "grantApprovalRule.name": "Nombre",
   "grantApprovalRule.name.placeholder": "Nombre",

package/src/sagas/__tests__/legacyFetchStructure.spec.js

@@ -37,6 +37,7 @@ describe("sagas: legacyFetchStructureSaga", () => {
     dataStructureId: id,
     version,
     note_fields: ["note_field"],
+    withoutGrants: false,
   };
 
   const structureFieldColumns = [{ name: "id" }, { name: "note.note_field" }];
@@ -94,6 +95,41 @@ describe("sagas: legacyFetchStructureSaga", () => {
       dataStructureId: id,
       version,
       note_fields: ["note_field"],
+      withoutGrants: false,
+    };
+
+    expect(() => {
+      testSaga(legacyFetchStructureSaga, { payload })
+        .next()
+        .select(getStructureFieldColumns)
+        .next(structureFieldColumns)
+        .getContext("client")
+        .next(client)
+        .put(legacyFetchStructure.request())
+        .next()
+        .call(client.query, {
+          fetchPolicy: "network-only",
+          query: LEGACY_DATA_STRUCTURE_VERSION_QUERY,
+          variables,
+        })
+        .next({ data: { dataStructureVersion } })
+        .put({ meta, ...legacyFetchStructure.success(data) })
+        .next()
+        .put(legacyFetchStructure.fulfill())
+        .next()
+        .isDone();
+    }).not.toThrow();
+  });
+
+  it("should forward withoutGrants when set in payload", () => {
+    const payload = { id, withoutGrants: true };
+    const meta = { version };
+
+    const variables = {
+      dataStructureId: id,
+      version,
+      note_fields: ["note_field"],
+      withoutGrants: true,
     };
 
     expect(() => {

package/src/sagas/legacyFetchStructure.js

@@ -9,14 +9,14 @@ export function* legacyFetchStructureSaga({ payload }) {
     const structureFieldColumns = yield select(getStructureFieldColumns);
     const note_fields = _.flow(
       _.filter(({ name }) => name.startsWith("note.")),
-      _.map(({ name }) => name.split(".")[1])
+      _.map(({ name }) => name.split(".")[1]),
     )(structureFieldColumns);
 
     const client = yield getContext("client");
 
     yield put(legacyFetchStructure.request());
 
-    const { id, version = "latest" } = payload;
+    const { id, version = "latest", withoutGrants = false } = payload;
     const {
       data: { dataStructureVersion },
     } = yield call(client.query, {
@@ -26,6 +26,7 @@ export function* legacyFetchStructureSaga({ payload }) {
         dataStructureId: id,
         version,
         note_fields,
+        withoutGrants,
       },
     });