UISAUTHCOM-1: Move reusable components from UIROLES #2

alisher-epam · 2024-06-28T11:29:15Z

Purpose

UISAUTHCOM-1: Move reusable components from UIROLES

Approach

Pre-Merge Checklist

Before merging this PR, please go through the following list and take appropriate actions.

I've added appropriate record to the CHANGELOG.md
Does this PR meet or exceed the expected quality standards?
- Code coverage on new code is 80% or greater
- Duplications on new code is 3% or less
- There are no major code smells or security issues
Does this introduce breaking changes?
- If any API-related changes - okapi interfaces and permissions are reviewed/changed correspondingly
- There are no breaking changes in this PR.

If there are breaking changes, please STOP and consider the following:

What other modules will these changes impact?
Do JIRAs exist to update the impacted modules?
- If not, please create them
- Do they contain the appropriate level of detail? Which endpoints/schemas changed, etc.
- Do they have all they appropriate links to blocked/related issues?
Are the JIRAs under active development?
- If not, contact the project's PO and make sure they're aware of the urgency.
Do PRs exist for these changes?
- If so, have they been approved?

Ideally all of the PRs involved in breaking changes would be merged in the same day to avoid breaking the folio-testing environment. Communication is paramount if that is to be achieved, especially as the number of intermodule and inter-team dependencies increase.

While it's helpful for reviewers to help identify potential problems, ensuring that it's safe to merge is ultimately the responsibility of the PR assignee.

github-actions · 2024-06-28T11:32:37Z

Jest Unit Test Statistics

    1 files ±  0   36 suites +29 1m 27s ⏱️ +48s
  97 tests +80   97 ✔️ +80 0 💤 ±0 0 ❌ ±0
101 runs +84 101 ✔️ +84 0 💤 ±0 0 ❌ ±0

Results for commit 62e839d. ± Comparison against base commit 12d5592.

This pull request removes 4 and adds 84 tests. Note that renamed tests count towards both.

Procedural capabilities type should render null ‑ Procedural capabilities type should render null
Settings capabilities type renders checkboxes ‑ Settings capabilities type renders checkboxes
Settings capabilities type renders fields in the grid ‑ Settings capabilities type renders fields in the grid
Settings capabilities type renders null if action name is not compatible with view, edit, manage actions ‑ Settings capabilities type renders null if action name is not compatible with view, edit, manage actions

CapabilitiesSection should render `CapabilitiesDataType` ‑ CapabilitiesSection should render `CapabilitiesDataType`
CapabilitiesSection should render `CapabilitiesDataType`, `CapabilitiesProcedural`, and `CapabilitiesSettings` ‑ CapabilitiesSection should render `CapabilitiesDataType`, `CapabilitiesProcedural`, and `CapabilitiesSettings`
CapabilitiesSection should render nothing if there is no capabilities ‑ CapabilitiesSection should render nothing if there is no capabilities
CapabilitiesSettings renders checkboxes ‑ CapabilitiesSettings renders checkboxes
CapabilitiesSettings renders fields in the grid ‑ CapabilitiesSettings renders fields in the grid
CapabilitiesSettings renders null if action name is not compatible with view, edit, manage actions ‑ CapabilitiesSettings renders null if action name is not compatible with view, edit, manage actions
Procedural capabilities type renders null if action name is not execute ‑ Procedural capabilities type renders null if action name is not execute
RoleCreate actions on click footer buttons ‑ RoleCreate actions on click footer buttons
RoleCreate changes name, description input values ‑ RoleCreate changes name, description input values
RoleCreate renders TextField and Button components ‑ RoleCreate renders TextField and Button components
…

♻️ This comment has been updated with latest results.

github-actions · 2024-06-28T11:32:57Z

BigTest Unit Test Statistics

0 tests ±0 0 ✔️ ±0 0s ⏱️ ±0s
0 suites ±0 0 💤 ±0
0 files ±0 0 ❌ ±0

Results for commit 62e839d. ± Comparison against base commit 12d5592.

♻️ This comment has been updated with latest results.

lib/Capabilities/CapabilitiesSettings/CapabilitiesSettings.js

alisher-epam · 2024-07-04T05:24:40Z

@folio-org/fe-tl-reviewers review it please

alisher-epam · 2024-07-04T05:27:49Z

@usavkov-epam @BogdanDenis please check the PR when you are available

usavkov-epam · 2024-07-05T07:00:10Z

I'm not sure you need to create empty translation files, except en.json. I suppose the localization job will handle it on its own.

alisher-epam · 2024-07-05T13:24:11Z

I'm not sure you need to create empty translation files, except en.json. I suppose the localization job will handle it on its own.

I suppose it came from a branch update from the master branch

usavkov-epam · 2024-07-05T14:40:16Z

Before merging, please make sure one of the approvals belongs to developers from the Eureka team.

lib/Capabilities/CapabilitiesAccordion/CapabilitiesAccordion.js

usavkov-epam · 2024-07-05T07:16:48Z

lib/Capabilities/CheckboxWithAsterisk/CheckboxWithAsterisk.js

Is this a Capabilities-specific component, or can it be reused in other entities? If it's common, it makes sense to move it outside of Capabilities/.

Right now it is used with Capabilities

lib/hooks/useApplicationCapabilities/useApplicationCapabilities.js

lib/Role/RoleCreate/RoleCreate.test.js

lib/RoleDetails/RoleDetailsAssignUsers/RoleDetailsAssignUsers.test.js

lib/RoleDetails/RoleDetailsCapabilitiesAccordion/RoleDetailsCapabilitiesAccordion.test.js

…les` and update translations

usavkov-epam

Besides comments below, I don't see a reason to add compiled translations

usavkov-epam · 2024-07-08T05:49:58Z

lib/Capabilities/CapabilitiesSettings/CapabilitiesSettings.js

+
+  const columnMapping = useMemo(() => {
+    return getColumnMapping(formatMessage);
+  }, []);


dependency missed

usavkov-epam · 2024-07-08T05:58:27Z

lib/Role/RoleCreate/RoleCreate.test.js

+    useApplicationCapabilities.mockReturnValue({ capabilities: { data:[{ id:'6e59c367-888a-4561-a3f3-3ca677de437f',
+      applicationId:'app-platform-complete-0.0.5',
+      resource:'Erm Agreements Collection',
+      actions:{ view:'6e59c367-888a-4561-a3f3-3ca677de437f' } },
+    ],
+    procedural:[],
+    settings:[{ id:'DDD-888a-4561-a3f3-3ca677de437f',
+      applicationId:'app-platform-complete-0.0.5',
+      resource:'Erm Agreements Collection',
+      actions:{ view:'DDD-888a-4561-a3f3-3ca677de437f' } }] },
+    roleCapabilitiesListIds: ['5c5198f9-de27-4349-9537-dc0b2b41c8c3'],
+    selectedCapabilitiesMap: { },
+    setSelectedCapabilitiesMap:mockSetSelectedCapabilitiesMap,
+    isLoading: false });


Suggested change

useApplicationCapabilities.mockReturnValue({ capabilities: { data:[{ id:'6e59c367-888a-4561-a3f3-3ca677de437f',

applicationId:'app-platform-complete-0.0.5',

resource:'Erm Agreements Collection',

actions:{ view:'6e59c367-888a-4561-a3f3-3ca677de437f' } },

],

procedural:[],

settings:[{ id:'DDD-888a-4561-a3f3-3ca677de437f',

applicationId:'app-platform-complete-0.0.5',

resource:'Erm Agreements Collection',

actions:{ view:'DDD-888a-4561-a3f3-3ca677de437f' } }] },

roleCapabilitiesListIds: ['5c5198f9-de27-4349-9537-dc0b2b41c8c3'],

selectedCapabilitiesMap: { },

setSelectedCapabilitiesMap:mockSetSelectedCapabilitiesMap,

isLoading: false });

useApplicationCapabilities.mockReturnValue({

capabilities: {

data: [{

id: '6e59c367-888a-4561-a3f3-3ca677de437f',

applicationId: 'app-platform-complete-0.0.5',

resource: 'Erm Agreements Collection',

actions: { view: '6e59c367-888a-4561-a3f3-3ca677de437f' }

}],

procedural: [],

settings: [{

id: 'DDD-888a-4561-a3f3-3ca677de437f',

applicationId: 'app-platform-complete-0.0.5',

resource: 'Erm Agreements Collection',

actions: { view: 'DDD-888a-4561-a3f3-3ca677de437f' }

}],

},

roleCapabilitiesListIds: ['5c5198f9-de27-4349-9537-dc0b2b41c8c3'],

selectedCapabilitiesMap: {},

setSelectedCapabilitiesMap: mockSetSelectedCapabilitiesMap,

isLoading: false,

});

usavkov-epam · 2024-07-08T06:02:39Z

lib/Role/RoleForm/RoleForm.js

+  const paneFooterRenderStart = <Button
+    marginBottom0
+    buttonStyle="default mega"
+    onClick={onClose}
+  ><FormattedMessage id="stripes-authorization-components.crud.cancel" />
+  </Button>;


Suggested change

const paneFooterRenderStart = <Button

marginBottom0

buttonStyle="default mega"

onClick={onClose}

><FormattedMessage id="stripes-authorization-components.crud.cancel" />

</Button>;

const paneFooterRenderStart = (

<Button

marginBottom0

buttonStyle="default mega"

onClick={onClose}

>

<FormattedMessage id="stripes-authorization-components.crud.cancel" />

</Button>;

);

usavkov-epam · 2024-07-08T06:03:49Z

lib/Role/RoleForm/RoleForm.js

+  const paneFooterRenderEnd = <Button
+    marginBottom0
+    buttonStyle="primary mega"
+    disabled={!roleName || isLoading}
+    type="submit"
+    onClick={onSubmit}
+  ><FormattedMessage id="stripes-components.saveAndClose" /></Button>;


Suggested change

const paneFooterRenderEnd = <Button

marginBottom0

buttonStyle="primary mega"

disabled={!roleName || isLoading}

type="submit"

onClick={onSubmit}

><FormattedMessage id="stripes-components.saveAndClose" /></Button>;

const paneFooterRenderEnd = (

<Button

marginBottom0

buttonStyle="primary mega"

disabled={!roleName || isLoading}

type="submit"

onClick={onSubmit}

>

<FormattedMessage id="stripes-components.saveAndClose" />

</Button>

);

usavkov-epam · 2024-07-08T06:05:56Z

lib/Role/RoleForm/RoleForm.js

+  const intl = useIntl();
+
+  return <form onSubmit={onSubmit} data-testid="create-role-form">
+    <Layer isOpen inRootSet contentLabel={intl.formatMessage({ id: title })}>


Suggested change

<Layer isOpen inRootSet contentLabel={intl.formatMessage({ id: title })}>

<Layer

isOpen

inRootSet

contentLabel={intl.formatMessage({ id: title })}

>

usavkov-epam · 2024-07-08T06:44:55Z

lib/hooks/useUserGroups/useUserGroups.js

+  const { data, isLoading, isSuccess } = useQuery(
+    namespace,
+    () => ky.get(`groups?limit=${stripes.config.maxUnpagedResourceCount}&query=cql.allRecords=1 sortby desc`).json(),
+  );


Suggested change

const { data, isLoading, isSuccess } = useQuery(

namespace,

() => ky.get(`groups?limit=${stripes.config.maxUnpagedResourceCount}&query=cql.allRecords=1 sortby desc`).json(),

);

const { data, isLoading, isSuccess } = useQuery({

queryKey: [namespace],

queryFn: ({ signal }) => ky.get(`groups?limit=${stripes.config.maxUnpagedResourceCount}&query=cql.allRecords=1 sortby desc`, { signal }).json(),

});

usavkov-epam · 2024-07-08T06:45:40Z

lib/hooks/useUserGroups/useUserGroups.js

@@ -0,0 +1,20 @@
+import { useQuery } from 'react-query';
+
+import { useNamespace, useOkapiKy, useStripes } from '@folio/stripes/core';


Suggested change

import { useNamespace, useOkapiKy, useStripes } from '@folio/stripes/core';

import {

useNamespace,

useOkapiKy,

useStripes,

} from '@folio/stripes/core';

usavkov-epam · 2024-07-08T06:47:24Z

lib/hooks/useUsers/useUsers.js

+import { keyBy } from 'lodash';
+import {
+  useChunkedCQLFetch,
+  useNamespace,
+} from '@folio/stripes/core';


Suggested change

import { keyBy } from 'lodash';

import {

useChunkedCQLFetch,

useNamespace,

} from '@folio/stripes/core';

import keyBy from 'lodash/keyBy';

import {

useChunkedCQLFetch,

useNamespace,

} from '@folio/stripes/core';

usavkov-epam · 2024-07-08T06:52:37Z

test/jest/helpers/renderWithIntl.js

+import React from 'react';
+import { render } from '@folio/jest-config-stripes/testing-library/react';


Suggested change

import React from 'react';

import { render } from '@folio/jest-config-stripes/testing-library/react';

import { render } from '@folio/jest-config-stripes/testing-library/react';

usavkov-epam · 2024-07-08T06:53:22Z

test/jest/helpers/renderWithRouter.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import { Router } from 'react-router-dom';
+import { createMemoryHistory } from 'history';


linter error: not listed dependency

sonarcloud · 2024-07-08T11:11:40Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
87.7% Coverage on New Code
0.9% Duplication on New Code

See analysis details on SonarCloud

alisher-epam · 2024-07-08T11:17:26Z

@usavkov-epam thank you for the feedback. I have fixed the codebase based on your comments.

alisher-epam self-assigned this Jun 28, 2024

alisher-epam requested review from a team July 2, 2024 05:47

usavkov-epam requested review from zburke and ryandberger July 2, 2024 06:04

alisher-epam mentioned this pull request Jul 2, 2024

UIROLES-86: Use Capabilities components from stripes-authorization-components repository instead of local files folio-org/ui-authorization-roles#72

Merged

UladzislauKutarkin approved these changes Jul 3, 2024

View reviewed changes

UladzislauKutarkin reviewed Jul 3, 2024

View reviewed changes

lib/Capabilities/CapabilitiesSettings/CapabilitiesSettings.js Outdated Show resolved Hide resolved

alisher-epam force-pushed the UISAUTHCOM-1 branch 2 times, most recently from 35a5f1d to 0027de7 Compare July 3, 2024 15:24

alisher-epam requested review from vashjs and BogdanDenis July 5, 2024 13:25

BogdanDenis approved these changes Jul 5, 2024

View reviewed changes

usavkov-epam reviewed Jul 5, 2024

View reviewed changes

alisher-epam requested a review from usavkov-epam July 5, 2024 16:30

NikitaSedyx and others added 8 commits July 6, 2024 11:37

Initial lib setup

1c99024

UISAUTHCOM-1: move Capabilities components from UIROLES

d3c1382

tests: fix failing tests

7c98e00

update column names

a789b1c

refactor column field

f1065a4

add condition to call the function correctly

f5e7786

update changelog and dependencies

68d2e96

update translations and move util function into hook folder

42e0475

alisher-epam added 4 commits July 6, 2024 11:37

test: add test coverage

572129d

import and refactor all reusable components from `ui-authorization-ro…

5f42f10

…les` and update translations

test: fix failing tests

45f577e

refactor code and improve test setup and imports

cefad2e

alisher-epam force-pushed the UISAUTHCOM-1 branch from 863f980 to cefad2e Compare July 6, 2024 06:37

usavkov-epam reviewed Jul 8, 2024

View reviewed changes

alisher-epam added 3 commits July 8, 2024 13:51

update code formatting

d5a92de

update loading state

9838847

Merge remote-tracking branch 'origin/master' into UISAUTHCOM-1

ad3ffe6

alisher-epam force-pushed the UISAUTHCOM-1 branch from 3d457e4 to ad3ffe6 Compare July 8, 2024 10:41

alisher-epam requested a review from usavkov-epam July 8, 2024 10:42

remove compiled translations

62e839d

alisher-epam merged commit 4c188fc into master Jul 8, 2024
6 checks passed

alisher-epam deleted the UISAUTHCOM-1 branch July 8, 2024 11:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UISAUTHCOM-1: Move reusable components from UIROLES #2

UISAUTHCOM-1: Move reusable components from UIROLES #2

alisher-epam commented Jun 28, 2024 •

edited

Loading

github-actions bot commented Jun 28, 2024 •

edited

Loading

github-actions bot commented Jun 28, 2024 •

edited

Loading

alisher-epam commented Jul 4, 2024

alisher-epam commented Jul 4, 2024

usavkov-epam commented Jul 5, 2024

alisher-epam commented Jul 5, 2024

usavkov-epam commented Jul 5, 2024

usavkov-epam Jul 5, 2024

alisher-epam Jul 5, 2024

usavkov-epam left a comment

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

usavkov-epam Jul 8, 2024

sonarcloud bot commented Jul 8, 2024

alisher-epam commented Jul 8, 2024

		@@ -0,0 +1,20 @@
		import { useQuery } from 'react-query';

		import { useNamespace, useOkapiKy, useStripes } from '@folio/stripes/core';

		import React from 'react';
		import { render } from '@folio/jest-config-stripes/testing-library/react';

UISAUTHCOM-1: Move reusable components from UIROLES #2

UISAUTHCOM-1: Move reusable components from UIROLES #2

Conversation

alisher-epam commented Jun 28, 2024 • edited Loading

Purpose

Approach

Pre-Merge Checklist

github-actions bot commented Jun 28, 2024 • edited Loading

Jest Unit Test Statistics

github-actions bot commented Jun 28, 2024 • edited Loading

BigTest Unit Test Statistics

alisher-epam commented Jul 4, 2024

alisher-epam commented Jul 4, 2024

usavkov-epam commented Jul 5, 2024

alisher-epam commented Jul 5, 2024

usavkov-epam commented Jul 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

usavkov-epam left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Jul 8, 2024

Quality Gate passed

alisher-epam commented Jul 8, 2024

alisher-epam commented Jun 28, 2024 •

edited

Loading

github-actions bot commented Jun 28, 2024 •

edited

Loading

github-actions bot commented Jun 28, 2024 •

edited

Loading