@things-factory/dataset 7.0.1-alpha.1 → 7.0.1-alpha.100

package/client/pages/data-sample/data-sample-list-page.ts

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
 import './data-sample-view.js'
@@ -6,21 +7,24 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
-import moment from 'moment-timezone'
+import moment from '@operato/moment-timezone-es'
 
 import { DataGrist, FetchOption, GristRecord } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
-import { CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
+import { CommonGristStyles, CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 import { GhostPrint } from '@operato/ghost-print'
 
+import { p13n } from '@operato/p13n'
+
 @customElement('data-sample-list-page')
-export class DataSampleListPage extends connect(store)(localize(i18next)(PageView)) {
+export class DataSampleListPage extends connect(store)(p13n(localize(i18next)(PageView))) {
   static styles = [
     ScrollbarStyles,
+    CommonGristStyles,
     CommonHeaderStyles,
     css`
       :host {
@@ -78,12 +82,15 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
     const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
 
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)} ?url-params-sensitive=${false /* this.active */}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')}
+        ?url-params-sensitive=${false /* this.active */}
+      >
         <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.data-sample list')}
-          </div>
+          <div class="title">${i18next.t('title.data-sample list')}</div>
 
           <div class="filters">
             <ox-filters-form class="filter" autofocus without-search></ox-filters-form>
@@ -91,6 +98,8 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
 
           <ox-context-page-toolbar class="actions" .context=${this.context}></ox-context-page-toolbar>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }
@@ -310,11 +319,16 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
         },
         handlers: {
           click: (columns, data, column, record, rowIndex) => {
-            openPopup(html` <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view> `, {
-              backdrop: true,
-              size: 'large',
-              title: i18next.t('title.data-sample view')
-            })
+            openPopup(
+              html`
+                <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
+              `,
+              {
+                backdrop: true,
+                size: 'large',
+                title: i18next.t('title.data-sample view')
+              }
+            )
           }
         }
       },
@@ -401,7 +415,9 @@ export class DataSampleListPage extends connect(store)(localize(i18next)(PageVie
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
             const key = column.imex === true ? column.name : column.imex.key
-            record[key] = key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[key] = key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }

package/client/pages/data-sample/data-sample-search-page.ts

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
 import './data-sample-view.js'
@@ -6,7 +7,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
-import moment from 'moment-timezone'
+import moment from '@operato/moment-timezone-es'
 
 import { DataGrist, FetchOption, GristRecord } from '@operato/data-grist'
 import { client } from '@operato/graphql'
@@ -82,10 +83,7 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     return html`
       <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
         <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.data-sample search')}
-          </div>
+          <div class="title">${i18next.t('title.data-sample search')}</div>
 
           <div class="filters">
             <ox-filters-form class="filter" autofocus without-search></ox-filters-form>
@@ -136,8 +134,6 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
       this.dataKeySet = this.dataSet.dataKeySet
 
       this.refreshGristConfig()
-
-      this.grist.fetch()
     }
   }
 
@@ -296,11 +292,16 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
         },
         handlers: {
           click: (columns, data, column, record, rowIndex) => {
-            openPopup(html` <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view> `, {
-              backdrop: true,
-              size: 'large',
-              title: i18next.t('title.data-sample view')
-            })
+            openPopup(
+              html`
+                <data-sample-view data-sample-id=${record.id} style="background-color: white;"></data-sample-view>
+              `,
+              {
+                backdrop: true,
+                size: 'large',
+                title: i18next.t('title.data-sample view')
+              }
+            )
           }
         }
       },
@@ -321,7 +322,12 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
     const response = await client.query({
       query: gql`
         query ($dataSetId: String!, $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: dataSamplesByDataSet(dataSetId: $dataSetId, filters: $filters, pagination: $pagination, sortings: $sortings) {
+          responses: dataSamplesByDataSet(
+            dataSetId: $dataSetId
+            filters: $filters
+            pagination: $pagination
+            sortings: $sortings
+          ) {
             items {
               id
               name
@@ -391,7 +397,9 @@ export class DataSampleSearchPage extends connect(store)(localize(i18next)(PageV
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
             const key = column.imex === true ? column.name : column.imex.key
-            record[key] = key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[key] = key
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }

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

@@ -1,3 +1,5 @@
+import '@material/web/icon/icon.js'
+import '@material/web/fab/fab.js'
 import '@operato/dataset/ox-data-sample-view.js'
 import '@operato/dataset/ox-data-ooc-brief-view.js'
 import '@things-factory/worklist/dist-client/components/activity-thread-timeline.js'
@@ -33,7 +35,7 @@ export class DataSampleView extends localize(i18next)(LitElement) {
         margin: var(--margin-default);
       }
 
-      mwc-fab {
+      md-fab {
         position: fixed;
         bottom: 15px;
         right: 16px;
@@ -42,7 +44,7 @@ export class DataSampleView extends localize(i18next)(LitElement) {
       }
 
       @media print {
-        mwc-fab {
+        md-fab {
           display: none;
         }
       }
@@ -96,15 +98,15 @@ export class DataSampleView extends localize(i18next)(LitElement) {
           `
         : nothing}
 
-      <mwc-fab
-        icon="print"
+      <md-fab
         title="print"
         @click=${() =>
           GhostPrint.print({
             src: `./data-sample/${this.dataSampleId}`
           })}
-        >print</mwc-fab
       >
+        <md-icon slot="icon">print</md-icon>
+      </md-fab>
     `
   }
 

package/client/pages/data-sensor/data-sensor-list-page.ts

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
 
@@ -11,15 +12,18 @@ import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
-import { CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
+import { CommonGristStyles, CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 import { DataGrist, FetchOption } from '@operato/data-grist'
 import { OxPrompt } from '@operato/popup/ox-prompt.js'
 
+import { p13n } from '@operato/p13n'
+
 @customElement('data-sensor-list-page')
-export class DataSensorListPage extends connect(store)(localize(i18next)(PageView)) {
+export class DataSensorListPage extends connect(store)(p13n(localize(i18next)(PageView))) {
   static styles = [
     ScrollbarStyles,
+    CommonGristStyles,
     CommonHeaderStyles,
     css`
       :host {
@@ -33,15 +37,6 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
         overflow-y: auto;
         flex: 1;
       }
-
-      @media (max-width: 450px) {
-        .header {
-          display: grid;
-          grid-template-areas:
-            'title actions'
-            'filters filters';
-        }
-      }
     `
   ]
 
@@ -79,7 +74,10 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
         {
           icon: 'delete',
           title: i18next.t('button.delete'),
-          action: this._deleteDataSensor.bind(this)
+          action: this._deleteDataSensor.bind(this),
+          emphasis: {
+            danger: true
+          }
         }
       ],
       toolbar: false
@@ -90,12 +88,15 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
     const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
 
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)} ?url-params-sensitive=${this.active}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')}
+        ?url-params-sensitive=${this.active}
+      >
         <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.data-sensor list')}
-          </div>
+          <div class="title">${i18next.t('title.data-sensor list')}</div>
 
           <div class="filters">
             <ox-filters-form class="filter" autofocus without-search></ox-filters-form>
@@ -103,6 +104,8 @@ export class DataSensorListPage extends connect(store)(localize(i18next)(PageVie
 
           <ox-context-page-toolbar class="actions" .context=${this.context}></ox-context-page-toolbar>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }

package/client/pages/data-set/data-item-list.ts

@@ -1,3 +1,5 @@
+import '@material/web/icon/icon.js'
+
 import gql from 'graphql-tag'
 
 import { css, html, LitElement } from 'lit'
@@ -7,6 +9,7 @@ import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { isMobileDevice } from '@operato/utils'
 import { DataGrist, FetchOption } from '@operato/data-grist'
+import { ButtonContainerStyles } from '@operato/styles'
 
 const DataItemStats = ['sum', 'mean', 'stddev', 'variance', 'min', 'max', 'range', 'median', 'mode']
 
@@ -17,6 +20,7 @@ class DataItemList extends localize(i18next)(LitElement) {
   @state() gristConfig: any
 
   static styles = [
+    ButtonContainerStyles,
     css`
       :host {
         display: flex;
@@ -28,19 +32,6 @@ class DataItemList extends localize(i18next)(LitElement) {
       ox-grist {
         flex: 1;
       }
-
-      .button-container {
-        display: flex;
-        margin-left: auto;
-        padding: var(--padding-default);
-      }
-
-      [danger] {
-        --mdc-theme-primary: var(--mdc-danger-button-primary-color);
-      }
-      mwc-button {
-        margin-left: var(--margin-default);
-      }
     `
   ]
 
@@ -49,9 +40,10 @@ class DataItemList extends localize(i18next)(LitElement) {
   render() {
     return html`
       <ox-grist .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}></ox-grist>
+
       <div class="button-container">
-        <mwc-button raised danger @click=${this._deleteDataItems.bind(this)}>${i18next.t('button.delete')}</mwc-button>
-        <mwc-button raised @click=${this._updateDataItems.bind(this)}>${i18next.t('button.save')}</mwc-button>
+        <button danger @click=${this._deleteDataItems.bind(this)}><md-icon>delete_forever</md-icon>${i18next.t('button.delete')}</button>
+        <button @click=${this._updateDataItems.bind(this)}><md-icon>save</md-icon>${i18next.t('button.save')}</button>
       </div>
     `
   }

package/client/pages/data-set/data-set-importer.ts

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/data-grist'
 
 import gql from 'graphql-tag'
@@ -8,10 +9,11 @@ import { client } from '@operato/graphql'
 import { i18next } from '@operato/i18n'
 import { isMobileDevice } from '@operato/utils'
 import { DataSet } from '@operato/dataset'
-
+import { ButtonContainerStyles } from '@operato/styles'
 @customElement('data-set-importer')
 export class DataSetImporter extends LitElement {
   static styles = [
+    ButtonContainerStyles,
     css`
       :host {
         display: flex;
@@ -23,16 +25,6 @@ export class DataSetImporter extends LitElement {
       ox-grist {
         flex: 1;
       }
-
-      .button-container {
-        display: flex;
-        margin-left: auto;
-        padding: var(--padding-default);
-      }
-
-      mwc-button {
-        margin-left: var(--margin-default);
-      }
     `
   ]
 
@@ -65,14 +57,10 @@ export class DataSetImporter extends LitElement {
 
   render() {
     return html`
-      <ox-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.columns}
-        .data=${{ records: this.dataSets }}
-      ></ox-grist>
+      <ox-grist .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.columns} .data=${{ records: this.dataSets }}></ox-grist>
 
       <div class="button-container">
-        <mwc-button raised @click=${this.save.bind(this)}>${i18next.t('button.save')}</mwc-button>
+        <button @click=${this.save.bind(this)}><md-icon>save</md-icon>${i18next.t('button.save')}</button>
       </div>
     `
   }

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

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
 import './data-item-list.js'
@@ -8,7 +9,7 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, query, state } from 'lit/decorators.js'
 import { asyncReplace } from 'lit/directives/async-replace.js'
-import moment from 'moment-timezone'
+import moment from '@operato/moment-timezone-es'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { DataGrist, FetchOption, getEditor, getRenderer, ImexConfig } from '@operato/data-grist'
@@ -17,9 +18,11 @@ import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
-import { CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
+import { CommonGristStyles, CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice, sleep } from '@operato/utils'
 
+import { p13n } from '@operato/p13n'
+
 const MIN = 60
 const HOUR = 60 * MIN
 const DAY = 24 * HOUR
@@ -74,9 +77,10 @@ const USECASE_OPTIONS = () => {
 }
 
 @customElement('data-set-list-page')
-export class DataSetListPage extends connect(store)(localize(i18next)(PageView)) {
+export class DataSetListPage extends connect(store)(p13n(localize(i18next)(PageView))) {
   static styles = [
     ScrollbarStyles,
+    CommonGristStyles,
     CommonHeaderStyles,
     css`
       :host {
@@ -98,6 +102,7 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
   ]
 
   @state() gristConfig: any
+
   @state() mode: 'CARD' | 'GRID' | 'LIST' = isMobileDevice() ? 'CARD' : 'GRID'
 
   @query('ox-grist') private grist!: DataGrist
@@ -138,7 +143,10 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
         {
           title: i18next.t('button.delete'),
           action: this._deleteDataSet.bind(this),
-          icon: 'delete'
+          icon: 'delete',
+          emphasis: {
+            danger: true
+          }
         }
       ],
       toolbar: false
@@ -149,12 +157,15 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
     const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
 
     return html`
-      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)} ?url-params-sensitive=${this.active}>
+      <ox-grist
+        .mode=${mode}
+        .config=${this.gristConfig}
+        .personalConfigProvider=${this.getPagePreferenceProvider('ox-grist')}
+        .fetchHandler=${this.fetchHandler.bind(this)}
+        ?url-params-sensitive=${this.active}
+      >
         <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.data-set list')}
-          </div>
+          <div class="title">${i18next.t('title.data-set list')}</div>
 
           <div class="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -162,6 +173,8 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
 
           <ox-context-page-toolbar class="actions" .context=${this.context}> </ox-context-page-toolbar>
         </div>
+
+        <ox-grist-personalizer slot="setting"></ox-grist-personalizer>
       </ox-grist>
     `
   }
@@ -224,11 +237,14 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
           title: i18next.t('title.data collecting editor'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
-              openPopup(html` <data-entry-form .dataSet=${record} style="background-color: white;"></data-entry-form> `, {
-                backdrop: true,
-                size: 'large',
-                title: i18next.t('title.data-entry-form')
-              })
+              openPopup(
+                html` <data-entry-form .dataSet=${record} style="background-color: white;"></data-entry-form> `,
+                {
+                  backdrop: true,
+                  size: 'large',
+                  title: i18next.t('title.data-entry-form')
+                }
+              )
             }
           }
         },
@@ -982,7 +998,9 @@ export class DataSetListPage extends connect(store)(localize(i18next)(PageView))
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
             var imexKey = (column.imex as ImexConfig)!.key
-            record[imexKey] = imexKey.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[imexKey] = imexKey
+              .split('.')
+              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }

package/client/pages/data-summary/data-summary-list-page.ts

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
 import './data-summary-view.js'
@@ -6,7 +7,7 @@ import { CommonHeaderStyles, ScrollbarStyles } from '@operato/styles'
 import { PageView, store } from '@operato/shell'
 import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
-import moment from 'moment-timezone'
+import moment from '@operato/moment-timezone-es'
 import { DataGrist, GristRecord, FetchOption } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
@@ -24,13 +25,14 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
     css`
       :host {
         display: flex;
+        flex-direction: column;
 
-        width: 100%;
-
-        --grid-record-emphasized-background-color: #8b0000;
-        --grid-record-emphasized-color: #ff6b6b;
+        overflow: hidden;
+      }
 
-        --grid-header-padding: 2px 0 2px 9px;
+      ox-grist {
+        overflow-y: auto;
+        flex: 1;
       }
     `
   ]
@@ -69,10 +71,7 @@ export class DataSummaryListPage extends connect(store)(localize(i18next)(PageVi
     return html`
       <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)} ?url-params-sensitive=${false /* this.active */}>
         <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.data-summary list')}
-          </div>
+          <div class="title">${i18next.t('title.data-summary list')}</div>
 
           <div class="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>

package/client/pages/data-summary/data-summary-period-page.ts

@@ -1,3 +1,4 @@
+import '@material/web/icon/icon.js'
 import '@operato/input/ox-input-select-buttons.js'
 import '@operato/data-grist'
 import '@operato/context/ox-context-page-toolbar.js'
@@ -83,10 +84,7 @@ export class DataSummaryGroupPage extends connect(store)(localize(i18next)(PageV
     return html`
       <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
         <div slot="headroom" class="header">
-          <div class="title">
-            <mwc-icon>summarize</mwc-icon>
-            ${i18next.t('title.data-summary period')}
-          </div>
+          <div class="title">${i18next.t('title.data-summary period')}</div>
 
           <div
             class="filters"
@@ -348,22 +346,8 @@ export class DataSummaryGroupPage extends connect(store)(localize(i18next)(PageV
 
     const response = await client.query({
       query: gql`
-        query (
-          $dataSetName: String!
-          $period: String!
-          $dataKeys: [String!]
-          $filters: [Filter!]
-          $pagination: Pagination
-          $sortings: [Sorting!]
-        ) {
-          dataSummaryByPeriod(
-            dataSetName: $dataSetName
-            period: $period
-            dataKeys: $dataKeys
-            filters: $filters
-            pagination: $pagination
-            sortings: $sortings
-          ) {
+        query ($dataSetName: String!, $period: String!, $dataKeys: [String!], $filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          dataSummaryByPeriod(dataSetName: $dataSetName, period: $period, dataKeys: $dataKeys, filters: $filters, pagination: $pagination, sortings: $sortings) {
             month
             date
             period
@@ -426,9 +410,7 @@ export class DataSummaryGroupPage extends connect(store)(localize(i18next)(PageV
           .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
           .reduce((record, column) => {
             const key = column.imex === true ? column.name : column.imex.key
-            record[key] = key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[key] = key.split('.').reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
             return record
           }, {})
       }