@truedat/dd 8.12.1 → 8.12.4

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

@@ -62,6 +62,60 @@ exports[`StructureGrantCartCheckout matches snapshot when modification grant (si
               >
                 structure.grant.cart.template
               </div>
+              <div
+                class="required field"
+              >
+                <div
+                  class="field"
+                >
+                  <div
+                    aria-busy="false"
+                    aria-expanded="false"
+                    class="ui search selection dropdown"
+                    name="template"
+                    role="combobox"
+                  >
+                    <input
+                      aria-autocomplete="list"
+                      autocomplete="off"
+                      class="search"
+                      tabindex="0"
+                      type="text"
+                      value=""
+                    />
+                    <div
+                      aria-atomic="true"
+                      aria-live="polite"
+                      class="divider default text"
+                      role="alert"
+                    >
+                      structure.grant.cart.template.placeholder
+                    </div>
+                    <i
+                      aria-hidden="true"
+                      class="dropdown icon"
+                    />
+                    <div
+                      class="menu transition"
+                      role="listbox"
+                    >
+                      <div
+                        aria-checked="false"
+                        aria-selected="true"
+                        class="selected item"
+                        role="option"
+                        style="pointer-events: all;"
+                      >
+                        <span
+                          class="text"
+                        >
+                          template1
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </form>
           </div>
         </div>
@@ -221,6 +275,60 @@ exports[`StructureGrantCartCheckout matches snapshot when multi-system (gr scope
               >
                 structure.grant.cart.template
               </div>
+              <div
+                class="required field"
+              >
+                <div
+                  class="field"
+                >
+                  <div
+                    aria-busy="false"
+                    aria-expanded="false"
+                    class="ui search selection dropdown"
+                    name="template"
+                    role="combobox"
+                  >
+                    <input
+                      aria-autocomplete="list"
+                      autocomplete="off"
+                      class="search"
+                      tabindex="0"
+                      type="text"
+                      value=""
+                    />
+                    <div
+                      aria-atomic="true"
+                      aria-live="polite"
+                      class="divider default text"
+                      role="alert"
+                    >
+                      structure.grant.cart.template.placeholder
+                    </div>
+                    <i
+                      aria-hidden="true"
+                      class="dropdown icon"
+                    />
+                    <div
+                      class="menu transition"
+                      role="listbox"
+                    >
+                      <div
+                        aria-checked="false"
+                        aria-selected="true"
+                        class="selected item"
+                        role="option"
+                        style="pointer-events: all;"
+                      >
+                        <span
+                          class="text"
+                        >
+                          template1
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </form>
           </div>
         </div>
@@ -293,6 +401,60 @@ exports[`StructureGrantCartCheckout matches snapshot when single flow without mo
               >
                 structure.grant.cart.template
               </div>
+              <div
+                class="required field"
+              >
+                <div
+                  class="field"
+                >
+                  <div
+                    aria-busy="false"
+                    aria-expanded="false"
+                    class="ui search selection dropdown"
+                    name="template"
+                    role="combobox"
+                  >
+                    <input
+                      aria-autocomplete="list"
+                      autocomplete="off"
+                      class="search"
+                      tabindex="0"
+                      type="text"
+                      value=""
+                    />
+                    <div
+                      aria-atomic="true"
+                      aria-live="polite"
+                      class="divider default text"
+                      role="alert"
+                    >
+                      structure.grant.cart.template.placeholder
+                    </div>
+                    <i
+                      aria-hidden="true"
+                      class="dropdown icon"
+                    />
+                    <div
+                      class="menu transition"
+                      role="listbox"
+                    >
+                      <div
+                        aria-checked="false"
+                        aria-selected="true"
+                        class="selected item"
+                        role="option"
+                        style="pointer-events: all;"
+                      >
+                        <span
+                          class="text"
+                        >
+                          template1
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </form>
           </div>
         </div>
@@ -806,7 +968,7 @@ exports[`StructureGrantCartCheckout matches snapshot with group_by_domain enable
 </div>
 `;
 
-exports[`StructureGrantCartCheckout matches snapshot with single domain - shows singular domain message 1`] = `
+exports[`StructureGrantCartCheckout matches snapshot with single domain - uses single-group information panel 1`] = `
 <div>
   <div
     class="ui segment structures"
@@ -1112,6 +1274,60 @@ exports[`StructureGrantCartCheckout matches snapshot without gr scope - does not
               >
                 structure.grant.cart.template
               </div>
+              <div
+                class="required field"
+              >
+                <div
+                  class="field"
+                >
+                  <div
+                    aria-busy="false"
+                    aria-expanded="false"
+                    class="ui search selection dropdown"
+                    name="template"
+                    role="combobox"
+                  >
+                    <input
+                      aria-autocomplete="list"
+                      autocomplete="off"
+                      class="search"
+                      tabindex="0"
+                      type="text"
+                      value=""
+                    />
+                    <div
+                      aria-atomic="true"
+                      aria-live="polite"
+                      class="divider default text"
+                      role="alert"
+                    >
+                      structure.grant.cart.template.placeholder
+                    </div>
+                    <i
+                      aria-hidden="true"
+                      class="dropdown icon"
+                    />
+                    <div
+                      class="menu transition"
+                      role="listbox"
+                    >
+                      <div
+                        aria-checked="false"
+                        aria-selected="true"
+                        class="selected item"
+                        role="option"
+                        style="pointer-events: all;"
+                      >
+                        <span
+                          class="text"
+                        >
+                          template1
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
             </form>
           </div>
         </div>

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

@@ -14,6 +14,60 @@ exports[`<StructureGrantCartInformation /> matches the latest snapshot 1`] = `
       >
         structure.grant.cart.template
       </div>
+      <div
+        class="required field"
+      >
+        <div
+          class="field"
+        >
+          <div
+            aria-busy="false"
+            aria-expanded="false"
+            class="ui search selection dropdown"
+            name="template"
+            role="combobox"
+          >
+            <input
+              aria-autocomplete="list"
+              autocomplete="off"
+              class="search"
+              tabindex="0"
+              type="text"
+              value=""
+            />
+            <div
+              aria-atomic="true"
+              aria-live="polite"
+              class="divider default text"
+              role="alert"
+            >
+              structure.grant.cart.template.placeholder
+            </div>
+            <i
+              aria-hidden="true"
+              class="dropdown icon"
+            />
+            <div
+              class="menu transition"
+              role="listbox"
+            >
+              <div
+                aria-checked="false"
+                aria-selected="true"
+                class="selected item"
+                role="option"
+                style="pointer-events: all;"
+              >
+                <span
+                  class="text"
+                >
+                  template1
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </form>
   </div>
 </div>

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

@@ -2,24 +2,28 @@
 
 exports[`<StructureRelationRow /> matches the latest snapshot 1`] = `
 <div>
-  <tr
-    class=""
-  >
-    <td
-      class=""
-    >
-      Structure 1
-    </td>
-    <td
-      class=""
-    >
-      Some Type 1
-    </td>
-    <td
-      class=""
-    >
-      used_by
-    </td>
-  </tr>
+  <table>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class=""
+        >
+          Structure 1
+        </td>
+        <td
+          class=""
+        >
+          Some Type 1
+        </td>
+        <td
+          class=""
+        >
+          used_by
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 `;

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

@@ -2,29 +2,33 @@
 
 exports[`<StructureRow /> matches the latest snapshot 1`] = `
 <div>
-  <tr
-    class=""
-  >
-    <td
-      class="structure-cell-overflow"
-    >
-      s1
-    </td>
-    <td
-      class=""
-    >
-      org
-    </td>
-    <td
-      class=""
-    >
-      sys
-    </td>
-    <td
-      class=""
-    >
-      gp
-    </td>
-  </tr>
+  <table>
+    <tbody>
+      <tr
+        class=""
+      >
+        <td
+          class="structure-cell-overflow"
+        >
+          s1
+        </td>
+        <td
+          class=""
+        >
+          org
+        </td>
+        <td
+          class=""
+        >
+          sys
+        </td>
+        <td
+          class=""
+        >
+          gp
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 `;

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

@@ -11,9 +11,13 @@ exports[`<StructuresUpdateOption /> matches the latest snapshot 1`] = `
       aria-hidden="true"
       class="refresh icon"
     />
-    <span>
-      update
-    </span>
+    <div
+      class="text"
+    >
+      <span>
+        update
+      </span>
+    </div>
   </div>
 </div>
 `;

package/src/messages/en.js

@@ -132,8 +132,8 @@ export default {
   "grantRequest.header.updated_at": "Updated",
   "grantRequest.header.user": "User",
   "grantRequest.header.group": "User group",
-  "grantRequest.deleted.user": "Deleted user",
-  "grantRequest.deleted.group": "Deleted group",
+  "deleted.user": "Deleted user",
+  "deleted.group": "Deleted group",
   "grantRequest.header.createdBy": "Created by",
   "grantRequest.header.create": "Create grant request",
   "grantRequest.header.type": "Request type",

package/src/messages/es.js

@@ -135,8 +135,8 @@ export default {
   "grantRequest.header.updated_at": "Actualizado",
   "grantRequest.header.user": "Usuario",
   "grantRequest.header.group": "Grupo de usuarios",
-  "grantRequest.deleted.user": "Usuario eliminado",
-  "grantRequest.deleted.group": "Grupo eliminado",
+  "deleted.user": "Usuario eliminado",
+  "deleted.group": "Grupo eliminado",
   "grantRequest.header.createdBy": "Creado por",
   "grantRequest.header.create": "Crear petición de acceso",
   "grantRequest.header.type": "Tipo de petición",

package/src/reducers/__tests__/grantRequestsCart.spec.js

@@ -132,6 +132,7 @@ describe("reducers: grantRequestsCart", () => {
     const expectedState = {
       ...initialState,
       template,
+      validCart: false,
     };
     expect(
       grantRequestsCart(initialState, {
@@ -154,6 +155,7 @@ describe("reducers: grantRequestsCart", () => {
     ).toEqual({
       ...initialState,
       template: "another_template",
+      validCart: false,
     });
   });
 
@@ -233,6 +235,31 @@ describe("reducers: grantRequestsCart", () => {
     ).toEqual(expectedState);
   });
 
+  it("preserves the draft when reopening the same grant update", () => {
+    const previousGrant = { id: 2, detail: { old: "content" } };
+    const refreshedGrant = { id: "2", detail: { new: "content" } };
+    const structure = { id: 1 };
+    const state = {
+      ...initialState,
+      modificationGrant: previousGrant,
+      structures: [{ id: 5 }],
+      template: "user selected template",
+      templateContent: { reason: { value: "draft", origin: "user" } },
+      validCart: true,
+    };
+
+    expect(
+      grantRequestsCart(state, {
+        type: setGrantChangeRequestCart.TRIGGER,
+        payload: { structure, grant: refreshedGrant },
+      }),
+    ).toEqual({
+      ...state,
+      modificationGrant: refreshedGrant,
+      structures: [structure],
+    });
+  });
+
   it("on setGrantChangeRequestCart.TRIGGER fill templateContent with grant.detail", () => {
     const structure = { id: 1 };
     const grantDetail = {
@@ -388,6 +415,48 @@ describe("reducers: grantRequestsCart", () => {
     ).toEqual(expectedState);
   });
 
+  it("preserves content when the selected template is unchanged", () => {
+    const state = {
+      ...initialState,
+      template: "T",
+      templateContent: { reason: { value: "draft", origin: "user" } },
+      validCart: true,
+    };
+    expect(
+      grantRequestsCart(state, {
+        type: selectGrantRequestTemplate.TRIGGER,
+        payload: "T",
+      }),
+    ).toBe(state);
+  });
+
+  it("invalidates and clears only the group whose template changes", () => {
+    const draft = {
+      template: "Old",
+      templateContent: { reason: { value: "draft", origin: "user" } },
+      valid: true,
+    };
+    const state = {
+      ...initialState,
+      groupTemplates: { first: draft, second: draft },
+    };
+    expect(
+      grantRequestsCart(state, {
+        type: selectGrantRequestTemplateForGroup.TRIGGER,
+        payload: { key: "first", template: "Old" },
+      }),
+    ).toBe(state);
+    expect(
+      grantRequestsCart(state, {
+        type: selectGrantRequestTemplateForGroup.TRIGGER,
+        payload: { key: "first", template: "New" },
+      }).groupTemplates,
+    ).toEqual({
+      first: { template: "New", templateContent: {}, valid: false },
+      second: draft,
+    });
+  });
+
   it("should handle updateGrantRequestTemplateContentForGroup.TRIGGER", () => {
     const stateWithGroups = {
       ...initialState,
@@ -428,4 +497,21 @@ describe("reducers: grantRequestsCart", () => {
     expect([null, undefined, ""]).toContain(state.user?.id);
     expect(state.user?.id).not.toBe("group:10");
   });
+
+  it("sets user_group_id when setGrantChangeRequestCart.TRIGGER opens a group grant", () => {
+    const structure = { id: 1 };
+    const grant = {
+      id: 2,
+      user_id: null,
+      user_group_id: 10,
+      detail: {},
+    };
+    const state = grantRequestsCart(initialState, {
+      type: setGrantChangeRequestCart.TRIGGER,
+      payload: { structure, grant },
+    });
+
+    expect(state.user_group_id).toBe(10);
+    expect(state.user?.id ?? null).toBeNull();
+  });
 });

package/src/reducers/__tests__/structureRelations.spec.js

@@ -95,3 +95,31 @@ describe("reducers: parentRelations", () => {
     expect(parentRelations(fooState, { type: "FOO" })).toBe(fooState);
   });
 });
+
+describe("reducers: structure relation concept links", () => {
+  const links = [{ name: "foo concept", resource_id: "1" }];
+  const data = {
+    relations: {
+      children: [{ id: 1, links }],
+      parents: [{ id: 2, links }],
+    },
+  };
+
+  it("should keep concept links on children relations", () => {
+    expect(
+      childrenRelations([], {
+        type: fetchStructure.SUCCESS,
+        payload: { data },
+      }),
+    ).toEqual([{ id: 1, links }]);
+  });
+
+  it("should keep concept links on parent relations", () => {
+    expect(
+      parentRelations([], {
+        type: fetchStructure.SUCCESS,
+        payload: { data },
+      }),
+    ).toEqual([{ id: 2, links }]);
+  });
+});

package/src/reducers/grantRequestsCart.js

@@ -65,10 +65,12 @@ const grantRequestsCart = (state = initialState, { type, payload }) => {
         )(state),
       };
     case selectGrantRequestTemplate.TRIGGER:
+      if (state.template === payload) return state;
       return {
         ...state,
         template: payload,
         templateContent: modificationGrantContent(state.modificationGrant),
+        validCart: false,
       };
     case updateGrantRequestTemplateContent.TRIGGER:
       const { content, valid } = payload;
@@ -107,14 +109,29 @@ const grantRequestsCart = (state = initialState, { type, payload }) => {
         },
       };
     }
-    case setGrantChangeRequestCart.TRIGGER:
+    case setGrantChangeRequestCart.TRIGGER: {
       const { structure, grant } = payload;
+      const isSameModification =
+        state.modificationGrant?.id != null &&
+        grant?.id != null &&
+        String(state.modificationGrant.id) === String(grant.id);
+      if (isSameModification) {
+        return {
+          ...state,
+          modificationGrant: grant,
+          structures: [mapPayload(structure)],
+        };
+      }
       return {
         ...initialState,
         templateContent: formatLegacyContent(grant.detail),
         modificationGrant: grant,
         structures: [mapPayload(structure)],
+        ...(_.isNil(grant?.user_group_id)
+          ? {}
+          : { user_group_id: grant.user_group_id }),
       };
+    }
     case updateGrantRequestFilter.TRIGGER:
       const { index, value, structureId } = payload;
       return {
@@ -140,11 +157,12 @@ const grantRequestsCart = (state = initialState, { type, payload }) => {
     case selectGrantRequestTemplateForGroup.TRIGGER: {
       const { key, template } = payload;
       const groupTemplates = _.getOr({}, "groupTemplates", state);
+      if (groupTemplates[key]?.template === template) return state;
       return {
         ...state,
         groupTemplates: {
           ...groupTemplates,
-          [key]: { ...groupTemplates[key], template },
+          [key]: { template, templateContent: {}, valid: false },
         },
       };
     }

package/src/selectors/__tests__/__snapshots__/getGrantsColumns.spec.js.snap

@@ -62,15 +62,7 @@ exports[`GrantUserDecorator matches the latest snapshot 1`] = `
     <div
       class="content"
     >
-       
-      <div
-        class="ui teal small label"
-      >
-        Same
-      </div>
-      <div
-        class="sub header"
-      />
+      deleted.user
     </div>
   </h4>
 </div>