Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STSMACOM-858: Display Unknown user when the creator was deleted (follow-up) #1521

Merged
merged 9 commits into from
Oct 7, 2024
Merged

STSMACOM-858: Display Unknown user when the creator was deleted (follow-up) #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7085f1b
STSMACOM-858: Display 'System' user when there is no 'updatedByUserId…
OleksandrHladchenko1 Sep 19, 2024
2eb01c2
STSMACOM-858: Fix tests
OleksandrHladchenko1 Sep 19, 2024
b4721fe
STSMACOM-858: Display 'Unknown user' when the creator was deleted
OleksandrHladchenko1 Oct 4, 2024
84ca693
STSMACOM-858: Update unit tests
OleksandrHladchenko1 Oct 4, 2024
b0f13bd
STSMACOM-858: Update unit tests
OleksandrHladchenko1 Oct 4, 2024
1a4b22e
STSMACOM-858: Update unit tests
OleksandrHladchenko1 Oct 4, 2024
c12e393
Merge branch 'master' into STSMACOM-858
OleksandrHladchenko1 Oct 4, 2024
2d25bc1
STSMACOM-858: Use translation from stripes-components
OleksandrHladchenko1 Oct 7, 2024
c5e5b8f
Merge branch 'STSMACOM-858' of https://github.com/folio-org/stripes-s…
OleksandrHladchenko1 Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/ControlledVocab/ControlledVocab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,8 @@ class ControlledVocab extends React.Component {
user = <Link to={`/users/view/${metadata.updatedByUserId}`}>{name}</Link>;
} else if (metadata.updatedByUserId === SYSTEM_USER_ID || !metadata.updatedByUserId) {
user = <FormattedMessage id="stripes-smart-components.system" />;
} else {
user = <FormattedMessage id="stripes-components.metaSection.unknownUser" />;
}

return (
Expand Down
4 changes: 2 additions & 2 deletions lib/ControlledVocab/tests/ControlledVocab-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ describe('ControlledVocab', () => {

it('should have row count 7', () => cv.has({ rowCount: 7 }));

it('should render the row with last updated by user-1 without user firstname or lastname', async () => {
await mcl.find(MultiColumnListCell({ row: 4, columnIndex: 3, content: '4/18/2019 by ' })).exists();
it('should render the row with last updated by unknown user without user firstname or lastname', async () => {
await mcl.find(MultiColumnListCell({ row: 5, columnIndex: 3, content: '4/18/2019 by Unknown user' })).exists();
});

it('should render the row with last updated by system with "System" text', async () => {
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"node": ">=14.0.0"
},
"stripes": {
"actsAs": [],
"okapiInterfaces": {
"notes": "2.0 3.0",
"tags": "1.0",
Expand Down
Loading