Skip to content

Commit b5818e2

Browse files
committed
fix: workspace edit button issue
Signed-off-by: amitamrutiya <amitamrutiya2210@gmail.com>
1 parent 8d702f3 commit b5818e2

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

src/custom/Workspaces/DesignTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ const DesignTable: React.FC<DesignTableProps> = ({
181181
workspaceId,
182182
useAssignDesignToWorkspaceMutation,
183183
useUnassignDesignFromWorkspaceMutation,
184-
useGetDesignsOfWorkspaceQuery: useGetWorkspaceDesignsQuery
184+
useGetDesignsOfWorkspaceQuery: useGetWorkspaceDesignsQuery,
185+
isDesignsVisible: isAssignAllowed || isRemoveAllowed
185186
});
186187

187188
const tableHeaderContent = (

src/custom/Workspaces/EnvironmentTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ const EnvironmentTable: React.FC<EnvironmentTableProps> = ({
183183
workspaceId,
184184
useGetEnvironmentsOfWorkspaceQuery,
185185
useUnassignEnvironmentFromWorkspaceMutation,
186-
useAssignEnvironmentToWorkspaceMutation
186+
useAssignEnvironmentToWorkspaceMutation,
187+
isEnvironmentsVisible: isAssignAllowed || isRemoveAllowed
187188
});
188189

189190
const [columnVisibility, setColumnVisibility] = useState<Record<string, boolean>>(() => {

src/custom/Workspaces/WorkspaceTeamsTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ const TeamsTable: React.FC<TeamsTableProps> = ({
7070
workspaceId,
7171
useGetTeamsOfWorkspaceQuery,
7272
useAssignTeamToWorkspaceMutation,
73-
useUnassignTeamFromWorkspaceMutation
73+
useUnassignTeamFromWorkspaceMutation,
74+
isTeamsVisible: isAssignTeamAllowed || isRemoveTeamFromWorkspaceAllowed
7475
});
7576

7677
const handleRemoveTeamFromWorkspace = (teamId: string): void => {

src/custom/Workspaces/WorkspaceViewsTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ const WorkspaceViewsTable: React.FC<ViewsTableProps> = ({
248248
workspaceId,
249249
useGetViewsOfWorkspaceQuery,
250250
useUnassignViewFromWorkspaceMutation,
251-
useAssignViewToWorkspaceMutation
251+
useAssignViewToWorkspaceMutation,
252+
isViewsVisible: isAssignAllowed || isRemoveAllowed
252253
});
253254

254255
const [columnVisibility, setColumnVisibility] = useState<Record<string, boolean>>(() => {

src/custom/Workspaces/hooks/useViewsAssignment.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ interface useViewAssignmentProps {
1414
useGetViewsOfWorkspaceQuery: any;
1515
useAssignViewToWorkspaceMutation: any;
1616
useUnassignViewFromWorkspaceMutation: any;
17-
isEnvironmentsVisible?: boolean;
17+
isViewsVisible: boolean;
1818
}
1919

2020
const useViewAssignment = ({
2121
workspaceId,
2222
useGetViewsOfWorkspaceQuery,
2323
useAssignViewToWorkspaceMutation,
2424
useUnassignViewFromWorkspaceMutation,
25-
isEnvironmentsVisible
25+
isViewsVisible
2626
}: useViewAssignmentProps): AssignmentHookResult<Pattern> => {
2727
const [viewsPage, setviewsPage] = useState<number>(0);
2828
const [viewsData, setviewsData] = useState<Pattern[]>([]);
@@ -42,7 +42,7 @@ const useViewAssignment = ({
4242
filter: '{"assigned":false}'
4343
}),
4444
{
45-
skip: skipviews || !isEnvironmentsVisible
45+
skip: skipviews || !isViewsVisible
4646
}
4747
);
4848

@@ -53,7 +53,7 @@ const useViewAssignment = ({
5353
pagesize: viewsPageSize
5454
}),
5555
{
56-
skip: skipviews || !isEnvironmentsVisible
56+
skip: skipviews || !isViewsVisible
5757
}
5858
);
5959

0 commit comments

Comments
 (0)