@things-factory/dataset 5.0.14 → 5.0.16

package/client/pages/data-report/data-report-embed-page.js

@@ -1,3 +1,7 @@
+/**
+ * report page from 'data-set-list-page'
+ * datasetId is required
+ */
 import '@operato/data-grist'
 import '@things-factory/form-ui'
 
@@ -6,7 +10,7 @@ import { css, html } from 'lit'
 import { i18next, localize } from '@operato/i18n'
 import { CommonButtonStyles, ScrollbarStyles } from '@operato/styles'
 import { PageView } from '@things-factory/shell'
-import { encodeFormParams, getCookie } from '@things-factory/utils'
+import { encodeUrlParams, getCookie } from '@things-factory/utils'
 
 class DataReportEmbedPage extends localize(i18next)(PageView) {
   static get properties() {
@@ -57,7 +61,7 @@ class DataReportEmbedPage extends localize(i18next)(PageView) {
       }
     ]
     return {
-      title: 'jasper-report',
+      title: 'data-report-embed',
       actions,
       filters
     }
@@ -68,7 +72,7 @@ class DataReportEmbedPage extends localize(i18next)(PageView) {
         .filters=${this.context.filters}
         @filters-change=${e => {
           console.log('filters changed', e.detail)
-          this._reportTemplate(e.detail.filters)
+          this.reportTemplate(e.detail.filters)
         }}
         ?url-params-sensitive=${this.active}
       ></ox-filters-form-base>
@@ -82,12 +86,12 @@ class DataReportEmbedPage extends localize(i18next)(PageView) {
     }
   }
 
-  async _reportTemplate(filters) {
+  async reportTemplate(filters) {
     // convert filters array to object
     const params = filters.reduce((acc, curr) => ((acc[curr.name] = curr.value), acc), {})
     Object.assign(params, this.lifecycle.params)
 
-    const { workDateRange, workShift, reportView } = params
+    const { id, workDateRange, workShift, reportType, reportView } = params
 
     /** ignoring date conditions  */
     if (!workDateRange[0] || !workDateRange[1] || workDateRange[0] > workDateRange[1]) {
@@ -97,16 +101,16 @@ class DataReportEmbedPage extends localize(i18next)(PageView) {
     /** urlencoded params including test values */
     const urlParams = {
       table: 'samples',
-      dataSetId: this.lifecycle.resourceId,
-      fromWorkDate: workDateRange[0],
-      toWorkDate: workDateRange[1],
-      token: getCookie('access_token'),
-      workShift
+      dataSetId: id,
+      startDate: workDateRange[0],
+      endDate: workDateRange[1],
+      workShift,
+      reportView
     }
 
-    const encodedUrlParams = encodeFormParams(urlParams)
+    const encodedUrlParams = encodeUrlParams(urlParams)
 
-    this.shadowRoot.querySelector('#container').src = `${reportView}?params=${encodedUrlParams}`
+    this.shadowRoot.querySelector('#container').src = `/data-report/${reportType}/?${encodedUrlParams}`
   }
 }
 

package/client/pages/data-report/data-report-list-page.js

@@ -13,6 +13,7 @@ import { openPopup } from '@operato/layout'
 import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { provider } from '@things-factory/board-ui'
+import { encodeUrlParams } from '@things-factory/utils'
 
 const USECASE_OPTIONS = () => {
   return ['', ...OxDataUseCase.getUseCaseNames()].map(name => {
@@ -72,7 +73,8 @@ const showMonitorView = (columns, data, column, record, rowIndex) => {
 }
 
 const showReportView = (columns, data, column, record, rowIndex) => {
-  const { id, name, reportType, reportView, reportTemplate } = record
+  const { id:datasetId, dataKeySet, name, reportType, reportView, reportTemplate } = record
+  const { id:dataKeySetId } = dataKeySet || { id: '' }
   const title = `${name} - ${i18next.t('title.data-report-view')}`
 
   switch (reportType) {
@@ -85,26 +87,23 @@ const showReportView = (columns, data, column, record, rowIndex) => {
       break
 
     case 'embed':
-      const board = {
-        id: reportView
-      }
-      navigate(`/data-report-embed/${id}?reportView=${encodeURIComponent(reportView)}`)
-      // openPopup(html` <div style="background-color: white;">Under construction</div> `, {
-      //   closable: true,
-      //   backdrop: true,
-      //   size: 'large',
-      //   title
-      // })
-
       break
 
     case 'page':
-      navigate(reportView + `/${id}?template=${encodeURIComponent(reportTemplate)}`)
       break
 
     case 'external':
       window.open(reportView, '_blank')
       break
+    
+    case 'jasper':
+    case 'shiny':
+      const encodedUrlParams = encodeUrlParams({ datasetId, dataKeySetId, reportType, reportView, reportTemplate })
+      navigate(`/data-report-samples/?${encodedUrlParams}`)
+      break
+    
+    default:
+      break
   }
 }
 
@@ -138,8 +137,8 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
 
   get context() {
     return {
-      title: i18next.t('title.data-entry list'),
-      help: 'dataset/data-entry-list'
+      title: i18next.t('title.data-report list'),
+      help: 'dataset/data-report-list'
     }
   }
 
@@ -366,6 +365,10 @@ export class DataReportListPage extends connect(store)(localize(i18next)(PageVie
           responses: dataSetsForReport(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
+              dataKeySet {
+                id
+                name
+              }
               name
               description
               partitionKeys

package/client/pages/data-report/data-report-samples-page.js

@@ -0,0 +1,186 @@
+/**
+ * data sample report page from 'data-key-set-list-page'
+ * dateKeySetId is required
+ */
+import '@operato/data-grist'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit'
+import { connect } from 'pwa-helpers/connect-mixin'
+
+import { client } from '@operato/graphql'
+import { i18next, localize } from '@operato/i18n'
+import { PageView, store } from '@operato/shell'
+import { ScrollbarStyles } from '@operato/styles'
+
+import { encodeUrlParams } from '@things-factory/utils'
+
+export class DataReportSamplesPage extends connect(store)(localize(i18next)(PageView)) {
+  static get properties() {
+    return {
+      dataKeySetId: String,
+      dataKeySet: Object,
+      active: String
+    }
+  }
+
+  static get styles() {
+    return [
+      ScrollbarStyles,
+      css`
+        :host {
+          display: flex;
+          flex-direction: column;
+          padding: 0;
+        }
+
+        #container {
+          flex: 1;
+          padding: 0;
+          margin: 0;
+          border: 0;
+        }
+      `
+    ]
+  }
+
+  get context() {
+
+    const today = new Date().toISOString().split('T')[0]
+
+    const filters = [
+      {
+        name: 'workDateRange',
+        type: 'date',
+        label: i18next.t('field.work-date'),
+        operator: 'between',
+        value: [today, today] // not working...
+      },
+      ...this.getDataKeyFilters()
+    ]
+
+    return {
+      title: i18next.t('title.data-report samples'),
+      help: 'dataset/data-report-samples',
+      filters
+    }
+  }
+
+  getDataKeyFilters() {
+    return (
+      this.dataKeySet?.dataKeyItems.map((item, index) => {
+        return {
+          type: 'string',
+          name: `key_0${index + 1}`,
+          label: i18next.t(item.tKey),
+          operator: 'i_like',
+          width: 120
+        }
+      }) || []
+    )
+  }
+
+  render() {
+    // clear if pre-loaded
+    const container = this.shadowRoot.querySelector('#container')
+    if (container) {
+      container.src = ""
+      // @TODO: Clear filters
+      /** */
+    }
+
+    return html`
+      <ox-filters-form-base
+        .filters=${this.context.filters}
+        @filters-change=${e => {
+          console.log('filters changed', e.detail)
+          this.renderTemplate(e.detail.filters)
+        }}
+        ?url-params-sensitive=${this.active}
+      ></ox-filters-form-base>
+      <iframe id="container"></iframe>
+    `
+  }
+
+  renderTemplate(filters) {
+    const params = filters.reduce((acc, curr) => ((acc[curr.name] = curr.value), acc), {})
+    Object.assign(params, this.lifecycle.params)
+
+    const filterNames = this.getDataKeyFilters().map(x => x.name)
+    const dataKeyFilters = filters.filter(x => filterNames.includes(x.name))
+    const { workDateRange } = params
+
+    /** ignoring date conditions  */
+    if (!workDateRange[0] || !workDateRange[1] || workDateRange[0] > workDateRange[1]) {
+      return
+    }
+
+    /** urlencoded params including test values */
+    const urlParams = {
+      reportType: params.reportType,
+      reportView: params.reportView,
+      reportTemplate: params.reportTemplate,
+      table: 'samples',
+      datasetId: params.datasetId,
+      dataKeySetId: params.dataKeySetId,
+      startDate: workDateRange[0],
+      endDate: workDateRange[1],
+      dataKeySetItems: JSON.stringify(this.dataKeySet?.dataKeyItems || []),
+      dataKeyFilters: JSON.stringify(dataKeyFilters)
+    }
+
+    const encodedUrlParams = encodeUrlParams(urlParams)
+
+    const reportUrl = `/data-report/${urlParams.reportType}/`
+    this.shadowRoot.querySelector('#container').src = `${reportUrl}?${encodedUrlParams}`
+  }
+
+  pageUpdated(changes, lifecycle) {
+    if (this.active) {
+      const { dataKeySetId } = lifecycle.params
+      this.dataKeySetId = dataKeySetId
+      return
+    }
+  }
+
+  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+
+  }
+
+  async updated(changes) {
+    if (changes.has('dataKeySetId')) {
+      if (!this.dataKeySetId) {
+        this.dataKeySet  = null
+        return
+      }
+
+      const response = await client.query({
+        query: gql`
+          query ($id: String!) {
+            dataKeySet(id: $id) {
+              id
+              name
+              description
+              reportType
+              reportView
+              dataKeyItems {
+                name
+                description
+                dataKey
+                tKey
+              }
+            }
+          }
+        `,
+        variables: {
+          id: this.dataKeySetId
+        }
+      })
+
+      this.dataKeySet = response.data.dataKeySet
+    }
+  }
+
+}
+
+window.customElements.define('data-report-samples-page', DataReportSamplesPage)

package/client/pages/data-set/data-set-list-page.js

@@ -86,6 +86,14 @@ const REPORT_TYPES = [
   {
     display: 'External URL',
     value: 'external'
+  },
+  {
+    display: 'Jasper',
+    value: 'jasper'
+  },
+  {
+    display: 'Shiny',
+    value: 'shiny'
   }
 ]
 
@@ -217,7 +225,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
               if (!record.id) return
               const popup = openPopup(html` <data-item-list .dataSet=${record}></data-item-list> `, {
                 backdrop: true,
-                help: 'data-set/ui/data-item-list',
+                help: 'dataset/ui/data-item-list',
                 size: 'large',
                 title: i18next.t('title.data-item list')
               })

package/client/route.js

@@ -16,6 +16,10 @@ export default function route(page) {
       import('./pages/data-sample/data-sample-search-page.js')
       return page
 
+    case 'data-report-samples':
+      import('./pages/data-report/data-report-samples-page.js')
+      return page
+
     case 'data-ooc-list':
       import('./pages/data-ooc/data-ooc-list-page.js')
       return page
@@ -27,22 +31,26 @@ export default function route(page) {
     case 'data-report-list':
       import('./pages/data-report/data-report-list-page.js')
       return page
-
-    case 'jasper-report-samples':
-      import('./pages/data-report/jasper-report-samples-page.js')
+  
+    case 'data-archive-list':
+      import('./pages/data-archive/data-archive-list-page.js')
       return page
 
-    case 'jasper-report-samples-crosstab':
-      import('./pages/data-report/jasper-report-samples-crosstab-page.js')
-      return page
+    // case 'jasper-report-samples':
+    //   import('./pages/data-report/jasper-report-samples-page.js')
+    //   return page
 
-    case 'jasper-report-oocs':
-      import('./pages/data-report/jasper-report-oocs-page.js')
-      return page
+    // case 'jasper-report-samples-crosstab':
+    //   import('./pages/data-report/jasper-report-samples-crosstab-page.js')
+    //   return page
 
-    case 'data-report-embed':
-      import('./pages/data-report/data-report-embed-page')
-      return page
+    // case 'jasper-report-oocs':
+    //   import('./pages/data-report/jasper-report-oocs-page.js')
+    //   return page
+
+    // case 'data-report-embed':
+    //   import('./pages/data-report/data-report-embed-page')
+    //   return page
 
     case 'data-key-set-list':
       import('./pages/data-key-set/data-key-set-list-page.js')

package/config/config.development.js

@@ -1,10 +1,31 @@
 module.exports = {
+    dataArchive: {
+        dataset: {
+            endpoint: {
+                host: 'localhost',
+                port: 80
+            },
+            datasource: {
+                database: ''
+            }
+        }
+    },
     dataReport: {
         jasper: {
             endpoint: {
                 host: 'localhost',
                 port: 8090
             },
+            datasource: {
+                database: ''
+            },
+            method: 'POST'
+        },
+        shiny: {
+            endpoint: {
+                host: 'localhost',
+                port: 3838
+            },
             datasource: {
                 database: ''
             }

package/config/config.production.js

@@ -1,13 +1,34 @@
 module.exports = {
-  dataReport: {
-      jasper: {
-          endpoint: {
-              host: 'localhost',
-              port: 8090
-          },
-          datasource: {
-              database: ''
-          }
-      }
-  }
+    dataArchive: {
+        dataset: {
+            endpoint: {
+                host: 'localhost',
+                port: 80
+            },
+            datasource: {
+                database: ''
+            }
+        }
+    },
+    dataReport: {
+        jasper: {
+            endpoint: {
+                host: 'localhost',
+                port: 8090
+            },
+            datasource: {
+                database: ''
+            },
+            method: 'POST'
+        },
+        shiny: {
+            endpoint: {
+                host: 'localhost',
+                port: 3838
+            },
+            datasource: {
+                database: ''
+            }
+        }
+    }
 }

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

@@ -9,6 +9,8 @@ const data_ooc_1 = require("../service/data-ooc/data-ooc");
 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");
+// See README.md at ## Data Samples
+process.env.TZ = 'UTC';
 const fillDataKeys = (dataKeySet, data) => {
     const keys = (dataKeySet === null || dataKeySet === void 0 ? void 0 : dataKeySet.dataKeyItems) || [];
     return keys.reduce((sum, key, index) => {
@@ -68,7 +70,7 @@ async function createDataSample(dataSample, context) {
     partitionKeys = replaceVariables(partitionKeys, dataSample.data);
     const dataKeys = fillDataKeys(dataSet === null || dataSet === void 0 ? void 0 : dataSet.dataKeySet, dataSample.data);
     const { ooc, oos, judgment } = data_use_case_1.DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {};
-    const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase }, dataSample), dataKeys), { dataSetVersion: dataSet.version, domain,
+    const result = await tx.getRepository(data_sample_1.DataSample).save(Object.assign(Object.assign(Object.assign({ name: dataSet.name, description: dataSet.description, useCase: dataSet.useCase, type: dataSet.type }, dataSample), dataKeys), { dataSetVersion: dataSet.version, domain,
         partitionKeys,
         ooc,
         oos,

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

@@ -1 +1 @@
-{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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","sourcesContent":["import moment from 'moment-timezone'\nimport { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'\nimport { getWorkDateAndShift } from '@things-factory/work-shift'\n\nimport { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'\nimport { DataSample } from '../service/data-sample/data-sample'\nimport { NewDataSample } from '../service/data-sample/data-sample-type'\nimport { DataSet } from '../service/data-set/data-set'\nimport { DataUseCase } from './data-use-case'\n\nconst fillDataKeys = (dataKeySet, data) => {\n  const keys = dataKeySet?.dataKeyItems || []\n  return keys.reduce((sum, key, index) => {\n    const value = data[key.dataKey]\n    if (value != null) {\n      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value\n    }\n    return sum\n  }, {})\n}\n\n// parse variable javascript string pattern\nconst replaceVariables = (keys, dic) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/\\$\\{\\w*\\}/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])\n      })\n  }\n  return keys\n}\n\n// It is required UTC date for Partitioning File System like AWS S3 from Athena.\n// ex) %YYYY, %MM, %DD\nconst formatDate = (keys, _moment) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/%\\w*/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))\n      })\n  }\n  return keys\n}\n\nexport async function createDataSample(\n  dataSample: NewDataSample,\n  context: { state: { domain: Domain; user: User; tx: EntityManager } }\n): Promise<DataSample> {\n  const { domain, user, tx } = context.state\n\n  const dataSet = await tx.getRepository(DataSet).findOne({\n    where: { id: dataSample.dataSet.id },\n    relations: ['dataKeySet']\n  })\n\n  const dataItems = dataSet.dataItems\n  const collectedAt = dataSample.collectedAt || new Date()\n\n  const timezone = dataSet.timezone || domain.timezone || 'UTC'\n  const format = 'YYYY-MM-DD'\n\n  // workDate ex) 2022-04-04\n  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })\n\n  // local time dataSet timezone or domain timezone or default 'UTC'\n\n  const localDateTz = moment(collectedAt).tz(timezone)\n  const defaultPartitionKeys = {\n    domain: domain.subdomain,\n    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,\n    date: localDateTz.format(format) /* local time date */,\n    workdate: workDate /* working date */,\n    workshift: workShift\n  }\n\n  var partitionKeys = {\n    ...defaultPartitionKeys,\n    ...dataSet.partitionKeys\n  }\n\n  partitionKeys = formatDate(partitionKeys, localDateTz)\n  partitionKeys = replaceVariables(partitionKeys, dataSample.data)\n\n  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)\n\n  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}\n  const result = await tx.getRepository(DataSample).save({\n    name: dataSet.name,\n    description: dataSet.description,\n    useCase: dataSet.useCase,\n    ...dataSample,\n    ...dataKeys,\n    dataSetVersion: dataSet.version,\n    domain,\n    partitionKeys,\n    ooc,\n    oos,\n    judgment,\n    collectedAt,\n    workDate,\n    workShift,\n    creator: user,\n    updater: user\n  })\n\n  if (ooc || oos) {\n    const dataOoc = await tx.getRepository(DataOoc).save({\n      ...result,\n      history: [\n        {\n          user: {\n            id: user.id,\n            name: user.name\n          },\n          state: DataOocStatus.CREATED,\n          timestamp: Date.now()\n        }\n      ],\n      state: DataOocStatus.CREATED\n    })\n\n    pubsub.publish('data-ooc', {\n      dataOoc,\n      supervisoryRoleId: dataSet.supervisoryRoleId\n    })\n\n    pubsub.publish('notification', {\n      notification: {\n        domain,\n        type: 'error',\n        title: `Data OOC occurred on '${dataSet.name}'`,\n        body: `Data OOC occurred on '${dataSet.name}'`,\n        url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),\n        timestamp: collectedAt\n      }\n    })\n  }\n\n  return result\n}\n"]}
+{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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","sourcesContent":["import moment from 'moment-timezone'\nimport { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'\nimport { getWorkDateAndShift } from '@things-factory/work-shift'\n\nimport { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'\nimport { DataSample } from '../service/data-sample/data-sample'\nimport { NewDataSample } from '../service/data-sample/data-sample-type'\nimport { DataSet } from '../service/data-set/data-set'\nimport { DataUseCase } from './data-use-case'\n\n// See README.md at ## Data Samples\nprocess.env.TZ = 'UTC'\n\nconst fillDataKeys = (dataKeySet, data) => {\n  const keys = dataKeySet?.dataKeyItems || []\n  return keys.reduce((sum, key, index) => {\n    const value = data[key.dataKey]\n    if (value != null) {\n      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value\n    }\n    return sum\n  }, {})\n}\n\n// parse variable javascript string pattern\nconst replaceVariables = (keys, dic) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/\\$\\{\\w*\\}/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])\n      })\n  }\n  return keys\n}\n\n// It is required UTC date for Partitioning File System like AWS S3 from Athena.\n// ex) %YYYY, %MM, %DD\nconst formatDate = (keys, _moment) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/%\\w*/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))\n      })\n  }\n  return keys\n}\n\nexport async function createDataSample(\n  dataSample: NewDataSample,\n  context: { state: { domain: Domain; user: User; tx: EntityManager } }\n): Promise<DataSample> {\n  const { domain, user, tx } = context.state\n\n  const dataSet = await tx.getRepository(DataSet).findOne({\n    where: { id: dataSample.dataSet.id },\n    relations: ['dataKeySet']\n  })\n\n  const dataItems = dataSet.dataItems\n  const collectedAt = dataSample.collectedAt || new Date()\n\n  const timezone = dataSet.timezone || domain.timezone || 'UTC'\n  const format = 'YYYY-MM-DD'\n\n  // workDate ex) 2022-04-04\n  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })\n\n  // local time dataSet timezone or domain timezone or default 'UTC'\n\n  const localDateTz = moment(collectedAt).tz(timezone)\n  const defaultPartitionKeys = {\n    domain: domain.subdomain,\n    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,\n    date: localDateTz.format(format) /* local time date */,\n    workdate: workDate /* working date */,\n    workshift: workShift\n  }\n\n  var partitionKeys = {\n    ...defaultPartitionKeys,\n    ...dataSet.partitionKeys\n  }\n\n  partitionKeys = formatDate(partitionKeys, localDateTz)\n  partitionKeys = replaceVariables(partitionKeys, dataSample.data)\n\n  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)\n\n  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}\n  const result = await tx.getRepository(DataSample).save({\n    name: dataSet.name,\n    description: dataSet.description,\n    useCase: dataSet.useCase,\n    type: dataSet.type,\n    ...dataSample,\n    ...dataKeys,\n    dataSetVersion: dataSet.version,\n    domain,\n    partitionKeys,\n    ooc,\n    oos,\n    judgment,\n    collectedAt,\n    workDate,\n    workShift,\n    creator: user,\n    updater: user\n  })\n\n  if (ooc || oos) {\n    const dataOoc = await tx.getRepository(DataOoc).save({\n      ...result,\n      history: [\n        {\n          user: {\n            id: user.id,\n            name: user.name\n          },\n          state: DataOocStatus.CREATED,\n          timestamp: Date.now()\n        }\n      ],\n      state: DataOocStatus.CREATED\n    })\n\n    pubsub.publish('data-ooc', {\n      dataOoc,\n      supervisoryRoleId: dataSet.supervisoryRoleId\n    })\n\n    pubsub.publish('notification', {\n      notification: {\n        domain,\n        type: 'error',\n        title: `Data OOC occurred on '${dataSet.name}'`,\n        body: `Data OOC occurred on '${dataSet.name}'`,\n        url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),\n        timestamp: collectedAt\n      }\n    })\n  }\n\n  return result\n}\n"]}

package/dist-server/controllers/jasper-report.js

@@ -4,11 +4,12 @@ exports.renderJasperReport = void 0;
 const tslib_1 = require("tslib");
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
+const config_resolver_1 = require("../utils/config-resolver");
 const attachment_base_1 = require("@things-factory/attachment-base");
 const aws_base_1 = require("@things-factory/aws-base");
 const env_1 = require("@things-factory/env");
 const dataReportConfig = env_1.config.get('dataReport');
-const { jasper: { endpoint: { protocol: PROTOCOL, host: HOST, port: PORT }, datasource: { database: DATABASE } } } = dataReportConfig || {
+const { jasper: { endpoint: ENDPOINT, datasource: { database: DATABASE } } } = dataReportConfig || {
     jasper: {
         endpoint: {},
         datasource: {}
@@ -96,20 +97,23 @@ function parseJsonDataField(rows) {
 }
 const athenaClient = new aws_base_1.AthenaController();
 async function queryAthena(params) {
-    const { table, domain, dataSetId, fromWorkDate, toWorkDate, workShift, timezone } = params;
+    const { table, domain, datasetId, startDate, endDate, workShift, timezone } = params;
     const queryData = {
-        sql: `SELECT name, description, data, spec, workdate, workshift, 
+        sql: `SELECT ds.name, ds.description, ds.data, dsh.data_items as spec, ds.workdate, ds.workshift,
     DATE_FORMAT(
       FROM_UNIXTIME(collected_at / 1000 / 1000) AT TIME ZONE '${timezone || 'UTC'}', 
       '%Y-%m-%d %H:%i:%s'
-    ) AS collected_at
-    FROM ${table} 
-    WHERE domain='${domain}' 
-    AND datasetid = '${dataSetId}'
-    AND workdate >= '${fromWorkDate}'
-    AND workdate <= '${toWorkDate}'
-    ${workShift ? "AND workshift = '" + workShift + "'" : ''}
-    ORDER BY collected_at`,
+    ) AS dscollected_at
+    FROM ${table} ds
+    JOIN data_set_histories dsh 
+      ON (ds.datasetid = dsh.original_id
+        and ds.data_set_version = dsh.version)
+    WHERE ds.domain='${domain}' 
+    AND ds.datasetid = '${datasetId}'
+    AND ds.workdate >= '${startDate}'
+    AND ds.workdate <= '${endDate}'
+    ${workShift ? "AND ds.workshift = '" + workShift + "'" : ''}
+    ORDER BY ds.collected_at`,
         db: DATABASE
     };
     // and json_extract_scalar(data, '$.dauid') = 'A8032AD81730'
@@ -117,7 +121,7 @@ async function queryAthena(params) {
 }
 async function renderJasperReport(context) {
     const { state: { domain }, query } = context;
-    const template = await attachment_base_1.STORAGE.readFile(query['template'] || 'dynamic_header_sample.jrxml', 'utf-8');
+    const template = await attachment_base_1.STORAGE.readFile(query['reportTemplate'] || 'dynamic_header_sample.jrxml', 'utf-8');
     let templateType = query['templateType'] || 'crosstab';
     let parsedData = [];
     // @todo: get dataset timezone
@@ -147,8 +151,9 @@ async function renderJasperReport(context) {
         formData.append('template', template);
         formData.append('jsonString', JSON.stringify(parsedData));
         formData.append('parameters', JSON.stringify(parameters));
-        const reportUrl = `${PROTOCOL || 'http'}://${HOST}:${PORT}/rest/report/show_html`;
-        const response = await (0, node_fetch_1.default)(reportUrl, {
+        const { reportView } = query;
+        const url = (0, config_resolver_1.getEndpointUrl)(ENDPOINT, reportView);
+        const response = await (0, node_fetch_1.default)(url, {
             method: 'POST',
             body: formData
         });