npm - @things-factory/worklist - Versions diffs - 6.0.36 → 6.0.37 - Mend

@things-factory/worklist 6.0.36 → 6.0.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (59) hide show

package/client/grist-editor/popup-activity-search-keys-input.ts CHANGED Viewed

@@ -137,7 +137,7 @@ export class PopupActivitySearchKeysInput extends LitElement {
     `
   }
-  async fetchHandler({ filters, page, limit, sortings = [] }: FetchOption) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const records = this.value || []
     return {
       total: records.length,

package/client/pages/activity/activity-list-page.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 import moment from 'moment-timezone'
-import { DataGrist, getEditor, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getEditor, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
@@ -491,7 +491,7 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/activity/starter-list-page.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist } from '@operato/data-grist'
+import { FetchOption, DataGrist } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
@@ -204,7 +204,7 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/activity-instance/activity-instance-list-page.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist } from '@operato/data-grist'
+import { FetchOption, DataGrist } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { PageView, store } from '@operato/shell'
@@ -181,7 +181,7 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/activity-store/activity-store-page.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist } from '@operato/data-grist'
+import { FetchOption, DataGrist } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
@@ -198,7 +198,7 @@ export class ActivityStorePage extends connect(store)(localize(i18next)(PageView
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/activity-supervisor/reporter-list-page.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist } from '@operato/data-grist'
+import { FetchOption, DataGrist } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
@@ -193,7 +193,7 @@ export class ReporterListPage extends connect(store)(localize(i18next)(PageView)
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/activity-template/activity-template-list-page.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getEditor, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getEditor, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
@@ -322,7 +322,7 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/activity-thread/activity-thread-list-page.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist } from '@operato/data-grist'
+import { DataGrist, FetchOption } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
@@ -193,7 +193,7 @@ export class ActivityThreadListPage extends connect(store)(localize(i18next)(Pag
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/installable-activity/installable-activity-list-page.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getEditor, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getEditor, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
@@ -331,7 +331,7 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/todo/approval-waiting-list-page.ts CHANGED Viewed

@@ -7,34 +7,20 @@ import { customElement, property, query, state } from 'lit/decorators.js'
 import { asyncReplace } from 'lit/directives/async-replace.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
-import { isMobileDevice, sleep } from '@operato/utils'
+import { adjustFilters, isMobileDevice, sleep } from '@operato/utils'
+import { ActivityThreadStatus } from '../../types/activity-thread'
 import { Priorities } from '../../types/types.js'
 const MIN = 60
 const HOUR = 60 * MIN
 const DAY = 24 * HOUR
-const FILTERS = [
-  {
-    display: 'Important',
-    value: 'Important'
-  },
-  {
-    display: 'Imminent',
-    value: 'Imminent'
-  },
-  {
-    display: 'Disapproved',
-    value: 'Disapproved'
-  }
-]
 @customElement('approval-waiting-list-page')
 export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(PageView)) {
   static styles = [
@@ -91,9 +77,23 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
           <div id="filters">
             <ox-input-select-buttons
               .value=${this.filters}
-              .options=${FILTERS}
+              .options=${[
+                {
+                  display: i18next.t('label.filter-important'),
+                  value: 'important'
+                },
+                {
+                  display: i18next.t('label.filter-due'),
+                  value: 'due'
+                },
+                {
+                  display: i18next.t('label.filter-resubmitted'),
+                  value: 'resubmitted'
+                }
+              ]}
               @change=${(e: CustomEvent) => {
                 this.filters = (e.currentTarget as any)?.value
+                this.grist.fetch()
               }}
               multiple
             ></ox-input-select-buttons>
@@ -210,32 +210,6 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
               day: 'numeric'
             }
           },
-          // sortable: true,
-          // filter: {
-          //   type: 'date',
-          //   operator: 'between'
-          // },
-          // filter: {
-          //   type: 'select',
-          //   operator: 'between',
-          //   options: (column, owner) => {
-          //     const now = Date.now()
-          //     return [
-          //       {
-          //         display: '1일 이내 처리',
-          //         value: [now, Date.now() + 60 * 60 * 3600 * 1000]
-          //       },
-          //       {
-          //         display: '2일 이내 처리',
-          //         value: [now, Date.now() + 2 * 60 * 60 * 3600 * 1000]
-          //       },
-          //       {
-          //         display: '3일 이내 처리',
-          //         value: [now, Date.now() + 3 * 60 * 60 * 3600 * 1000]
-          //       }
-          //     ]
-          //   }
-          // },
           width: 100
         },
         {
@@ -298,13 +272,27 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
+    if (this.filters?.includes('important')) {
+      filters = adjustFilters(filters, [{ name: 'priority', operator: 'gte', value: 2 }])
+    }
+    if (this.filters?.includes('due')) {
+      let tomorrow = new Date(Date.now() + 24 * 3600 * 1000).toISOString().replace('T', ' ')
+      filters = adjustFilters(filters, [{ name: 'dueAt', operator: 'lte', value: tomorrow }])
+    }
+    if (this.filters?.includes('resubmitted')) {
+      filters = adjustFilters(filters, [{ name: 'round', operator: 'gte', value: 2 }])
+    }
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
           responses: approvalWaitingList(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
+              round
               activityThread {
                 activityInstance {
                   activityId: id

package/client/pages/todo/assigned-list-page.ts CHANGED Viewed

@@ -6,7 +6,7 @@ import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { PageView, store } from '@operato/shell'
@@ -215,7 +215,7 @@ export class AssignedListPage extends connect(store)(localize(i18next)(PageView)
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/todo/done-list-page.ts CHANGED Viewed

@@ -6,30 +6,16 @@ import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
-import { isMobileDevice, sleep } from '@operato/utils'
+import { adjustFilters, isMobileDevice } from '@operato/utils'
+import { ActivityThreadStatus } from '../../types/activity-thread'
 import { Priorities } from '../../types/types.js'
-const FILTERS = [
-  {
-    display: 'Important',
-    value: 'Important'
-  },
-  {
-    display: 'Imminent',
-    value: 'Imminent'
-  },
-  {
-    display: 'Disapproved',
-    value: 'Disapproved'
-  }
-]
 @customElement('done-list-page')
 export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
   static styles = [
@@ -86,9 +72,23 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
           <div id="filters">
             <ox-input-select-buttons
               .value=${this.filters}
-              .options=${FILTERS}
+              .options=${[
+                {
+                  display: i18next.t('label.filter-important'),
+                  value: 'important'
+                },
+                {
+                  display: i18next.t('label.filter-recent'),
+                  value: 'recent'
+                },
+                {
+                  display: i18next.t('label.filter-aborted'),
+                  value: 'aborted'
+                }
+              ]}
               @change=${(e: CustomEvent) => {
                 this.filters = (e.currentTarget as any)?.value
+                this.grist.fetch()
               }}
               multiple
             ></ox-input-select-buttons>
@@ -275,7 +275,21 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
+    if (this.filters?.includes('important')) {
+      filters = adjustFilters(filters, [{ name: 'priority', operator: 'gte', value: 2 }])
+    }
+    if (this.filters?.includes('recent')) {
+      /* 최근 24시간 이내에 완료한 작업 */
+      let tomorrow = new Date(Date.now() - 24 * 3600 * 1000).toISOString().replace('T', ' ')
+      filters = adjustFilters(filters, [{ name: 'terminatedAt', operator: 'gte', value: tomorrow }])
+    }
+    if (this.filters?.includes('aborted')) {
+      filters = adjustFilters(filters, [{ name: 'state', operator: 'eq', value: ActivityThreadStatus.Aborted }])
+    }
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/todo/pickable-list-page.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/popup'
@@ -244,7 +244,7 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/client/pages/todo/todo-list-page.ts CHANGED Viewed

@@ -7,35 +7,20 @@ import { customElement, property, query, state } from 'lit/decorators.js'
 import { asyncReplace } from 'lit/directives/async-replace.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { DataGrist, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
-import { isMobileDevice, sleep } from '@operato/utils'
+import { adjustFilters, isMobileDevice, sleep } from '@operato/utils'
-import { ActivityInstanceStatus } from '../../types/activity-instance'
+import { ActivityThreadStatus } from '../../types/activity-thread'
 import { Priorities } from '../../types/types.js'
 const MIN = 60
 const HOUR = 60 * MIN
 const DAY = 24 * HOUR
-const FILTERS = [
-  {
-    display: 'Important',
-    value: 'Important'
-  },
-  {
-    display: 'Imminent',
-    value: 'Imminent'
-  },
-  {
-    display: 'Disapproved',
-    value: 'Disapproved'
-  }
-]
 @customElement('todo-list-page')
 export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
   static styles = [
@@ -92,9 +77,23 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
           <div id="filters">
             <ox-input-select-buttons
               .value=${this.filters}
-              .options=${FILTERS}
+              .options=${[
+                {
+                  display: i18next.t('label.filter-important'),
+                  value: 'important'
+                },
+                {
+                  display: i18next.t('label.filter-due'),
+                  value: 'due'
+                },
+                {
+                  display: i18next.t('label.filter-rejected'),
+                  value: 'rejected'
+                }
+              ]}
               @change=${(e: CustomEvent) => {
                 this.filters = (e.currentTarget as any)?.value
+                this.grist.fetch()
               }}
               multiple
             ></ox-input-select-buttons>
@@ -211,31 +210,6 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
             }
           },
           sortable: true,
-          // filter: {
-          //   type: 'date',
-          //   operator: 'between'
-          // },
-          // filter: {
-          //   type: 'select',
-          //   operator: 'between',
-          //   options: (column, owner) => {
-          //     const now = Date.now()
-          //     return [
-          //       {
-          //         display: '1일 이내 처리',
-          //         value: [now, Date.now() + 60 * 60 * 3600 * 1000]
-          //       },
-          //       {
-          //         display: '2일 이내 처리',
-          //         value: [now, Date.now() + 2 * 60 * 60 * 3600 * 1000]
-          //       },
-          //       {
-          //         display: '3일 이내 처리',
-          //         value: [now, Date.now() + 3 * 60 * 60 * 3600 * 1000]
-          //       }
-          //     ]
-          //   }
-          // },
           width: 100
         },
         {
@@ -298,7 +272,21 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
     }
   }
-  async fetchHandler({ page, limit, sortings = [], filters = [] }) {
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
+    if (this.filters?.includes('important')) {
+      filters = adjustFilters(filters, [{ name: 'priority', operator: 'gte', value: 2 }])
+    }
+    if (this.filters?.includes('due')) {
+      /* 24시간 이내에 만기가 도래하는 작업 */
+      let tomorrow = new Date(Date.now() + 24 * 3600 * 1000).toISOString().replace('T', ' ')
+      filters = adjustFilters(filters, [{ name: 'dueAt', operator: 'lte', value: tomorrow }])
+    }
+    if (this.filters?.includes('rejected')) {
+      filters = adjustFilters(filters, [{ name: 'state', operator: 'eq', value: ActivityThreadStatus.Rejected }])
+    }
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

package/dist-client/grist-editor/popup-activity-search-keys-input.d.ts CHANGED Viewed

@@ -8,7 +8,7 @@ export declare class PopupActivitySearchKeysInput extends LitElement {
     gristConfig: any;
     private grist;
     render(): import("lit-html").TemplateResult<1>;
-    fetchHandler({ filters, page, limit, sortings }: FetchOption): Promise<{
+    fetchHandler({ page, limit, sortings, filters }: FetchOption): Promise<{
         total: number;
         records: ActivitySearchKeyItem[];
     }>;

package/dist-client/grist-editor/popup-activity-search-keys-input.js CHANGED Viewed

@@ -106,7 +106,7 @@ let PopupActivitySearchKeysInput = class PopupActivitySearchKeysInput extends Li
       </div>
     `;
     }
-    async fetchHandler({ filters, page, limit, sortings = [] }) {
+    async fetchHandler({ page, limit, sortings = [], filters = [] }) {
         const records = this.value || [];
         return {
             total: records.length,

package/dist-client/grist-editor/popup-activity-search-keys-input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"popup-activity-search-keys-input.js","sourceRoot":"","sources":["../../client/grist-editor/popup-activity-search-keys-input.ts"],"names":[],"mappings":"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~~OAAO,EAAE,~~IAAI,EAAE,KAAK,EAAE,QAAQ,GAAG,EAAE,EAAe;~~QACrE~~,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAA;QAChC,OAAO;YACL,KAAK,EAAE,OAAO,CAAC,MAAM;YACrB,OAAO;SACR,CAAA;IACH,CAAC;IAEO,QAAQ,CAAC,CAAQ;QACvB,UAAU,CAAC,IAAI,CAAC,CAAA;IAClB,CAAC;IAEO,SAAS,CAAC,CAAQ;QACxB,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;QAEnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE;YACjF,OAAO;gBACL,IAAI;gBACJ,WAAW;gBACX,QAAQ;gBACR,IAAI;aACL,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACxD,UAAU,CAAC,IAAI,CAAC,CAAA;IAClB,CAAC;;AAzJM,mCAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;KAoBF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;2DAAoC;AAC9D;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qEAAwC;AAEnE;IAAC,KAAK,EAAE;;iEAgFP;AAED;IAAC,KAAK,CAAC,UAAU,CAAC;8BAAiB,SAAS;2DAAA;AA/GjC,4BAA4B;IADxC,aAAa,CAAC,kCAAkC,CAAC;GACrC,4BAA4B,CA2JxC;SA3JY,4BAA4B","sourcesContent":["import { css, html, LitElement } from 'lit'\nimport { customElement, property, query, state } from 'lit/decorators.js'\n\nimport { i18next } from '@operato/i18n'\nimport { closePopup } from '@operato/popup'\nimport { ScrollbarStyles } from '@operato/styles'\nimport { isMobileDevice } from '@operato/utils'\nimport { getEditor, getRenderer, ColumnConfig, DataGrist, FetchOption, SortersControl } from '@operato/data-grist'\nimport { ActivitySearchKeyItem } from '../types/activity-search-key-item-type'\n\n@customElement('popup-activity-search-keys-input')\nexport class PopupActivitySearchKeysInput extends LitElement {\n static styles = [\n ScrollbarStyles,\n css`\n :host {\n display: flex;\n flex-direction: column;\n\n background-color: #fff;\n\n width: var(--overlay-center-normal-width, 50%);\n height: var(--overlay-center-normal-height, 50%);\n }\n\n ox-grist {\n flex: 1;\n }\n\n .button-container {\n display: flex;\n margin-left: auto;\n padding: var(--padding-default);\n }\n `\n ]\n\n @property({ type: Array }) value: ActivitySearchKeyItem[] = []\n @property({ type: Object }) confirmCallback!: (newval: any) => void\n\n @state() gristConfig: any = {\n list: { fields: ['name', 'description', 'active'] },\n columns: [\n { type: 'gutter', gutterName: 'sequence' },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'add',\n handlers: {\n click: 'record-copy'\n }\n },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'delete',\n handlers: {\n click: 'record-delete'\n }\n },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'arrow_upward',\n handlers: {\n click: 'move-up'\n }\n },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'arrow_downward',\n handlers: {\n click: 'move-down'\n }\n },\n {\n type: 'string',\n name: 'name',\n header: i18next.t('field.name'),\n record: {\n editable: true\n },\n width: 140\n },\n {\n type: 'string',\n name: 'description',\n header: i18next.t('field.description'),\n record: {\n editable: true\n },\n width: 180\n },\n {\n type: 'string',\n name: 'inputKey',\n header: i18next.t('field.input-key'),\n record: {\n editable: true\n },\n width: 180\n },\n {\n type: 'string',\n name: 'tKey',\n header: i18next.t('field.t-key'),\n record: {\n editable: true\n },\n width: 180\n }\n ],\n rows: {\n selectable: false\n },\n pagination: {\n infinite: true\n },\n sorters: []\n }\n\n @query('ox-grist') private grist!: DataGrist\n\n render() {\n return html`\n <ox-grist\n .mode=${isMobileDevice() ? 'LIST' : 'GRID'}\n .config=${this.gristConfig}\n .fetchHandler=${this.fetchHandler.bind(this)}\n ></ox-grist>\n\n <div class=\"button-container\">\n <mwc-button @click=${this.onCancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>\n <mwc-button @click=${this.onConfirm.bind(this)}>${i18next.t('button.confirm')}</mwc-button>\n </div>\n `\n }\n\n async fetchHandler({ ~~filters,~~ page, limit, sortings = [] }: FetchOption) {\n const records = this.value \|\| []\n return {\n total: records.length,\n records\n }\n }\n\n private onCancel(e: Event) {\n closePopup(this)\n }\n\n private onConfirm(e: Event) {\n this.grist.commit()\n\n this.value = this.grist.data.records.map(({ name, description, inputKey, tKey }) => {\n return {\n name,\n description,\n inputKey,\n tKey\n }\n })\n\n this.confirmCallback && this.confirmCallback(this.value)\n closePopup(this)\n }\n}\n"]}
1	+ {"version":3,"file":"popup-activity-search-keys-input.js","sourceRoot":"","sources":["../../client/grist-editor/popup-activity-search-keys-input.ts"],"names":[],"mappings":"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","sourcesContent":["import { css, html, LitElement } from 'lit'\nimport { customElement, property, query, state } from 'lit/decorators.js'\n\nimport { i18next } from '@operato/i18n'\nimport { closePopup } from '@operato/popup'\nimport { ScrollbarStyles } from '@operato/styles'\nimport { isMobileDevice } from '@operato/utils'\nimport { getEditor, getRenderer, ColumnConfig, DataGrist, FetchOption, SortersControl } from '@operato/data-grist'\nimport { ActivitySearchKeyItem } from '../types/activity-search-key-item-type'\n\n@customElement('popup-activity-search-keys-input')\nexport class PopupActivitySearchKeysInput extends LitElement {\n static styles = [\n ScrollbarStyles,\n css`\n :host {\n display: flex;\n flex-direction: column;\n\n background-color: #fff;\n\n width: var(--overlay-center-normal-width, 50%);\n height: var(--overlay-center-normal-height, 50%);\n }\n\n ox-grist {\n flex: 1;\n }\n\n .button-container {\n display: flex;\n margin-left: auto;\n padding: var(--padding-default);\n }\n `\n ]\n\n @property({ type: Array }) value: ActivitySearchKeyItem[] = []\n @property({ type: Object }) confirmCallback!: (newval: any) => void\n\n @state() gristConfig: any = {\n list: { fields: ['name', 'description', 'active'] },\n columns: [\n { type: 'gutter', gutterName: 'sequence' },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'add',\n handlers: {\n click: 'record-copy'\n }\n },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'delete',\n handlers: {\n click: 'record-delete'\n }\n },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'arrow_upward',\n handlers: {\n click: 'move-up'\n }\n },\n {\n type: 'gutter',\n gutterName: 'button',\n icon: 'arrow_downward',\n handlers: {\n click: 'move-down'\n }\n },\n {\n type: 'string',\n name: 'name',\n header: i18next.t('field.name'),\n record: {\n editable: true\n },\n width: 140\n },\n {\n type: 'string',\n name: 'description',\n header: i18next.t('field.description'),\n record: {\n editable: true\n },\n width: 180\n },\n {\n type: 'string',\n name: 'inputKey',\n header: i18next.t('field.input-key'),\n record: {\n editable: true\n },\n width: 180\n },\n {\n type: 'string',\n name: 'tKey',\n header: i18next.t('field.t-key'),\n record: {\n editable: true\n },\n width: 180\n }\n ],\n rows: {\n selectable: false\n },\n pagination: {\n infinite: true\n },\n sorters: []\n }\n\n @query('ox-grist') private grist!: DataGrist\n\n render() {\n return html`\n <ox-grist\n .mode=${isMobileDevice() ? 'LIST' : 'GRID'}\n .config=${this.gristConfig}\n .fetchHandler=${this.fetchHandler.bind(this)}\n ></ox-grist>\n\n <div class=\"button-container\">\n <mwc-button @click=${this.onCancel.bind(this)}>${i18next.t('button.cancel')}</mwc-button>\n <mwc-button @click=${this.onConfirm.bind(this)}>${i18next.t('button.confirm')}</mwc-button>\n </div>\n `\n }\n\n async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {\n const records = this.value \|\| []\n return {\n total: records.length,\n records\n }\n }\n\n private onCancel(e: Event) {\n closePopup(this)\n }\n\n private onConfirm(e: Event) {\n this.grist.commit()\n\n this.value = this.grist.data.records.map(({ name, description, inputKey, tKey }) => {\n return {\n name,\n description,\n inputKey,\n tKey\n }\n })\n\n this.confirmCallback && this.confirmCallback(this.value)\n closePopup(this)\n }\n}\n"]}

package/dist-client/pages/activity/activity-list-page.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import '@operato/data-grist';
 import './activity-model-item-list.js';
-import { DataGrist } from '@operato/data-grist';
+import { DataGrist, FetchOption } from '@operato/data-grist';
 import { PageView } from '@operato/shell';
 export declare const ActivityStatus: {
     display: string;
@@ -43,12 +43,7 @@ export declare class ActivityListPage extends ActivityListPage_base {
     };
     render(): import("lit-html").TemplateResult<1>;
     pageInitialized(lifecycle: any): Promise<void>;
-    fetchHandler({ page, limit, sortings, filters }: {
-        page: any;
-        limit: any;
-        sortings?: never[] | undefined;
-        filters?: never[] | undefined;
-    }): Promise<{
+    fetchHandler({ page, limit, sortings, filters }: FetchOption): Promise<{
         total: any;
         records: any;
     }>;