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

[Workspace] Fix workspace update issue #8570

Merged
merged 6 commits into from
Oct 14, 2024
Merged

[Workspace] Fix workspace update issue #8570

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f4cc01
fix workspace update issue
yubonluo Oct 12, 2024
cddd7ed
Changeset file for PR #8570 created/updated
opensearch-changeset-bot[bot] Oct 12, 2024
6fc744d
optimize the code
yubonluo Oct 12, 2024
5bf666d
Merge branch '2.17/fix-workspace-update-issue' of github.com:yubonluo…
yubonluo Oct 12, 2024
b36f8ea
optimize the code
yubonluo Oct 12, 2024
8bcc684
optimize the code
yubonluo Oct 12, 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
Next Next commit
fix workspace update issue 
Signed-off-by: yubonluo <yubonluo@amazon.com>
  • Loading branch information
@yubonluo
yubonluo committed Oct 12, 2024
commit 1f4cc017fa344a799be615009a297bcc744120ba
3 changes: 2 additions & 1 deletion src/plugins/workspace/public/components/workspace_detail_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
defaultMessage: 'Update workspace successfully',
}),
});
setIsFormSubmitting(false);
if (application && http && refresh) {
// Redirect page after one second, leave one second time to show update successful toast.
window.setTimeout(() => {
Expand All @@ -139,6 +138,8 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
http.basePath
);
}, 1000);
} else {
setIsFormSubmitting(false);
}
return result;
} else {
Expand Down
1 change: 0 additions & 1 deletion src/plugins/workspace/public/components/workspace_form/use_workspace_form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ export const useWorkspaceForm = ({
setDescription(resetValues?.description ?? '');
setColor(resetValues?.color);
setFeatureConfigs(resetValues?.features ?? []);
setPermissionSettings(defaultValuesRef.current?.permissionSettings ?? []);
setFormErrors({});
setIsEditing(false);
}, []);
Expand Down
73 changes: 0 additions & 73 deletions src/plugins/workspace/public/components/workspace_form/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,79 +553,6 @@ describe('getNumberOfChanges', () => {
)
).toEqual(1);
});
it('should return consistent permission settings changes count', () => {
expect(
getNumberOfChanges(
{
name: 'foo',
permissionSettings: [
{
id: 0,
type: WorkspacePermissionItemType.User,
userId: 'user-1',
modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
},
],
},
{
name: 'foo',
permissionSettings: [
{
id: 0,
type: WorkspacePermissionItemType.User,
userId: 'user-1',
modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
},
],
}
)
).toEqual(0);
// for remove permission setting
expect(
getNumberOfChanges(
{
name: 'foo',
permissionSettings: [
{
id: 0,
type: WorkspacePermissionItemType.User,
userId: 'user-1',
modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
},
{
id: 1,
type: WorkspacePermissionItemType.Group,
group: 'group-1',
modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
},
],
},
{
name: 'foo',
/**
* These include three changes:
* 1.Remove permission setting#0
* 2.Modify permission setting#1
* 3.Add permission setting#2
*/
permissionSettings: [
{
id: 1,
type: WorkspacePermissionItemType.Group,
group: 'group-1',
modes: [WorkspacePermissionMode.Read, WorkspacePermissionMode.LibraryWrite],
},
{
id: 2,
type: WorkspacePermissionItemType.User,
userId: 'user-1',
modes: [WorkspacePermissionMode.Write, WorkspacePermissionMode.LibraryWrite],
},
],
}
)
).toEqual(3);
});
});

describe('isWorkspacePermissionSetting', () => {
Expand Down
20 changes: 0 additions & 20 deletions src/plugins/workspace/public/components/workspace_form/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,25 +446,5 @@ export const getNumberOfChanges = (
) {
count++;
}
// Count all new added permission settings
count +=
newFormData.permissionSettings?.reduce((prevNewAddedCount, setting) => {
if (!initialFormData.permissionSettings?.find((item) => item.id === setting.id)) {
prevNewAddedCount += 1;
}
return prevNewAddedCount;
}, 0) ?? 0;
count +=
initialFormData.permissionSettings?.reduce((prevDeletedAndModifiedCount, setting) => {
const newSetting = newFormData.permissionSettings?.find((item) => item.id === setting.id);
if (!newSetting) {
// Count all delete permission settings
prevDeletedAndModifiedCount += 1;
} else if (!isSamePermissionSetting(newSetting, setting)) {
// Count all modified permission settings
prevDeletedAndModifiedCount += 1;
}
return prevDeletedAndModifiedCount;
}, 0) ?? 0;
return count;
};
Loading