Skip to content

Commit 9f3cb82

Browse files
committed
fix(FR-2476): add missing permission argument to admin vfolder queries (#6467)
Resolves #6434 (FR-2476) ## Summary - Add required `permission` argument to `vfolder_nodes` queries in `AdminVFolderNodeListPage` (all 3 calls: main list, active count, deleted count) - Use `read_attribute` as the default permission value, consistent with `VFolderNodeListPage` - Fix `BAIVFolderDeleteButton.stories.tsx` query to pass `permission` as a variable ## Test plan - [ ] Admin data page loads without GraphQL errors - [ ] VFolder list displays correctly on admin page - [ ] Active and deleted folder counts load correctly ## Verification ``` === Relay: PASS === === Lint: PASS === === Format: PASS === === TypeScript: PASS === === ALL PASS === ```
1 parent c6ba054 commit 9f3cb82

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

packages/backend.ai-ui/src/components/fragments/BAIVFolderDeleteButton.stories.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ const QueryResolver = ({ disabled = false, onClick }: QueryResolverProps) => {
8989
const { vfolder_nodes } =
9090
useLazyLoadQuery<BAIVFolderDeleteButtonStoriesQuery>(
9191
graphql`
92-
query BAIVFolderDeleteButtonStoriesQuery {
93-
vfolder_nodes(offset: 0, first: 10) {
92+
query BAIVFolderDeleteButtonStoriesQuery(
93+
$permission: VFolderPermissionValueField
94+
) {
95+
vfolder_nodes(offset: 0, first: 10, permission: $permission) {
9496
edges {
9597
node {
9698
...BAIVFolderDeleteButtonFragment
@@ -99,7 +101,7 @@ const QueryResolver = ({ disabled = false, onClick }: QueryResolverProps) => {
99101
}
100102
}
101103
`,
102-
{},
104+
{ permission: 'read_attribute' },
103105
);
104106

105107
const vfolders = vfolder_nodes?.edges?.map((edge: any) => edge.node);

react/src/pages/AdminVFolderNodeListPage.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
136136
usageModeFilter,
137137
]),
138138
order: queryParams.order,
139+
permission: 'read_attribute',
139140
filterForActiveCount: FILTER_BY_STATUS_CATEGORY['active'],
140141
filterForDeletedCount: FILTER_BY_STATUS_CATEGORY['deleted'],
141142
scope_id: `domain:${domainName}`,
@@ -151,6 +152,7 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
151152
$first: Int
152153
$filter: String
153154
$order: String
155+
$permission: VFolderPermissionValueField
154156
$filterForActiveCount: String
155157
$filterForDeletedCount: String
156158
$scope_id: ScopeField
@@ -160,6 +162,7 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
160162
first: $first
161163
filter: $filter
162164
order: $order
165+
permission: $permission
163166
scope_id: $scope_id
164167
) {
165168
edges @required(action: THROW) {
@@ -182,13 +185,17 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
182185
first: 0
183186
offset: 0
184187
filter: $filterForActiveCount
188+
permission: $permission
189+
scope_id: $scope_id
185190
) {
186191
count
187192
}
188193
deleted: vfolder_nodes(
189194
first: 0
190195
offset: 0
191196
filter: $filterForDeletedCount
197+
permission: $permission
198+
scope_id: $scope_id
192199
) {
193200
count
194201
}

0 commit comments

Comments
 (0)