Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions react/src/pages/AdminVFolderNodeListPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import DeleteVFolderModal from '../components/DeleteVFolderModal';
import RestoreVFolderModal from '../components/RestoreVFolderModal';
import VFolderNodes, { VFolderNodeInList } from '../components/VFolderNodes';
import { handleRowSelectionChange } from '../helper';
import { useCurrentDomainValue, useSuspendedBackendaiClient } from '../hooks';
import { useSuspendedBackendaiClient } from '../hooks';
import { isDeletedCategory } from './VFolderNodeListPage';
import { useToggle } from 'ahooks';
import { Badge, Button, theme, Tooltip } from 'antd';
Expand Down Expand Up @@ -66,7 +66,6 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
const { t } = useTranslation();
const { token } = theme.useToken();
const baiClient = useSuspendedBackendaiClient();
const domainName = useCurrentDomainValue();

const [columnOverrides, setColumnOverrides] = useBAISettingUserState(
'table_column_overrides.AdminVFolderNodeListPage',
Expand Down Expand Up @@ -124,6 +123,7 @@ const AdminVFolderNodeListPage: React.FC = (props) => {

const [fetchKey, updateFetchKey] = useUpdatableState('initial-fetch');

// scope_id is intentionally omitted so superadmin sees all vfolders across all projects/domains
const queryVariables: AdminVFolderNodeListPageQuery$variables = {
offset: baiPaginationOption.offset,
first: baiPaginationOption.first,
Expand All @@ -139,7 +139,6 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
permission: 'read_attribute',
filterForActiveCount: FILTER_BY_STATUS_CATEGORY['active'],
filterForDeletedCount: FILTER_BY_STATUS_CATEGORY['deleted'],
scope_id: `domain:${domainName}`,
};
const deferredQueryVariables = useDeferredValue(queryVariables);
const deferredFetchKey = useDeferredValue(fetchKey);
Expand All @@ -155,15 +154,13 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
$permission: VFolderPermissionValueField
$filterForActiveCount: String
$filterForDeletedCount: String
$scope_id: ScopeField
) {
vfolder_nodes(
offset: $offset
first: $first
filter: $filter
order: $order
permission: $permission
scope_id: $scope_id
) {
edges @required(action: THROW) {
node @required(action: THROW) {
Expand All @@ -186,7 +183,6 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
offset: 0
filter: $filterForActiveCount
permission: $permission
scope_id: $scope_id
) {
count
}
Expand All @@ -195,7 +191,6 @@ const AdminVFolderNodeListPage: React.FC = (props) => {
offset: 0
filter: $filterForDeletedCount
permission: $permission
scope_id: $scope_id
) {
count
}
Expand Down
Loading