@things-factory/dataset 7.1.30 → 7.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.1.30",
+  "version": "7.1.33",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,21 +40,21 @@
     "@operato/shell": "^7.0.0",
     "@operato/styles": "^7.0.0",
     "@operato/utils": "^7.0.0",
-    "@things-factory/auth-base": "^7.1.24",
-    "@things-factory/aws-base": "^7.1.24",
-    "@things-factory/board-service": "^7.1.29",
+    "@things-factory/auth-base": "^7.1.33",
+    "@things-factory/aws-base": "^7.1.33",
+    "@things-factory/board-service": "^7.1.33",
     "@things-factory/env": "^7.1.16",
-    "@things-factory/integration-base": "^7.1.29",
-    "@things-factory/organization": "^7.1.30",
-    "@things-factory/personalization": "^7.1.24",
-    "@things-factory/scheduler-client": "^7.1.24",
+    "@things-factory/integration-base": "^7.1.33",
+    "@things-factory/organization": "^7.1.33",
+    "@things-factory/personalization": "^7.1.33",
+    "@things-factory/scheduler-client": "^7.1.33",
     "@things-factory/shell": "^7.1.24",
-    "@things-factory/work-shift": "^7.1.24",
-    "@things-factory/worklist": "^7.1.30",
+    "@things-factory/work-shift": "^7.1.33",
+    "@things-factory/worklist": "^7.1.33",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "1e985cc6d9db84862cbaf08363442e91e6ab10ba"
+  "gitHead": "da463a7d7851cf47c7d4b8136e7be6690b55969e"
 }

package/server/service/data-ooc/data-ooc-query.ts

@@ -50,7 +50,7 @@ export class DataOocQuery {
           version: dataOoc.dataSetVersion
         }
       }))
-    return dataSetHistory?.dataItems || []
+    return dataSetHistory?.dataItems.filter(item => item.active) || []
   }
 
   @FieldResolver(type => DataSample)

package/server/service/data-sample/data-sample-query.ts

@@ -175,7 +175,7 @@ export class DataSampleQuery {
         }
       }))
 
-    return dataSetHistory?.dataItems || []
+    return dataSetHistory?.dataItems.filter(item => item.active) || []
   }
 
   @FieldResolver(type => DataSet)

package/server/service/data-set/data-set-query.ts

@@ -92,9 +92,7 @@ export class DataSetQuery {
       .andWhere('dataset.active = :active', { active: true })
       .andWhere(
         new Brackets(qb => {
-          qb.where('dataset.supervisoryRole IN (:...roles)', { roles }).orWhere('dataset.entryRole IN (:...roles)', {
-            roles
-          })
+          qb.where('dataset.supervisoryRole IN (:...roles)').orWhere('dataset.entryRole IN (:...roles)')
         })
       )
       .setParameter('roles', roles)

package/server/service/data-summary/data-summary-query.ts

@@ -154,7 +154,7 @@ export class DataSummaryQuery {
   async dataItems(@Root() dataSummary: DataSummary): Promise<DataItem[]> {
     const dataSet = dataSummary.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataSummary.dataSetId }))
 
-    return dataSet?.dataItems || []
+    return dataSet?.dataItems.filter(item => item.active) || []
   }
 
   @FieldResolver(type => DataSet)