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]feat: add collaborator table to workspace detail page #8501

Merged
merged 8 commits into from
Oct 9, 2024
Merged

[Workspace]feat: add collaborator table to workspace detail page #8501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c34a83
feat: add collaborator table
raintygao Oct 5, 2024
d0da576
Changeset file for PR #8501 created/updated
opensearch-changeset-bot[bot] Oct 5, 2024
42b2b82
Changeset file for PR #8501 created/updated
opensearch-changeset-bot[bot] Oct 5, 2024
5ecf839
remove extra comment and add test for button
raintygao Oct 7, 2024
38e6716
combine onChange
raintygao Oct 7, 2024
5770158
update table
raintygao Oct 7, 2024
1efb722
test: add tests for table
raintygao Oct 7, 2024
fd17483
address comments
raintygao Oct 8, 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 changelogs/fragments/8501.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
feat:
- Add collaborator table to workspace detail page ([#8501](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8501))
4 changes: 2 additions & 2 deletions ...ugins/workspace/public/components/workspace_creator/workspace_form_summary_panel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ describe('WorkspaceFormSummaryPanel', () => {
expect(screen.getByText('Data Source 2')).toBeInTheDocument();
expect(screen.getByText('Data Source 3')).toBeInTheDocument();
expect(screen.getByText('user1')).toBeInTheDocument();
expect(screen.getByText('Owner')).toBeInTheDocument();
expect(screen.getByText('Admin')).toBeInTheDocument();
expect(screen.getByText('group1')).toBeInTheDocument();
expect(screen.getByText('Read')).toBeInTheDocument();
expect(screen.getByText('Read only')).toBeInTheDocument();
expect(screen.getByText('+1 more')).toBeInTheDocument();
expect(screen.queryByText('user2')).toBeNull();
expect(screen.getByText('Cancel')).toBeInTheDocument();
Expand Down
5 changes: 5 additions & 0 deletions ...workspace/public/components/workspace_detail/__snapshots__/workspace_detail.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/plugins/workspace/public/components/workspace_detail/workspace_detail.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { WorkspaceFormProvider, WorkspaceOperationType } from '../workspace_form
import { DataSourceConnectionType } from '../../../common/types';
import * as utilsExports from '../../utils';
import { IntlProvider } from 'react-intl';
import { of } from 'rxjs';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: let's keep the empty line

Suggested change
import { of } from 'rxjs';
import { of } from 'rxjs';


// all applications
const PublicAPPInfoMap = new Map([
Expand Down Expand Up @@ -131,6 +132,9 @@ const WorkspaceDetailPage = (props: any) => {
return null;
},
},
collaboratorTypes: {
getTypes$: jest.fn().mockReturnValue(of([])),
},
},
});

Expand Down
5 changes: 3 additions & 2 deletions 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 @@ -92,7 +92,7 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
}, [currentWorkspace, savedObjects, http, notifications]);

const handleWorkspaceFormSubmit = useCallback(
async (data: WorkspaceFormSubmitData) => {
async (data: WorkspaceFormSubmitData, refresh?: boolean) => {
let result;
if (isFormSubmitting) {
return;
Expand Down Expand Up @@ -127,7 +127,8 @@ export const WorkspaceDetailApp = (props: WorkspaceDetailPropsWithOnAppLeave) =>
defaultMessage: 'Update workspace successfully',
}),
});
if (application && http) {
setIsFormSubmitting(false);
if (application && http && refresh) {
// Redirect page after one second, leave one second time to show update successful toast.
window.setTimeout(() => {
window.location.href = formatUrlWithWorkspaceId(
Expand Down
124 changes: 124 additions & 0 deletions ...pace/public/components/workspace_form/__snapshots__/add_collaborator_button.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading