perf(): filter by path when loading collection from github backend (#…

…6898)
decaporg · Aug 31, 2023 · 18ef773 · 18ef773
1 parent 7b74b68
commit 18ef773
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 6 deletions.
diff --git a/packages/decap-cms-backend-git-gateway/src/implementation.ts b/packages/decap-cms-backend-git-gateway/src/implementation.ts
@@ -392,8 +392,8 @@ export default class GitGateway implements Implementation {
   async entriesByFolder(folder: string, extension: string, depth: number) {
     return this.backend!.entriesByFolder(folder, extension, depth);
   }
-  allEntriesByFolder(folder: string, extension: string, depth: number) {
-    return this.backend!.allEntriesByFolder(folder, extension, depth);
+  allEntriesByFolder(folder: string, extension: string, depth: number, pathRegex?: RegExp) {
+    return this.backend!.allEntriesByFolder(folder, extension, depth, pathRegex);
   }
   entriesByFiles(files: ImplementationFile[]) {
     return this.backend!.entriesByFiles(files);

diff --git a/packages/decap-cms-backend-github/src/implementation.tsx b/packages/decap-cms-backend-github/src/implementation.tsx
@@ -401,14 +401,18 @@ export default class GitHub implements Implementation {
     return files;
   }
 
-  async allEntriesByFolder(folder: string, extension: string, depth: number) {
+  async allEntriesByFolder(folder: string, extension: string, depth: number, pathRegex?: RegExp) {
     const repoURL = this.api!.originRepoURL;
 
     const listFiles = () =>
       this.api!.listFiles(folder, {
         repoURL,
         depth,
-      }).then(files => files.filter(file => filterByExtension(file, extension)));
+      }).then(files =>
+        files.filter(
+          file => (!pathRegex || pathRegex.test(file.path)) && filterByExtension(file, extension),
+        ),
+      );
 
     const readFile = (path: string, id: string | null | undefined) => {
       return this.api!.readFile(path, id, { repoURL }) as Promise<string>;

diff --git a/packages/decap-cms-core/src/backend.ts b/packages/decap-cms-core/src/backend.ts
@@ -46,6 +46,7 @@ import {
   getI18nDataFiles,
   getI18nBackup,
   formatI18nBackup,
+  getI18nInfo,
 } from './lib/i18n';
 
 import type AssetProxy from './valueObjects/AssetProxy';
@@ -307,6 +308,27 @@ function collectionDepth(collection: Collection) {
   return depth;
 }
 
+function collectionRegex(collection: Collection): RegExp | undefined {
+  console.log('collection', collection.toJS());
+  let ruleString = '';
+
+  if (collection.get('path')) {
+    ruleString = `${collection.get('folder')}/${collection.get('path')}`.replace(
+      /{{.*}}/gm,
+      '(.*)',
+    );
+  }
+
+  if (hasI18n(collection)) {
+    const { defaultLocale } = getI18nInfo(collection) as { defaultLocale: string };
+    ruleString += `\\.${defaultLocale}\\..*`;
+  }
+
+  console.log('ruleString', ruleString);
+
+  return ruleString ? new RegExp(ruleString) : undefined;
+}
+
 export class Backend {
   implementation: Implementation;
   backendName: string;
@@ -552,7 +574,12 @@ export class Backend {
       const depth = collectionDepth(collection);
       const extension = selectFolderEntryExtension(collection);
       return this.implementation
-        .allEntriesByFolder(collection.get('folder') as string, extension, depth)
+        .allEntriesByFolder(
+          collection.get('folder') as string,
+          extension,
+          depth,
+          collectionRegex(collection),
+        )
         .then(entries => this.processEntries(entries, collection));
     }
 

diff --git a/packages/decap-cms-core/src/lib/i18n.ts b/packages/decap-cms-core/src/lib/i18n.ts
@@ -250,7 +250,11 @@ function mergeValues(
   return entryValue;
 }
 
-function mergeSingleFileValue(entryValue: EntryValue, defaultLocale: string, locales: string[]) {
+function mergeSingleFileValue(
+  entryValue: EntryValue,
+  defaultLocale: string,
+  locales: string[],
+): EntryValue {
   const data = entryValue.data[defaultLocale] || {};
   const i18n = locales
     .filter(l => l !== defaultLocale)

diff --git a/packages/decap-cms-lib-util/src/implementation.ts b/packages/decap-cms-lib-util/src/implementation.ts
@@ -177,6 +177,7 @@ export interface Implementation {
     folder: string,
     extension: string,
     depth: number,
+    pathRegex?: RegExp,
   ) => Promise<ImplementationEntry[]>;
   traverseCursor?: (
     cursor: Cursor,