root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 196 Packages Projects Releases Wiki Activity

Provisioning: Skip folder sync when repository is empty (#111371) 

* Provisioning: Skip folder sync when repository is empty

* Simplify condition

* Fix condition
This commit is contained in:
Alex Khomenko 2025-09-19 16:50:47 +03:00 committed by GitHub
parent 5299878253
commit 460f776e6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/provisioning/Wizard/ProvisioningWizard.tsx
View File

@ -101,14 +101,14 @@ export function ProvisioningWizard({ type }: { type: RepoType }) {
handleSubmit,
} = methods;
const [repoName = '', repoType] = watch(['repositoryName', 'repository.type']);
const [repoName = '', repoType, syncTarget] = watch(['repositoryName', 'repository.type', 'repository.sync.target']);
const [submitData] = useCreateOrUpdateRepository(repoName);
const [deleteRepository] = useDeleteRepositoryMutation();
const {
shouldSkipSync,
requiresMigration,
isLoading: isResourceStatsLoading,
} = useResourceStats(repoName, isLegacyStorage);
} = useResourceStats(repoName, isLegacyStorage, syncTarget);
const { createSyncJob, isLoading: isCreatingSkipJob } = useCreateSyncJob({
repoName: repoName,
requiresMigration,

5
public/app/features/provisioning/Wizard/hooks/useResourceStats.ts
View File

@ -6,6 +6,7 @@ import {
GetRepositoryFilesApiResponse,
GetResourceStatsApiResponse,
ManagerStats,
RepositoryView,
ResourceCount,
useGetRepositoryFilesQuery,
useGetResourceStatsQuery,
@ -76,7 +77,7 @@ function getResourceStats(files?: GetRepositoryFilesApiResponse, stats?: GetReso
/**
* Hook that provides resource statistics and sync logic
*/
export function useResourceStats(repoName?: string, isLegacyStorage?: boolean) {
export function useResourceStats(repoName?: string, isLegacyStorage?: boolean, syncTarget?: RepositoryView['target']) {
const resourceStatsQuery = useGetResourceStatsQuery(repoName ? undefined : skipToken);
const filesQuery = useGetRepositoryFilesQuery(repoName ? { name: repoName } : skipToken);
@ -96,7 +97,7 @@ export function useResourceStats(repoName?: string, isLegacyStorage?: boolean) {
}, [resourceStatsQuery.data]);
const requiresMigration = isLegacyStorage || resourceCount > 0;
const shouldSkipSync = !requiresMigration && resourceCount === 0 && fileCount === 0;
const shouldSkipSync = !isLegacyStorage && (resourceCount === 0 || syncTarget === 'folder') && fileCount === 0;
// Format display strings
const resourceCountDisplay =