@okf/ootils 1.35.0 → 1.36.1

package/dist/universal.js

@@ -1224,6 +1224,34 @@ var BASE_BULLMQ_CONFIG = {
       maxStalledCount: 3
     }
   },
+  // One job per due ExternalConnection at each cron tick (hourly/daily/weekly).
+  // The worker handler doesn't do the import itself — it calls okf-be's
+  // /api/externalConnections/internal/runSync which fans out into the existing
+  // DIRECT_DATA_IMPORT_QUEUE for the batched fetch+import work. Keeping this
+  // queue separate from DDI gives clean dashboard separation, independent
+  // concurrency (background-friendly), and independent pause/drain.
+  SCHEDULED_EXTERNAL_SYNC_QUEUE: {
+    id: "scheduled-external-sync-queue",
+    queueConfig: {
+      defaultJobOptions: {
+        backoff: { type: "exponential", delay: 5e3 },
+        attempts: 3,
+        removeOnComplete: 30,
+        removeOnFail: 100
+      },
+      streams: {
+        events: {
+          maxLen: 10
+        }
+      }
+    },
+    workerConfig: {
+      concurrency: 1,
+      lockDuration: 6e5,
+      // 10 min — runSync HTTP call can be long
+      maxStalledCount: 3
+    }
+  },
   REINDEX_QUEUE: {
     id: "reindex-queue",
     queueConfig: {
@@ -2067,7 +2095,10 @@ var processAuthorAndCommonFilters = (allTpls, filterScopes, annoEnabledBlocks =
         }),
         source: {
           filterType: "usersType",
-          profileTypes: allProfileTpls.map((tpl) => tpl.kp_content_type)
+          profileTypes: allProfileTpls.map((tpl) => tpl.kp_content_type),
+          pinnedOptions: [
+            { display: "AI", value: null }
+          ]
         },
         target: {
           filterType: "valuePathType",
@@ -2331,6 +2362,9 @@ var sortFiltersHierarchically = (filters) => {
 };
 
 // src/utils/autoGenFilterConfigsFromTpl/utils/_self_managed_buildDocHierarchyConfig.ts
+var injectFilterOptionsBy = (filters) => filters.map(
+  (f) => f.parentFilterId ? { ...f, source: { ...f.source, filterOptionsBy: { filterId: f.parentFilterId } } } : f
+);
 var _self_managed_buildDocHierarchyConfig = ({
   combinedDocumentBlocks,
   docRollupBlocks,
@@ -2343,27 +2377,11 @@ var _self_managed_buildDocHierarchyConfig = ({
   const commonGroup = allGroups.find(
     (g) => g.contentTypes.length === selectedTpls.length
   );
-  const commonFilterConfigs = commonGroup ? sortFiltersHierarchically(
-    attachParentFields(
-      buildFilterConfigurations({
-        groups: [commonGroup],
-        type: "tags",
-        selectedTpls,
-        allTpls,
-        isRollup: false,
-        isAnno: false
-      }).flatMap((s) => s.configs),
-      allTpls
-    )
-  ) : [];
-  const multiDatasetGroups = selectedTpls.length >= 2 ? allGroups.filter(
-    (g) => g.contentTypes.length > 1 && g.contentTypes.length < selectedTpls.length
-  ) : [];
-  const sharedAcrossMultiple = multiDatasetGroups.map((group) => {
-    const groupFilterConfigs = sortFiltersHierarchically(
+  const commonFilterConfigs = commonGroup ? injectFilterOptionsBy(
+    sortFiltersHierarchically(
       attachParentFields(
         buildFilterConfigurations({
-          groups: [group],
+          groups: [commonGroup],
           type: "tags",
           selectedTpls,
           allTpls,
@@ -2372,6 +2390,26 @@ var _self_managed_buildDocHierarchyConfig = ({
         }).flatMap((s) => s.configs),
         allTpls
       )
+    )
+  ) : [];
+  const multiDatasetGroups = selectedTpls.length >= 2 ? allGroups.filter(
+    (g) => g.contentTypes.length > 1 && g.contentTypes.length < selectedTpls.length
+  ) : [];
+  const sharedAcrossMultiple = multiDatasetGroups.map((group) => {
+    const groupFilterConfigs = injectFilterOptionsBy(
+      sortFiltersHierarchically(
+        attachParentFields(
+          buildFilterConfigurations({
+            groups: [group],
+            type: "tags",
+            selectedTpls,
+            allTpls,
+            isRollup: false,
+            isAnno: false
+          }).flatMap((s) => s.configs),
+          allTpls
+        )
+      )
     );
     const display = group.contentTypes.map((ct) => {
       const tplData = allTpls.find(
@@ -2430,8 +2468,10 @@ var _self_managed_buildDocHierarchyConfig = ({
       (f) => !rollupSourceKeys.has(JSON.stringify(f.source))
     );
     const combined = [...dedupedFilters, ...rollupConfigs];
-    const combinedWithParents = sortFiltersHierarchically(
-      attachParentFields(combined, allTpls)
+    const combinedWithParents = injectFilterOptionsBy(
+      sortFiltersHierarchically(
+        attachParentFields(combined, allTpls)
+      )
     );
     const rollupFilterIds = new Set(rollupConfigs.map((r) => r.filterId));
     const filtersWithParents = combinedWithParents.filter(

package/dist/universal.mjs

@@ -1155,6 +1155,34 @@ var BASE_BULLMQ_CONFIG = {
       maxStalledCount: 3
     }
   },
+  // One job per due ExternalConnection at each cron tick (hourly/daily/weekly).
+  // The worker handler doesn't do the import itself — it calls okf-be's
+  // /api/externalConnections/internal/runSync which fans out into the existing
+  // DIRECT_DATA_IMPORT_QUEUE for the batched fetch+import work. Keeping this
+  // queue separate from DDI gives clean dashboard separation, independent
+  // concurrency (background-friendly), and independent pause/drain.
+  SCHEDULED_EXTERNAL_SYNC_QUEUE: {
+    id: "scheduled-external-sync-queue",
+    queueConfig: {
+      defaultJobOptions: {
+        backoff: { type: "exponential", delay: 5e3 },
+        attempts: 3,
+        removeOnComplete: 30,
+        removeOnFail: 100
+      },
+      streams: {
+        events: {
+          maxLen: 10
+        }
+      }
+    },
+    workerConfig: {
+      concurrency: 1,
+      lockDuration: 6e5,
+      // 10 min — runSync HTTP call can be long
+      maxStalledCount: 3
+    }
+  },
   REINDEX_QUEUE: {
     id: "reindex-queue",
     queueConfig: {
@@ -1998,7 +2026,10 @@ var processAuthorAndCommonFilters = (allTpls, filterScopes, annoEnabledBlocks =
         }),
         source: {
           filterType: "usersType",
-          profileTypes: allProfileTpls.map((tpl) => tpl.kp_content_type)
+          profileTypes: allProfileTpls.map((tpl) => tpl.kp_content_type),
+          pinnedOptions: [
+            { display: "AI", value: null }
+          ]
         },
         target: {
           filterType: "valuePathType",
@@ -2262,6 +2293,9 @@ var sortFiltersHierarchically = (filters) => {
 };
 
 // src/utils/autoGenFilterConfigsFromTpl/utils/_self_managed_buildDocHierarchyConfig.ts
+var injectFilterOptionsBy = (filters) => filters.map(
+  (f) => f.parentFilterId ? { ...f, source: { ...f.source, filterOptionsBy: { filterId: f.parentFilterId } } } : f
+);
 var _self_managed_buildDocHierarchyConfig = ({
   combinedDocumentBlocks,
   docRollupBlocks,
@@ -2274,27 +2308,11 @@ var _self_managed_buildDocHierarchyConfig = ({
   const commonGroup = allGroups.find(
     (g) => g.contentTypes.length === selectedTpls.length
   );
-  const commonFilterConfigs = commonGroup ? sortFiltersHierarchically(
-    attachParentFields(
-      buildFilterConfigurations({
-        groups: [commonGroup],
-        type: "tags",
-        selectedTpls,
-        allTpls,
-        isRollup: false,
-        isAnno: false
-      }).flatMap((s) => s.configs),
-      allTpls
-    )
-  ) : [];
-  const multiDatasetGroups = selectedTpls.length >= 2 ? allGroups.filter(
-    (g) => g.contentTypes.length > 1 && g.contentTypes.length < selectedTpls.length
-  ) : [];
-  const sharedAcrossMultiple = multiDatasetGroups.map((group) => {
-    const groupFilterConfigs = sortFiltersHierarchically(
+  const commonFilterConfigs = commonGroup ? injectFilterOptionsBy(
+    sortFiltersHierarchically(
       attachParentFields(
         buildFilterConfigurations({
-          groups: [group],
+          groups: [commonGroup],
           type: "tags",
           selectedTpls,
           allTpls,
@@ -2303,6 +2321,26 @@ var _self_managed_buildDocHierarchyConfig = ({
         }).flatMap((s) => s.configs),
         allTpls
       )
+    )
+  ) : [];
+  const multiDatasetGroups = selectedTpls.length >= 2 ? allGroups.filter(
+    (g) => g.contentTypes.length > 1 && g.contentTypes.length < selectedTpls.length
+  ) : [];
+  const sharedAcrossMultiple = multiDatasetGroups.map((group) => {
+    const groupFilterConfigs = injectFilterOptionsBy(
+      sortFiltersHierarchically(
+        attachParentFields(
+          buildFilterConfigurations({
+            groups: [group],
+            type: "tags",
+            selectedTpls,
+            allTpls,
+            isRollup: false,
+            isAnno: false
+          }).flatMap((s) => s.configs),
+          allTpls
+        )
+      )
     );
     const display = group.contentTypes.map((ct) => {
       const tplData = allTpls.find(
@@ -2361,8 +2399,10 @@ var _self_managed_buildDocHierarchyConfig = ({
       (f) => !rollupSourceKeys.has(JSON.stringify(f.source))
     );
     const combined = [...dedupedFilters, ...rollupConfigs];
-    const combinedWithParents = sortFiltersHierarchically(
-      attachParentFields(combined, allTpls)
+    const combinedWithParents = injectFilterOptionsBy(
+      sortFiltersHierarchically(
+        attachParentFields(combined, allTpls)
+      )
     );
     const rollupFilterIds = new Set(rollupConfigs.map((r) => r.filterId));
     const filtersWithParents = combinedWithParents.filter(

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.35.0",
+  "version": "1.36.1",
   "description": "Utility functions for both browser and Node.js",
   "main": "dist/index.js",
   "module": "dist/index.mjs",