@things-factory/dataset 6.0.0-zeta.8 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.0-zeta.8",
+  "version": "6.0.0",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -33,14 +33,14 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.0.0-zeta.8",
-    "@things-factory/aws-base": "^6.0.0-zeta.8",
-    "@things-factory/board-service": "^6.0.0-zeta.8",
-    "@things-factory/env": "^6.0.0-zeta.1",
-    "@things-factory/shell": "^6.0.0-zeta.8",
-    "@things-factory/work-shift": "^6.0.0-zeta.8",
+    "@things-factory/auth-base": "^6.0.0",
+    "@things-factory/aws-base": "^6.0.0",
+    "@things-factory/board-service": "^6.0.0",
+    "@things-factory/env": "^6.0.0-zeta.30",
+    "@things-factory/shell": "^6.0.0",
+    "@things-factory/work-shift": "^6.0.0",
     "cron-parser": "^4.3.0",
-    "moment-timezone": "^0.5.34"
+    "moment-timezone": "^0.5.40"
   },
-  "gitHead": "84c5baee000c881c95673adf97eb30992e09e553"
+  "gitHead": "8797165c1e1f734a52cfd2c1ebbb53fe126796e9"
 }

package/server/service/data-archive/data-archive.ts

@@ -64,6 +64,6 @@ export class DataArchive {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataArchive: DataArchive) => dataArchive.creator)
+  @RelationId((dataArchive: DataArchive) => dataArchive.updater)
   updaterId?: string
 }

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

@@ -78,7 +78,7 @@ export class DataKeySet {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)
+  @RelationId((dataKeySet: DataKeySet) => dataKeySet.updater)
   updaterId?: string
 
   @Field(type => String, { nullable: true })

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

@@ -17,7 +17,7 @@ export class DataOocSubscription {
         throw new Error('domain required')
       }
 
-      if (!user.domains?.find(d => d.subdomain === subdomain)) {
+      if (!user.domains?.find(d => d.subdomain === subdomain) && !process.superUserGranted(domain, user)) {
         throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
       }
 

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

@@ -208,6 +208,6 @@ export class DataOoc {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataOoc: DataOoc) => dataOoc.creator)
+  @RelationId((dataOoc: DataOoc) => dataOoc.updater)
   updaterId?: string
 }

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

@@ -173,6 +173,6 @@ export class DataSample {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataSample: DataSample) => dataSample.creator)
+  @RelationId((dataSample: DataSample) => dataSample.updater)
   updaterId?: string
 }

package/server/service/data-sensor/data-sensor.ts

@@ -126,6 +126,6 @@ export class DataSensor {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataSensor: DataSensor) => dataSensor.creator)
+  @RelationId((dataSensor: DataSensor) => dataSensor.updater)
   updaterId?: string
 }

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

@@ -114,9 +114,10 @@ export class DataSetQuery {
   async entryRole(@Root() dataSet: DataSet): Promise<Role> {
     return (
       dataSet.entryRole ||
-      (await getRepository(Role).findOneBy({
-        id: dataSet.entryRoleId
-      }))
+      (dataSet.entryRoleId &&
+        (await getRepository(Role).findOneBy({
+          id: dataSet.entryRoleId
+        })))
     )
   }
 
@@ -124,9 +125,10 @@ export class DataSetQuery {
   async supervisoryRole(@Root() dataSet: DataSet): Promise<Role> {
     return (
       dataSet.supervisoryRole ||
-      (await getRepository(Role).findOneBy({
-        id: dataSet.supervisoryRoleId
-      }))
+      (dataSet.supervisoryRoleId &&
+        (await getRepository(Role).findOneBy({
+          id: dataSet.supervisoryRoleId
+        })))
     )
   }
 

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

@@ -177,6 +177,6 @@ export class DataSet {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataSet: DataSet) => dataSet.creator)
+  @RelationId((dataSet: DataSet) => dataSet.updater)
   updaterId?: string
 }

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

@@ -47,9 +47,10 @@ export class DataSetHistoryQuery {
   async entryRole(@Root() dataSetHistory: DataSetHistory): Promise<Role> {
     return (
       dataSetHistory.entryRole ||
-      (await getRepository(Role).findOneBy({
-        id: dataSetHistory.entryRoleId
-      }))
+      (dataSetHistory.entryRoleId &&
+        (await getRepository(Role).findOneBy({
+          id: dataSetHistory.entryRoleId
+        })))
     )
   }
 
@@ -57,9 +58,10 @@ export class DataSetHistoryQuery {
   async supervisoryRole(@Root() dataSetHistory: DataSetHistory): Promise<Role> {
     return (
       dataSetHistory.supervisoryRole ||
-      (await getRepository(Role).findOneBy({
-        id: dataSetHistory.supervisoryRoleId
-      }))
+      (dataSetHistory.supervisoryRoleId &&
+        (await getRepository(Role).findOneBy({
+          id: dataSetHistory.supervisoryRoleId
+        })))
     )
   }
 

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

@@ -6,7 +6,7 @@ import {
   HistoryActionType,
   HistoryEntityInterface,
   HistoryOriginalIdColumn
-} from '@anchan828/typeorm-history'
+} from '@operato/typeorm-history'
 import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
@@ -149,7 +149,7 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   @Field({ nullable: true })
   updater?: User
 
-  @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.creator)
+  @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.updater)
   updaterId?: string
 
   @HistoryOriginalIdColumn({ nullable: true })

package/server/service/data-set-history/event-subscriber.ts

@@ -1,6 +1,6 @@
 import { EventSubscriber } from 'typeorm'
 
-import { HistoryEntitySubscriber } from '@anchan828/typeorm-history'
+import { HistoryEntitySubscriber } from '@operato/typeorm-history'
 
 import { DataSet } from '../data-set/data-set'
 import { DataSetHistory } from './data-set-history'