UISAUTHCOM-96 - Sunflower BF - Some applications that are visible on the Role Detail page are hidden on the Role Edit page.

.gitignore

@@ -9,6 +9,7 @@
 
 # production
 /build
+/translations/**/compiled/*
 
 # misc
 .DS_Store

CHANGELOG.md

@@ -1,11 +1,54 @@
 # Change history for stripes-authorization-components
 
-# 2.0.0 (IN PROGRESS)
+# IN-PROGRESS
+
+* [UISAUTHCOM-97](https://folio-org.atlassian.net/browse/UISAUTHCOM-97) Add validation to RoleForm for Role Name. Disallowed forward slash "/" and required the name field for form submission.
+* [UISAUTHCOM-96](https://folio-org.atlassian.net/browse/UISAUTHCOM-96) Add missing associated applications back to Role Edit view.
+
+# [2.2.0](https://github.com/folio-org/stripes-authorization-components/tree/v2.2.0)
+
+* [UISAUTHCOM-73](https://folio-org.atlassian.net/browse/UISAUTHCOM-73) Include capabilities actions when calculating counts for warning when de-selecting an application assigned to a role.
+* [UISAUTHCOM-93](https://folio-org.atlassian.net/browse/UISAUTHCOM-93) Send full object body in PUT /roles request.
+* [UIROLES-170](https://folio-org.atlassian.net/browse/UIROLES-170) Allow Save button to be enabled after first character entered in required `Role Name` field.
+* [UISAUTHCOM-98](https://folio-org.atlassian.net/browse/UISAUTHCOM-98) Display warning and require confirmation before unchecking a capability set.
+
+# [2.1.0](https://github.com/folio-org/stripes-authorization-components/tree/v2.1.0)
+
+* [UISAUTHCOM-60](https://folio-org.atlassian.net/browse/UISAUTHCOM-60) Add new `hideUserLink` prop to `RoleDetails` component that will display users in assigned users list as a text if enabled.
+* [UISAUTHCOM-59](https://folio-org.atlassian.net/browse/UISAUTHCOM-59) Increase request timeout in `useCreateRoleMutation`, `useEditRoleMutation` from default 30 seconds to 10 minutes. This can be decreased if back-end performance improves.
+* [UISAUTHCOM-65](https://folio-org.atlassian.net/browse/UISAUTHCOM-65) Provide the ability to pass props to control whether certain actions can be performed.
+* [UISAUTHCOM-66](https://folio-org.atlassian.net/browse/UISAUTHCOM-66) Suppress edit and delete menu buttons for default roles.
+* [UISAUTHCOM-67](https://folio-org.atlassian.net/browse/UISAUTHCOM-67) Match GET role capabilities query key to match edit request, so `react-query` `invalidateQueries()` is called and new data is fetched.
+* [UISAUTHCOM-68](https://folio-org.atlassian.net/browse/UISAUTHCOM-68) Group keycloak create errors together and ensure all user records in batch are attempted.
+* [UISAUTHCOM-70](https://folio-org.atlassian.net/browse/UISAUTHCOM-70) Fix slowness when typing in name/description fields, by having component re-render onBlur instead of every keystroke.
+* [UISAUTHCOM-69](https://folio-org.atlassian.net/browse/UISAUTHCOM-69) Display warning and require confirmation before unchecking an application for both Create and Edit Role. Rename confirmation button from "Okay" to "Continue".
+* [UISAUTHCOM-72](https://folio-org.atlassian.net/browse/UISAUTHCOM-72) Pass `tenantId` prop to `<ViewMetaData>` component on the role details pane.
+* [UISAUTHCOM-73](https://folio-org.atlassian.net/browse/UISAUTHCOM-73) Include capabilities inside capability sets when calculating counts for warning when de-selecting an application assigned to a role.
+* [UISAUTHCOM-73](https://folio-org.atlassian.net/browse/UISAUTHCOM-73) Fix capability calculations to de-dupe individual capabilities and those contained within capability sets, so correct value is shown when de-selecting an application assigned to a role.
+* [UISAUTHCOM-76](https://folio-org.atlassian.net/browse/UISAUTHCOM-76) Update the message for sharing a role to indicate that it can be a lengthy process.
+* [UISAUTHCOM-78](https://folio-org.atlassian.net/browse/UISAUTHCOM-78) Refactor timeout handling by introducing TIMEOUT constant for useOkapiKy in role sharing and delete role mutation hooks.
+* [UISAUTHCOM-81](https://folio-org.atlassian.net/browse/UISAUTHCOM-81) Increase default timeout for role mutations.
+* [UISAUTHCOM-74](https://folio-org.atlassian.net/browse/UISAUTHCOM-74) When previously saved capability sets are deselected, child capabilities are now deselected too. Also, ensure that deselecting a column of capability sets also deslects all child capabilities.
+* [UISAUTHCOM-86](https://folio-org.atlassian.net/browse/UISAUTHCOM-86) Handling sharing of a role when an authorization role with the same name already exists in data tenant.
+* [UISAUTHCOM-88](https://folio-org.atlassian.net/browse/UISAUTHCOM-88) Escape CQL values on sharing validation request.
+* [UISAUTHCOM-87](https://folio-org.atlassian.net/browse/UISAUTHCOM-87) OmittheerrantwhitespacethattripsupPluggable's`children`'slengthcalculation.
+* [UISAUTHCOM-83](https://folio-org.atlassian.net/browse/UISAUTHCOM-83) Preserve session-selected capabilities when unchecking a capability set that includes them. Keep `isInitialDataReady` false while fetching data to prevent data from being displayed after the page is reopened.
+* [UISAUTHCOM-90](https://folio-org.atlassian.net/browse/UISAUTHCOM-90) Add validation to ensure role names are unique across tenants when editing shared authorization roles.
+
+# [2.0.2](https://github.com/folio-org/stripes-authorization-components/tree/v2.0.2)
+
+* [UISAUTHCOM-51](https://folio-org.atlassian.net/browse/UISAUTHCOM-51) Provide `expand=false` parameter to `useRoleCapabilities` that used in `useInitalRoleSharing` to correctly retrieve directly assigned capabilities
+
+# [2.0.1](https://github.com/folio-org/stripes-authorization-components/tree/v2.0.1) (2025-04-09)
+
+* [UISAUTHCOM-55](https://folio-org.atlassian.net/browse/UISAUTHCOM-55) Filter out any capabilities with property `dummyCapability = true` since they are invalid. API will suppress once MODROLESKC-285 is completed, but this immediately fixes the issue in the UI.
+
+# [2.0.0](https://github.com/folio-org/stripes-authorization-components/tree/v2.0.0) (2025-03-13)
 
 * *BREAKING* [UISAUTHCOM-46](https://folio-org.atlassian.net/browse/UISAUTHCOM-46) migrate react-intl to v7.
-* *BREAKING* [UISAUTHCOM-50](https://folio-org.atlassian.net/browse/UISAUTHCOM-50) migrate stripes dependencies to their Sunflower versions. 
+* *BREAKING* [UISAUTHCOM-50](https://folio-org.atlassian.net/browse/UISAUTHCOM-50) migrate stripes dependencies to their Sunflower versions.
 
-## 1.1.0 
+## 1.1.0
 
 * [UISAUTHCOM-44](https://folio-org.atlassian.net/browse/UISAUTHCOM-44) Add Deque Axe a11y tests.
 * [UISAUTHCOM-47](https://folio-org.atlassian.net/browse/UISAUTHCOM-47) Retry get publication details request for `404` response status.
@@ -44,7 +87,7 @@
 * [UISAUTHCOM-12](https://folio-org.atlassian.net/browse/UISAUTHCOM-12) Ensure support for the passed `tenantId` value for manipulations in the context of a specific tenant.
 * [UISAUTHCOM-17](https://folio-org.atlassian.net/browse/UISAUTHCOM-17) Create reusable components for editing, saving Authorization policies for the consortium.
 * [UISAUTHCOM-15](https://folio-org.atlassian.net/browse/UISAUTHCOM-15) Check if user exists in Keycloak on assign users to role. If not show confirmation dialog to create user records in Keycloak.
-* [UISAUTHCOM-18](https://folio-org.atlassian.net/browse/UISAUTHCOM-18) Add button to unassign all assigned capabilities/sets when editing an authorization role in RoleForm. 
+* [UISAUTHCOM-18](https://folio-org.atlassian.net/browse/UISAUTHCOM-18) Add button to unassign all assigned capabilities/sets when editing an authorization role in RoleForm.
 * [UISAUTHCOM-19](https://folio-org.atlassian.net/browse/UISAUTHCOM-19) Create reusable hooks and components for duplicate authorization role.
 * [UISAUTHCOM-22](https://folio-org.atlassian.net/browse/UISAUTHCOM-22) Move "Select application" button to the top of the role form
 * [UISAUTHCOM-14](https://folio-org.atlassian.net/browse/UISAUTHCOM-14) ECS - Support sharing of authorization roles and policies.

lib/Capabilities/CapabilitiesGrid/CapabilitiesGrid.js

@@ -57,7 +57,7 @@ export const CapabilitiesGrid = ({
     return <div key={action}>{formatMessage({ id:`stripes-authorization-components.columns.${action}` })} <Checkbox
       checked={isAllActionCapabilitiesSelected(action, type)}
       onChange={(event) => {
-        toggleCapabilitiesHeaderCheckbox(event, type, action);
+        toggleCapabilitiesHeaderCheckbox(event.target.checked, type, action);
       }}
       aria-label={formatMessage({ id:'stripes-authorization-components.columns.header.checkbox' }, { action })}
     /></div>;

lib/Capabilities/CapabilitiesSetsAccordion/CapabilitiesSetsAccordion.js

@@ -15,7 +15,8 @@ export const CapabilitiesSetsAccordion = ({
   isCapabilitySetSelected,
   isLoading,
   onChangeCapabilitySetCheckbox,
-  toggleCapabilitySetsHeaderCheckbox, isAllActionCapabilitySetsSelected
+  toggleCapabilitySetsHeaderCheckbox,
+  isAllActionCapabilitySetsSelected
 }) => {
   return (
     <Accordion

lib/Role/RoleCreate/RoleCreate.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { useState } from 'react';
 import { useHistory } from 'react-router';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash';
 
 import { useQueryClient } from 'react-query';
 import { MUTATION_ACTION_TYPE } from '../../constants';
@@ -13,7 +13,7 @@ import {
   useShowCallout,
 } from '../../hooks';
 import { RoleForm } from '../RoleForm';
-import { getCheckboxHandlers } from '../utils';
+import { getCheckboxHandlers, changesForUnselect } from '../utils';
 
 export const RoleCreate = ({
   path,
@@ -26,6 +26,8 @@ export const RoleCreate = ({
   const [description, setDescription] = useState('');
   const [checkedAppIdsMap, setCheckedAppIdsMap] = useState({});
   const [disabledCapabilities, setDisabledCapabilities] = useState({});
+  const [isUnselectApplicationConfirmationOpen, setIsUnselectApplicationConfirmationOpen] = useState(false);
+  const [unselectedItemsInfo, setUnselectedItemsInfo] = useState({});
 
   const {
     capabilities,
@@ -109,26 +111,43 @@ export const RoleCreate = ({
     }
   };
 
-  const onSubmitSelectApplications = (appIds, callback) => {
-    if (callback) {
-      callback();
-    }
+  const unselectAllCapabilitiesAndSets = () => {
+    setSelectedCapabilitiesMap({});
+    setSelectedCapabilitySetsMap({});
+    setDisabledCapabilities({});
+  };
+
+  const applyAppIdsChanges = (appIds) => {
     if (isEmpty(appIds)) {
-      setSelectedCapabilitiesMap({});
-      setSelectedCapabilitySetsMap({});
-      setDisabledCapabilities({});
+      unselectAllCapabilitiesAndSets();
     }
     setCheckedAppIdsMap(appIds);
   };
 
+  const onSubmitSelectApplications = (selectedAppIds, onCloseHandler) => {
+    const unselectedAppInfo = changesForUnselect(selectedAppIds, checkedAppIdsMap,
+      capabilities, capabilitySetsList, selectedCapabilitiesMap, selectedCapabilitySetsMap);
+
+    if (unselectedAppInfo.isConfirmationNeeded) {
+      setUnselectedItemsInfo({ ...unselectedAppInfo, selectedAppIds, onCloseHandler });
+      setIsUnselectApplicationConfirmationOpen(true);
+    } else if (onCloseHandler) { // Changes can be applied directly if no capabilities or capability sets would be unselected
+      applyAppIdsChanges(selectedAppIds);
+      onCloseHandler();
+    }
+  };
+
   return (
     <RoleForm
       title="stripes-authorization-components.crud.createRole"
       roleName={roleName}
       description={description}
       isLoading={isLoading}
       capabilities={capabilities}
+      disabledCapabilities={disabledCapabilities}
       capabilitySets={capabilitySets}
+      capabilitySetsList={capabilitySetsList}
+      actionCapabilitySets={actionCapabilitySets}
       isCapabilityDisabled={isCapabilityDisabled}
       isCapabilitySetSelected={isCapabilitySetSelected}
       isCapabilitySelected={isCapabilitySelected}
@@ -138,6 +157,7 @@ export const RoleCreate = ({
       onClose={onClose}
       onChangeCapabilityCheckbox={onChangeCapabilityCheckbox}
       onChangeCapabilitySetCheckbox={onChangeCapabilitySetCheckbox}
+      selectedCapabilitySetsMap={selectedCapabilitySetsMap}
       selectedCapabilitiesMap={selectedCapabilitiesMap}
       onSaveSelectedApplications={onSubmitSelectApplications}
       checkedAppIdsMap={checkedAppIdsMap}
@@ -147,6 +167,10 @@ export const RoleCreate = ({
       isAllActionCapabilitiesSelected={isAllActionCapabilitiesSelected}
       toggleCapabilitySetsHeaderCheckbox={toggleCapabilitySetsHeaderCheckbox}
       isAllActionCapabilitySetsSelected={isAllActionCapabilitySetsSelected}
+      isUnselectApplicationConfirmationOpen={isUnselectApplicationConfirmationOpen}
+      setIsUnselectApplicationConfirmationOpen={setIsUnselectApplicationConfirmationOpen}
+      unselectedItemsInfo={unselectedItemsInfo}
+      applyAppIdsChanges={applyAppIdsChanges}
     />
   );
 };

lib/Role/RoleCreate/RoleCreate.test.js

@@ -142,6 +142,10 @@ describe('RoleCreate', () => {
     afterEach(() => {
       jest.clearAllMocks();
     });
+    beforeEach(() => {
+      mockMutateRole.mockClear();
+    });
+
     it('submit button', async () => {
       const { getByTestId, getByRole } = renderComponent();
 
@@ -153,6 +157,12 @@ describe('RoleCreate', () => {
 
       await act(async () => {
         await userEvent.type(getByTestId('rolename-input'), 'New Role');
+        await userEvent.tab();
+      });
+
+      expect(submitButton).toBeEnabled();
+
+      await act(async () => {
         await userEvent.click(submitButton);
       });