Skip to content

Commit 32ebe81

Browse files
committed
chore: Reorganize hook calls for useWorkspacesFilter
1 parent a229855 commit 32ebe81

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

site/src/pages/WorkspacesPage/WorkspacesPage.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ const useWorkspacesFilter = ({
130130
searchParamsResult,
131131
pagination,
132132
}: UseWorkspacesFilterOptions) => {
133-
const orgId = useOrganizationId();
134133
const filter = useFilter({
135134
initialValue: `owner:me`,
136135
searchParamsResult,
137136
onUpdate: () => {
138137
pagination.goToPage(1);
139138
},
140139
});
140+
141141
const permissions = usePermissions();
142142
const canFilterByUser = permissions.viewDeploymentValues;
143143
const userMenu = useUserFilterMenu({
@@ -146,12 +146,15 @@ const useWorkspacesFilter = ({
146146
filter.update({ ...filter.values, owner: option?.value }),
147147
enabled: canFilterByUser,
148148
});
149+
150+
const orgId = useOrganizationId();
149151
const templateMenu = useTemplateFilterMenu({
150152
orgId,
151153
value: filter.values.template,
152154
onChange: (option) =>
153155
filter.update({ ...filter.values, template: option?.value }),
154156
});
157+
155158
const statusMenu = useStatusFilterMenu({
156159
value: filter.values.status,
157160
onChange: (option) =>

0 commit comments

Comments
 (0)