File tree Expand file tree Collapse file tree 4 files changed +20
-12
lines changed
src/custom/Workspaces/hooks Expand file tree Collapse file tree 4 files changed +20
-12
lines changed Original file line number Diff line number Diff line change @@ -14,13 +14,15 @@ interface useDesignAssignmentProps {
14
14
useGetDesignsOfWorkspaceQuery : any ;
15
15
useAssignDesignToWorkspaceMutation : any ;
16
16
useUnassignDesignFromWorkspaceMutation : any ;
17
+ isDesignsVisible ?: boolean ;
17
18
}
18
19
19
20
const useDesignAssignment = ( {
20
21
workspaceId,
21
22
useGetDesignsOfWorkspaceQuery,
22
23
useAssignDesignToWorkspaceMutation,
23
- useUnassignDesignFromWorkspaceMutation
24
+ useUnassignDesignFromWorkspaceMutation,
25
+ isDesignsVisible
24
26
} : useDesignAssignmentProps ) : AssignmentHookResult < Pattern > => {
25
27
const [ designsPage , setDesignsPage ] = useState < number > ( 0 ) ;
26
28
const [ designsData , setDesignsData ] = useState < Pattern [ ] > ( [ ] ) ;
@@ -40,7 +42,7 @@ const useDesignAssignment = ({
40
42
filter : '{"assigned":false}'
41
43
} ) ,
42
44
{
43
- skip : skipDesigns
45
+ skip : skipDesigns || ! isDesignsVisible
44
46
}
45
47
) ;
46
48
@@ -51,7 +53,7 @@ const useDesignAssignment = ({
51
53
pagesize : designsPageSize
52
54
} ) ,
53
55
{
54
- skip : skipDesigns
56
+ skip : skipDesigns || ! isDesignsVisible
55
57
}
56
58
) ;
57
59
Original file line number Diff line number Diff line change @@ -8,13 +8,15 @@ interface UseEnvironmentAssignmentProps {
8
8
useGetEnvironmentsOfWorkspaceQuery : any ;
9
9
useAssignEnvironmentToWorkspaceMutation : any ;
10
10
useUnassignEnvironmentFromWorkspaceMutation : any ;
11
+ isEnvironmentsVisible ?: boolean ;
11
12
}
12
13
13
14
const useEnvironmentAssignment = ( {
14
15
workspaceId,
15
16
useGetEnvironmentsOfWorkspaceQuery,
16
17
useAssignEnvironmentToWorkspaceMutation,
17
- useUnassignEnvironmentFromWorkspaceMutation
18
+ useUnassignEnvironmentFromWorkspaceMutation,
19
+ isEnvironmentsVisible
18
20
} : UseEnvironmentAssignmentProps ) : AssignmentHookResult < Environment > => {
19
21
const [ environmentsPage , setEnvironmentsPage ] = useState < number > ( 0 ) ;
20
22
const [ environmentsData , setEnvironmentsData ] = useState < Environment [ ] > ( [ ] ) ;
@@ -34,7 +36,7 @@ const useEnvironmentAssignment = ({
34
36
filter : '{"assigned":false}'
35
37
} ) ,
36
38
{
37
- skip : skipEnvironments
39
+ skip : skipEnvironments || ! isEnvironmentsVisible
38
40
}
39
41
) ;
40
42
@@ -45,7 +47,7 @@ const useEnvironmentAssignment = ({
45
47
pagesize : environmentsPageSize
46
48
} ) ,
47
49
{
48
- skip : skipEnvironments
50
+ skip : skipEnvironments || ! isEnvironmentsVisible
49
51
}
50
52
) ;
51
53
Original file line number Diff line number Diff line change @@ -8,13 +8,15 @@ interface UseTeamAssignmentProps {
8
8
useGetTeamsOfWorkspaceQuery : any ;
9
9
useAssignTeamToWorkspaceMutation : any ;
10
10
useUnassignTeamFromWorkspaceMutation : any ;
11
+ isTeamsVisible ?: boolean ;
11
12
}
12
13
13
14
const useTeamAssignment = ( {
14
15
workspaceId,
15
16
useGetTeamsOfWorkspaceQuery,
16
17
useAssignTeamToWorkspaceMutation,
17
- useUnassignTeamFromWorkspaceMutation
18
+ useUnassignTeamFromWorkspaceMutation,
19
+ isTeamsVisible
18
20
} : UseTeamAssignmentProps ) : AssignmentHookResult < Team > => {
19
21
const [ teamsPage , setTeamsPage ] = useState < number > ( 0 ) ;
20
22
const [ teamsData , setTeamsData ] = useState < Team [ ] > ( [ ] ) ;
@@ -36,7 +38,7 @@ const useTeamAssignment = ({
36
38
filter : '{"assigned":false}'
37
39
} ) ,
38
40
{
39
- skip : skipTeams
41
+ skip : skipTeams || ! isTeamsVisible
40
42
}
41
43
) ;
42
44
@@ -47,7 +49,7 @@ const useTeamAssignment = ({
47
49
pagesize : teamsPageSize
48
50
} ) ,
49
51
{
50
- skip : skipTeams
52
+ skip : skipTeams || ! isTeamsVisible
51
53
}
52
54
) ;
53
55
Original file line number Diff line number Diff line change @@ -14,13 +14,15 @@ interface useViewAssignmentProps {
14
14
useGetViewsOfWorkspaceQuery : any ;
15
15
useAssignViewToWorkspaceMutation : any ;
16
16
useUnassignViewFromWorkspaceMutation : any ;
17
+ isEnvironmentsVisible ?: boolean ;
17
18
}
18
19
19
20
const useViewAssignment = ( {
20
21
workspaceId,
21
22
useGetViewsOfWorkspaceQuery,
22
23
useAssignViewToWorkspaceMutation,
23
- useUnassignViewFromWorkspaceMutation
24
+ useUnassignViewFromWorkspaceMutation,
25
+ isEnvironmentsVisible
24
26
} : useViewAssignmentProps ) : AssignmentHookResult < Pattern > => {
25
27
const [ viewsPage , setviewsPage ] = useState < number > ( 0 ) ;
26
28
const [ viewsData , setviewsData ] = useState < Pattern [ ] > ( [ ] ) ;
@@ -40,7 +42,7 @@ const useViewAssignment = ({
40
42
filter : '{"assigned":false}'
41
43
} ) ,
42
44
{
43
- skip : skipviews
45
+ skip : skipviews || ! isEnvironmentsVisible
44
46
}
45
47
) ;
46
48
@@ -51,7 +53,7 @@ const useViewAssignment = ({
51
53
pagesize : viewsPageSize
52
54
} ) ,
53
55
{
54
- skip : skipviews
56
+ skip : skipviews || ! isEnvironmentsVisible
55
57
}
56
58
) ;
57
59
You can’t perform that action at this time.
0 commit comments