@things-factory/dataset 5.0.0-alpha.15 → 5.0.0-alpha.19

package/client/pages/data-item-list.js

@@ -166,7 +166,7 @@ class DataItemList extends localize(i18next)(LitElement) {
                         {
                           type: 'options' /* property-editor type */,
                           name: 'options',
-                          label: i18next.t('field.options')
+                          label: 'options'
                         }
                       ]
                     : [],

package/client/pages/data-ooc-view.js

@@ -0,0 +1,134 @@
+import '@operato/dataset/ox-data-sample-view.js'
+
+import { LitElement, css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
+
+import { ScrollbarStyles } from '@operato/styles'
+import { client } from '@operato/graphql'
+import gql from 'graphql-tag'
+
+class DataOocView extends localize(i18next)(LitElement) {
+  static get properties() {
+    return {
+      dataSet: Object,
+      dataSample: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+
+          background-color: #fff;
+        }
+
+        div[content] {
+          flex: 1;
+
+          display: flex;
+          overflow: scroll;
+        }
+
+        ox-data-sample-view {
+          flex: 1;
+        }
+
+        .button-container {
+          display: flex;
+          margin-left: auto;
+          padding: var(--padding-default);
+        }
+      `
+    ]
+  }
+
+  get sampleView() {
+    return this.renderRoot.querySelector('ox-data-sample-view')
+  }
+
+  render() {
+    return html`
+      <div content>
+        <ox-data-sample-view .dataSet=${this.dataSet} .dataSample=${this.dataSample}></ox-data-sample-view>
+      </div>
+
+      <div class="button-container">
+        <mwc-button raised @click=${this._updateDataSample.bind(this)}>${i18next.t('button.save')}</mwc-button>
+      </div>
+    `
+  }
+
+  updated(changes) {
+    if (changes.has('dataSample')) {
+      this.fetchDataSet()
+    }
+  }
+
+  async fetchDataSet() {
+    const id = this.dataSample?.dataSet?.id
+
+    if (id) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataSet(id: $id) {
+              id
+              name
+              description
+              useCase
+              dataItems {
+                id
+                name
+                description
+                active
+                unit
+                tag
+                type
+                spec
+              }
+            }
+          }
+        `,
+        variables: {
+          id: this.dataSample.dataSet.id
+        }
+      })
+
+      this.dataSet = response.data.dataSet
+    }
+  }
+
+  async _updateDataSample() {
+    // const data = this.sampleView.buildValue()
+    // const dataSample = {
+    //   dataSet: {
+    //     id: this.dataSet.id
+    //   },
+    //   data
+    // }
+    // const response = await client.mutate({
+    //   mutation: gql`
+    //     mutation ($dataSample: NewDataSample!) {
+    //       createDataSample(dataSample: $dataSample) {
+    //         id
+    //         collectedAt
+    //       }
+    //     }
+    //   `,
+    //   variables: {
+    //     dataSample
+    //   }
+    // })
+    // if (!response.errors) {
+    //   document.dispatchEvent(
+    //     new CustomEvent('notify', { detail: { message: i18next.t('text.data sample created successfully') } })
+    //   )
+    // }
+  }
+}
+
+window.customElements.define('data-ooc-view', DataOocView)

package/client/pages/data-ooc.js

@@ -1,15 +1,16 @@
 import '@operato/data-grist'
+import './data-ooc-view.js'
 
 import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
 import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
+import { notify, openPopup } from '@operato/layout'
 
 import { client } from '@operato/graphql'
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
-import { notify } from '@operato/layout'
 
 export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -56,9 +57,9 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
       help: 'integration/ui/data-ooc',
       actions: [
         {
-          title: i18next.t('button.delete'),
-          action: this._deleteDataOoc.bind(this),
-          ...CommonButtonStyles.delete
+          title: i18next.t('button.save'),
+          action: this._updateDataOoc.bind(this),
+          ...CommonButtonStyles.save
         }
       ],
       exportable: {
@@ -117,6 +118,23 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: 'assignment_turned_in',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              openPopup(
+                html` <data-ooc-view .dataSample=${record} style="background-color: white;"></data-ooc-view> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-ooc view')
+                }
+              )
+            }
+          }
+        },
         {
           type: 'string',
           name: 'name',
@@ -350,6 +368,38 @@ export class DataOoc extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  async _updateDataOoc() {
+    let patches = this.grist.dirtyRecords
+    if (patches && patches.length) {
+      patches = patches.map(patch => {
+        let patchField = patch.id ? { id: patch.id } : {}
+        const dirtyFields = patch.__dirtyfields__
+        for (let key in dirtyFields) {
+          patchField[key] = dirtyFields[key].after
+        }
+        this._setDefaultFieldsValue(patchField)
+        patchField.cuFlag = patch.__dirty__
+
+        return patchField
+      })
+
+      const response = await client.mutate({
+        mutation: gql`
+          mutation ($patches: [DataOocPatch!]!) {
+            updateMultipleDataOoc(patches: $patches) {
+              name
+            }
+          }
+        `,
+        variables: {
+          patches
+        }
+      })
+
+      if (!response.errors) this.grist.fetch()
+    }
+  }
+
   async _deleteDataOoc() {
     if (confirm(i18next.t('text.sure_to_x', { x: i18next.t('text.delete') }))) {
       const ids = this.grist.selected.map(record => record.id)

package/client/pages/data-sample-view.js

@@ -0,0 +1,96 @@
+import '@operato/dataset/ox-data-sample-view.js'
+
+import { LitElement, css, html } from 'lit'
+import { i18next, localize } from '@operato/i18n'
+
+import { ScrollbarStyles } from '@operato/styles'
+import { client } from '@operato/graphql'
+import gql from 'graphql-tag'
+
+class DataSampleView extends localize(i18next)(LitElement) {
+  static get properties() {
+    return {
+      dataSet: Object,
+      dataSample: Object
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+
+          background-color: #fff;
+        }
+
+        div[content] {
+          flex: 1;
+
+          display: flex;
+          overflow: scroll;
+        }
+
+        ox-data-sample-view {
+          flex: 1;
+        }
+      `
+    ]
+  }
+
+  get sampleView() {
+    return this.renderRoot.querySelector('ox-data-sample-view')
+  }
+
+  render() {
+    return html`
+      <div content>
+        <ox-data-sample-view .dataSet=${this.dataSet} .dataSample=${this.dataSample}></ox-data-sample-view>
+      </div>
+    `
+  }
+
+  updated(changes) {
+    if (changes.has('dataSample')) {
+      this.fetchDataSet()
+    }
+  }
+
+  async fetchDataSet() {
+    const id = this.dataSample?.dataSet?.id
+
+    if (id) {
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataSet(id: $id) {
+              id
+              name
+              description
+              useCase
+              dataItems {
+                id
+                name
+                description
+                active
+                unit
+                tag
+                type
+                spec
+              }
+            }
+          }
+        `,
+        variables: {
+          id: this.dataSample.dataSet.id
+        }
+      })
+
+      this.dataSet = response.data.dataSet
+    }
+  }
+}
+
+window.customElements.define('data-sample-view', DataSampleView)

package/client/pages/data-sample.js

@@ -1,15 +1,16 @@
 import '@operato/data-grist'
+import './data-sample-view.js'
 
 import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
+import { notify, openPopup } from '@operato/layout'
 
 import { ScrollbarStyles } from '@operato/styles'
 import { client } from '@operato/graphql'
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
 import { isMobileDevice } from '@operato/utils'
-import { notify } from '@operato/layout'
 
 export class DataSample extends connect(store)(localize(i18next)(PageView)) {
   static get properties() {
@@ -109,6 +110,23 @@ export class DataSample extends connect(store)(localize(i18next)(PageView)) {
       columns: [
         { type: 'gutter', gutterName: 'sequence' },
         { type: 'gutter', gutterName: 'row-selector', multiple: true },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          icon: 'assignment',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              openPopup(
+                html` <data-sample-view .dataSample=${record} style="background-color: white;"></data-sample-view> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-sample view')
+                }
+              )
+            }
+          }
+        },
         {
           type: 'string',
           name: 'name',

package/client/pages/data-set.js

@@ -9,7 +9,7 @@ import { css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 
-import { OxDataItemSpec } from '@operato/dataset'
+import { OxDataUseCase } from '@operato/dataset'
 import { client } from '@operato/graphql'
 import { connect } from 'pwa-helpers/connect-mixin'
 import gql from 'graphql-tag'
@@ -233,7 +233,7 @@ export class DataSet extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: true,
             options: () => {
-              return ['', ...OxDataItemSpec.getProviderNames()].map(name => {
+              return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
                 return {
                   display: name,
                   value: name

package/dist-server/controllers/create-data-sample.js

@@ -0,0 +1,104 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDataSample = void 0;
+const data_ooc_1 = require("../service/data-ooc/data-ooc");
+const shell_1 = require("@things-factory/shell");
+const data_item_1 = require("../service/data-item/data-item");
+const data_sample_1 = require("../service/data-sample/data-sample");
+const data_set_1 = require("../service/data-set/data-set");
+const data_use_case_1 = require("./data-use-case");
+const moment_1 = __importDefault(require("moment"));
+const debug = require('debug')('things-factory:dataset:controller/save-data-sample');
+// parse variable javascript string pattern
+const replaceVariables = (keys, dic) => {
+    for (const k in keys) {
+        const matches = keys[k].match(/\$\{\w*\}/g);
+        matches &&
+            matches.forEach(m => {
+                keys[k] = keys[k].replace(m, dic[m.slice(2, -1)]);
+            });
+    }
+    return keys;
+};
+// It is required UTC date for Partitioning File System like AWS S3 from Athena.
+// ex) %YYYY, %MM, %DD
+const formatDate = (keys, _moment) => {
+    for (const k in keys) {
+        const matches = keys[k].match(/%\w*/g);
+        matches &&
+            matches.forEach(m => {
+                keys[k] = keys[k].replace(m, _moment.format(m.substr(1)));
+            });
+    }
+    return keys;
+};
+async function createDataSample(dataSample, context) {
+    const { domain, user, tx } = context.state;
+    const dataSet = await tx.getRepository(data_set_1.DataSet).findOne({
+        where: { id: dataSample.dataSet.id }
+    });
+    const dataItems = await tx.getRepository(data_item_1.DataItem).find({
+        where: {
+            domain,
+            dataSet
+        },
+        order: {
+            sequence: 'DESC'
+        }
+    });
+    const spec = dataItems.reduce((spec, dataItem) => {
+        spec[dataItem.tag] = Object.assign(Object.assign({}, dataItem.spec), { name: dataItem.name /* do we need ? */ });
+        return spec;
+    }, {});
+    var partitionKeys = Object.assign({}, dataSet.partitionKeys);
+    const collectedAt = dataSample.collectedAt || new Date();
+    partitionKeys = formatDate(partitionKeys, (0, moment_1.default)(collectedAt).utc());
+    partitionKeys = replaceVariables(partitionKeys, Object.assign({ domain: domain.subdomain, dataSetId: dataSample.dataSet.id }, dataSample.data));
+    const { ooc, oos } = data_use_case_1.DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {};
+    const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase }, dataSample), { domain,
+        partitionKeys,
+        spec,
+        ooc,
+        oos,
+        collectedAt, creator: user, updater: user }));
+    if (ooc || oos) {
+        const dataOoc = await tx.getRepository(data_ooc_1.DataOoc).save({
+            name: dataSet.name,
+            description: dataSet.description,
+            useCase: dataSet.useCase,
+            dataSet,
+            dataSample: result,
+            data: dataSample.data,
+            domain,
+            partitionKeys,
+            spec,
+            ooc,
+            oos,
+            state: data_ooc_1.DataOocStatus.CREATED,
+            collectedAt,
+            creator: user,
+            updater: user
+        });
+        debug('dataOoc is about to publish...', dataOoc);
+        shell_1.pubsub.publish('data-ooc', {
+            dataOoc,
+            supervisoryRoleId: dataSet.supervisoryRoleId
+        });
+        shell_1.pubsub.publish('notification', {
+            notification: {
+                domain,
+                type: 'error',
+                title: `Data OOC occurred on '${dataSet.name}'`,
+                body: `Data OOC occurred on '${dataSet.name}'`,
+                url: (0, shell_1.getRedirectSubdomainPath)(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),
+                timestamp: collectedAt
+            }
+        });
+    }
+    return result;
+}
+exports.createDataSample = createDataSample;
+//# sourceMappingURL=create-data-sample.js.map

package/dist-server/controllers/create-data-sample.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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"}

package/dist-server/routes.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const typeorm_1 = require("typeorm");
-const service_1 = require("./service");
-const data_item_1 = require("./service/data-item/data-item");
+const auth_base_1 = require("@things-factory/auth-base");
+const create_data_sample_1 = require("./controllers/create-data-sample");
 const data_sensor_1 = require("./service/data-sensor/data-sensor");
 const debug = require('debug')('things-factory:dataset:routes');
 process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
@@ -39,36 +39,21 @@ process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) =>
             }
             const domain = sensor.domain;
             const dataSet = sensor.dataSet;
-            const user = sensor.appliance;
-            const dataItems = await tx.getRepository(data_item_1.DataItem).find({
+            const user = await tx.getRepository(auth_base_1.User).findOne({
                 where: {
-                    domain,
-                    dataSet
-                },
-                order: {
-                    sequence: 'DESC'
+                    reference: sensor.appliance.id,
+                    userType: 'appliance'
                 }
             });
-            var spec = {};
-            dataItems.forEach(dataItem => {
-                spec[dataItem.name] = dataItem.spec;
-            });
-            await tx.getRepository(service_1.DataSample).save({
-                domain,
-                name: dataSet.name,
-                description: dataSet.description,
-                partitionKeys: dataSet.partitionKeys,
+            return await (0, create_data_sample_1.createDataSample)({
                 dataSet,
                 data,
                 rawData,
-                spec,
                 source: deviceId,
-                collectedAt: new Date(timestamp),
-                creator: user,
-                updater: user
-            });
+                collectedAt: new Date(timestamp)
+            }, { state: { domain, user, tx } });
         });
-        return 'OK';
+        context.status = 200;
     });
 });
 process.on('bootstrap-module-global-private-route', (app, globalPrivateRouter) => {

package/dist-server/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}

package/dist-server/service/data-ooc/data-ooc-subscription.js

@@ -0,0 +1,65 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataOocSubscription = void 0;
+const type_graphql_1 = require("type-graphql");
+const graphql_subscriptions_1 = require("graphql-subscriptions");
+const shell_1 = require("@things-factory/shell");
+const auth_base_1 = require("@things-factory/auth-base");
+const data_ooc_1 = require("./data-ooc");
+const typeorm_1 = require("typeorm");
+const debug = require('debug')('things-factory:dataset:data-ooc-subscription');
+let DataOocSubscription = class DataOocSubscription {
+    dataOoc(payload) {
+        return payload.dataOoc;
+    }
+};
+__decorate([
+    (0, type_graphql_1.Subscription)({
+        subscribe: (_, args, context, info) => {
+            var _a;
+            const { domain, user } = context.state;
+            const subdomain = domain === null || domain === void 0 ? void 0 : domain.subdomain;
+            debug('subscribe', subdomain);
+            if (!domain) {
+                throw new Error('domain required');
+            }
+            if (!((_a = user.domains) === null || _a === void 0 ? void 0 : _a.find(d => d.subdomain === subdomain))) {
+                throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`);
+            }
+            return (0, graphql_subscriptions_1.withFilter)(() => shell_1.pubsub.asyncIterator('data-ooc'), async (payload, variables, context, info) => {
+                const { dataOoc, supervisoryRoleId } = payload;
+                const { domain } = dataOoc;
+                if (subdomain !== (domain === null || domain === void 0 ? void 0 : domain.subdomain)) {
+                    return false;
+                }
+                // check if the user has that role
+                const userWithRoles = await (0, typeorm_1.getRepository)(auth_base_1.User).findOne({
+                    where: { id: user.id },
+                    relations: ['roles']
+                });
+                return userWithRoles.roles.find(role => role.id === supervisoryRoleId);
+            })(_, args, context, info);
+        }
+    }),
+    __param(0, (0, type_graphql_1.Root)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", data_ooc_1.DataOoc)
+], DataOocSubscription.prototype, "dataOoc", null);
+DataOocSubscription = __decorate([
+    (0, type_graphql_1.Resolver)(data_ooc_1.DataOoc)
+], DataOocSubscription);
+exports.DataOocSubscription = DataOocSubscription;
+//# sourceMappingURL=data-ooc-subscription.js.map

package/dist-server/service/data-ooc/data-ooc-subscription.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-ooc-subscription.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-subscription.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAA2D;AAC3D,iEAAkD;AAClD,iDAA8C;AAC9C,yDAAgD;AAChD,yCAAoC;AACpC,qCAAuC;AAEvC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,8CAA8C,CAAC,CAAA;AAG9E,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAqC9B,OAAO,CAAS,OAAwD;QACtE,OAAO,OAAO,CAAC,OAAO,CAAA;IACxB,CAAC;CACF,CAAA;AAHC;IApCC,IAAA,2BAAY,EAAC;QACZ,SAAS,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;;YACpC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;YACtC,MAAM,SAAS,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAA;YAEnC,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;YAE7B,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;aACnC;YAED,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAA,EAAE;gBACvD,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,6BAA6B,IAAI,CAAC,KAAK,IAAI,CAAC,CAAA;aAChF;YAED,OAAO,IAAA,kCAAU,EACf,GAAG,EAAE,CAAC,cAAM,CAAC,aAAa,CAAC,UAAU,CAAC,EACtC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;gBAC1C,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAA;gBAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;gBAE1B,IAAI,SAAS,MAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAA,EAAE;oBACnC,OAAO,KAAK,CAAA;iBACb;gBAED,kCAAkC;gBAClC,MAAM,aAAa,GAAS,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;oBAC5D,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE;oBACtB,SAAS,EAAE,CAAC,OAAO,CAAC;iBACrB,CAAC,CAAA;gBAEF,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,iBAAiB,CAAC,CAAA;YACxE,CAAC,CACF,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;QAC3B,CAAC;KACF,CAAC;IACO,WAAA,IAAA,mBAAI,GAAE,CAAA;;;oCAA4D,kBAAO;kDAEjF;AAvCU,mBAAmB;IAD/B,IAAA,uBAAQ,EAAC,kBAAO,CAAC;GACL,mBAAmB,CAwC/B;AAxCY,kDAAmB"}

package/dist-server/service/data-ooc/data-ooc.js

@@ -120,6 +120,13 @@ __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataOoc.prototype, "type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataOoc.prototype, "useCase", void 0);
 __decorate([
     (0, typeorm_1.Column)('simple-json', { nullable: true }),
     (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),