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

@things-factory/worklist 6.0.37 → 6.0.40

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 (134) hide show

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

@@ -178,14 +178,17 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
           hidden: true
         },
         {
-          type: 'select',
+          type: 'number',
           name: 'priority',
           header: i18next.t('field.priority'),
           record: {
             editable: false,
-            options: Priorities
+            renderer: function (value, column, record, rowIndex, field) {
+              const color = ['', 'gray', 'yellow', 'orange', 'red'][value || 0]
+              const count = new Array(value > 4 ? 4 : value || 0).fill('')
+              return html`${count.map(() => html`<mwc-icon style="color:${color};">star</mwc-icon>`)}`
+            }
           },
-          // filter: true,
           width: 60
         },
         {
@@ -195,19 +198,18 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: false,
             options: [
-              { display: 'Draft', value: 'draft' },
-              { display: 'Posted', value: 'posted' },
-              { display: 'WaitingAssignment', value: 'waiting-assignment' },
-              { display: 'Assigned', value: 'assigned' },
-              { display: 'Started', value: 'started' },
-              { display: 'Pending', value: 'pending' },
-              { display: 'Escalated', value: 'escalated' },
-              { display: 'Ended', value: 'ended' },
-              { display: 'Aborted', value: 'aborted' }
+              { display: i18next.t('label.activity-state-draft'), value: 'draft' },
+              { display: i18next.t('label.activity-state-posted'), value: 'posted' },
+              { display: i18next.t('label.activity-state-pending-assignment'), value: 'pending-assignment' },
+              { display: i18next.t('label.activity-state-assigned'), value: 'assigned' },
+              { display: i18next.t('label.activity-state-started'), value: 'started' },
+              { display: i18next.t('label.activity-state-pending'), value: 'pending' },
+              { display: i18next.t('label.activity-state-escalated'), value: 'escalated' },
+              { display: i18next.t('label.activity-state-ended'), value: 'ended' },
+              { display: i18next.t('label.activity-state-aborted'), value: 'aborted' }
             ]
           },
-          // filter: true,
-          width: 60
+          width: 80
         },
         {
           type: 'datetime',

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

@@ -13,24 +13,8 @@ import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/popup'
 import { PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
-import { isMobileDevice } from '@operato/utils'
+import { adjustFilters, isMobileDevice } from '@operato/utils'
-const FILTERS = [
-  {
-    display: 'Important',
-    value: 'Important'
-  },
-  {
-    display: 'Imminent',
-    value: 'Imminent'
-  },
-  {
-    display: 'Disapproved',
-    value: 'Disapproved'
-  }
-]
-@customElement('pickable-list-page')
 export class PickableListPage extends connect(store)(localize(i18next)(PageView)) {
   static styles = [
     ScrollbarStyles,
@@ -85,11 +69,19 @@ export class PickableListPage 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'
+                }
+              ]}
               @change=${(e: CustomEvent) => {
                 this.filters = (e.currentTarget as any)?.value
               }}
-              multiple
             ></ox-input-select-buttons>
           </div>
@@ -115,8 +107,9 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
         {
           type: 'gutter',
           gutterName: 'button',
-          name: 'start',
-          icon: 'add_shopping_cart',
+          name: 'pick',
+          icon: 'shop',
+          title: i18next.t('title.pick activity'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               if (!record.id) {
@@ -192,10 +185,6 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
             editable: false
           },
           sortable: true,
-          // filter: {
-          //   type: 'date',
-          //   operator: 'between'
-          // },
           width: 180
         },
         {
@@ -216,7 +205,6 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
             editable: false
           },
           sortable: true,
-          // filter: 'between',
           width: 180
         },
         {
@@ -245,6 +233,16 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
   }
   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 }])
+    }
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {

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

@@ -15,7 +15,6 @@ import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 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
@@ -87,15 +86,18 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
                   value: 'due'
                 },
                 {
-                  display: i18next.t('label.filter-rejected'),
-                  value: 'rejected'
+                  display: i18next.t('label.filter-proceeding'),
+                  value: 'proceeding'
+                },
+                {
+                  display: i18next.t('label.filter-pending-approval'),
+                  value: 'pending-approval'
                 }
               ]}
               @change=${(e: CustomEvent) => {
                 this.filters = (e.currentTarget as any)?.value
                 this.grist.fetch()
               }}
-              multiple
             ></ox-input-select-buttons>
           </div>
@@ -123,6 +125,7 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
           gutterName: 'button',
           name: 'start',
           icon: 'play_arrow',
+          title: i18next.t('title.open this activity page'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               const { id } = record
@@ -167,14 +170,17 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
           hidden: true
         },
         {
-          type: 'select',
+          type: 'number',
           name: 'priority',
           header: i18next.t('field.priority'),
           record: {
             editable: false,
-            options: Priorities
+            renderer: function (value, column, record, rowIndex, field) {
+              const color = ['', 'gray', 'yellow', 'orange', 'red'][value || 0]
+              const count = new Array(value > 4 ? 4 : value || 0).fill('')
+              return html`${count.map(() => html`<mwc-icon style="color:${color};">star</mwc-icon>`)}`
+            }
           },
-          // filter: true,
           width: 60
         },
         {
@@ -184,18 +190,17 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: false,
             options: [
-              { display: 'Assigned', value: 'assigned' },
-              { display: 'Started', value: 'started' },
-              { display: 'Delegated', value: 'delegated' },
-              { display: 'Submitted', value: 'submitted' },
-              { display: 'Escalated', value: 'escalated' },
-              { display: 'Rejected', value: 'rejected' },
-              { display: 'Ended', value: 'ended' },
-              { display: 'Aborted', value: 'aborted' }
+              { display: i18next.t('label.activity-state-assigned'), value: 'assigned' },
+              { display: i18next.t('label.activity-state-started'), value: 'started' },
+              { display: i18next.t('label.activity-state-delegated'), value: 'delegated' },
+              { display: i18next.t('label.activity-state-submitted'), value: 'submitted' },
+              { display: i18next.t('label.activity-state-escalated'), value: 'escalated' },
+              { display: i18next.t('label.activity-state-rejected'), value: 'rejected' },
+              { display: i18next.t('label.activity-state-ended'), value: 'ended' },
+              { display: i18next.t('label.activity-state-aborted'), value: 'aborted' }
             ]
           },
-          filter: false,
-          width: 60
+          width: 80
         },
         {
           type: 'datetime',
@@ -283,8 +288,18 @@ export class TodoListPage extends connect(store)(localize(i18next)(PageView)) {
       filters = adjustFilters(filters, [{ name: 'dueAt', operator: 'lte', value: tomorrow }])
     }
-    if (this.filters?.includes('rejected')) {
-      filters = adjustFilters(filters, [{ name: 'state', operator: 'eq', value: ActivityThreadStatus.Rejected }])
+    if (this.filters?.includes('proceeding')) {
+      filters = adjustFilters(filters, [{ name: 'state', operator: 'eq', value: ActivityThreadStatus.Started }])
+    }
+    if (this.filters?.includes('pending-approval')) {
+      filters = adjustFilters(filters, [
+        {
+          name: 'state',
+          operator: 'in',
+          value: [ActivityThreadStatus.Rejected, ActivityThreadStatus.Submitted, ActivityThreadStatus.Escalated]
+        }
+      ])
     }
     const response = await client.query({

package/client/route.ts CHANGED Viewed

@@ -8,10 +8,6 @@ export default function route(page: string) {
       import('./pages/dashboard/dashboard-home.js')
       return page
-    case 'assigned-list':
-      import('./pages/todo/assigned-list-page.js')
-      return page
     case 'todo-list':
       import('./pages/todo/todo-list-page.js')
       return page
@@ -20,8 +16,8 @@ export default function route(page: string) {
       import('./pages/todo/done-list-page.js')
       return page
-    case 'approval-waiting-list':
-      import('./pages/todo/approval-waiting-list-page.js')
+    case 'approval-pending-list':
+      import('./pages/todo/approval-pending-list-page.js')
       return page
     case 'draft-list':

package/client/types/activity-instance.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import { Activity, ActivityType, ActivityUIType } from './activity'
 export enum ActivityInstanceStatus {
   Draft = 'draft',
   Posted = 'posted',
-  WaitingAssignment = 'waiting-assignment',
+  PendingAssignment = 'pending-assignment',
   Assigned = 'assigned',
   Started = 'started',
   Pending = 'pending',

package/client/types/activity.ts CHANGED Viewed

@@ -61,12 +61,6 @@ export class Activity {
   standardTime?: number
-  cycleTime?: number
-  tactTime?: number
-  leadTime?: number
   issuerRole?: Role
   assigneeRole?: Role

package/dist-client/activity-summary-generator.js CHANGED Viewed

@@ -57,7 +57,7 @@ async function subscribeActivityApproval() {
 var summary = {};
 var generatorLocks = {
     numberOfToDos: new AsyncLock(true),
-    numberOfApprovalWaitings: new AsyncLock(true),
+    numberOfApprovalPendings: new AsyncLock(true),
     numberOfPicks: new AsyncLock(true),
     numberOfDrafts: new AsyncLock(true)
 };
@@ -68,7 +68,7 @@ const fetchActivitySummary = debounce(async () => {
       query {
         activitySummary {
           numberOfToDos
-          numberOfApprovalWaitings
+          numberOfApprovalPendings
           numberOfPicks
           numberOfDrafts
         }
@@ -76,13 +76,13 @@ const fetchActivitySummary = debounce(async () => {
     `
     });
     if (response.data) {
-        const { numberOfToDos, numberOfApprovalWaitings, numberOfPicks, numberOfDrafts } = response.data.activitySummary;
+        const { numberOfToDos, numberOfApprovalPendings, numberOfPicks, numberOfDrafts } = response.data.activitySummary;
         summary['numberOfToDos'] = numberOfToDos;
-        summary['numberOfApprovalWaitings'] = numberOfApprovalWaitings;
+        summary['numberOfApprovalPendings'] = numberOfApprovalPendings;
         summary['numberOfPicks'] = numberOfPicks;
         summary['numberOfDrafts'] = numberOfDrafts;
         (_a = generatorLocks['numberOfToDos']) === null || _a === void 0 ? void 0 : _a.unlock(numberOfToDos);
-        (_b = generatorLocks['numberOfApprovalWaitings']) === null || _b === void 0 ? void 0 : _b.unlock(numberOfApprovalWaitings);
+        (_b = generatorLocks['numberOfApprovalPendings']) === null || _b === void 0 ? void 0 : _b.unlock(numberOfApprovalPendings);
         (_c = generatorLocks['numberOfPicks']) === null || _c === void 0 ? void 0 : _c.unlock(numberOfPicks);
         (_d = generatorLocks['numberOfDrafts']) === null || _d === void 0 ? void 0 : _d.unlock(numberOfDrafts);
     }

package/dist-client/activity-summary-generator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"activity-summary-generator.js","sourceRoot":"","sources":["../client/activity-summary-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import debounce from 'lodash-es/debounce'\nimport gql from 'graphql-tag'\nimport { client, subscribe } from '@operato/graphql'\nimport { AsyncLock } from '@operato/utils'\n\nasync function subscribeActivityInstance() {\n return await subscribe(\n {\n query: gql`\n subscription {\n activityInstance {\n name\n }\n }\n `\n },\n {\n next: async ({ data }) => {\n if (data) {\n fetchActivitySummary()\n }\n }\n }\n )\n}\n\nasync function subscribeActivityThread() {\n return await subscribe(\n {\n query: gql`\n subscription {\n activityThread {\n transaction\n }\n }\n `\n },\n {\n next: async ({ data }) => {\n if (data) {\n fetchActivitySummary()\n }\n }\n }\n )\n}\n\nasync function subscribeActivityApproval() {\n return await subscribe(\n {\n query: gql`\n subscription {\n activityApproval {\n judgment\n }\n }\n `\n },\n {\n next: async ({ data }) => {\n if (data) {\n fetchActivitySummary()\n }\n }\n }\n )\n}\n\nvar summary = {}\nvar generatorLocks = {\n numberOfToDos: new AsyncLock(true),\n ~~numberOfApprovalWaitings~~: new AsyncLock(true),\n numberOfPicks: new AsyncLock(true),\n numberOfDrafts: new AsyncLock(true)\n}\n\nconst fetchActivitySummary = debounce(async () => {\n const response = await client.query({\n query: gql`\n query {\n activitySummary {\n numberOfToDos\n ~~numberOfApprovalWaitings~~\n numberOfPicks\n numberOfDrafts\n }\n }\n `\n })\n\n if (response.data) {\n const { numberOfToDos, ~~numberOfApprovalWaitings~~, numberOfPicks, numberOfDrafts } = response.data.activitySummary\n\n summary['numberOfToDos'] = numberOfToDos\n summary['~~numberOfApprovalWaitings~~'] = ~~numberOfApprovalWaitings~~\n summary['numberOfPicks'] = numberOfPicks\n summary['numberOfDrafts'] = numberOfDrafts\n\n generatorLocks['numberOfToDos']?.unlock(numberOfToDos)\n generatorLocks['~~numberOfApprovalWaitings~~']?.unlock(~~numberOfApprovalWaitings~~)\n generatorLocks['numberOfPicks']?.unlock(numberOfPicks)\n generatorLocks['numberOfDrafts']?.unlock(numberOfDrafts)\n }\n}, 1000)\n\nexport async function* generateActivitySummary(name: string) {\n /* 1. 앞에 사용되었던 generator가 종료될 기회를 준다. /\n generatorLocks[name]?.unlock()\n\n / 2. 마지막 값을 일단 yield 한다. /\n yield summary[name]\n\n while (true) {\n generatorLocks[name].lock()\n\n let badge = await generatorLocks[name].promise\n if (badge === undefined) {\n / 새로운 generator가 생성된 경우이면, 기존 generator는 종료한다. */\n return\n }\n\n yield badge\n }\n}\n\nexport async function startSubscribeActivitySummary() {\n await subscribeActivityInstance()\n await subscribeActivityThread()\n await subscribeActivityApproval()\n\n fetchActivitySummary()\n}\n"]}
1	+ {"version":3,"file":"activity-summary-generator.js","sourceRoot":"","sources":["../client/activity-summary-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import debounce from 'lodash-es/debounce'\nimport gql from 'graphql-tag'\nimport { client, subscribe } from '@operato/graphql'\nimport { AsyncLock } from '@operato/utils'\n\nasync function subscribeActivityInstance() {\n return await subscribe(\n {\n query: gql`\n subscription {\n activityInstance {\n name\n }\n }\n `\n },\n {\n next: async ({ data }) => {\n if (data) {\n fetchActivitySummary()\n }\n }\n }\n )\n}\n\nasync function subscribeActivityThread() {\n return await subscribe(\n {\n query: gql`\n subscription {\n activityThread {\n transaction\n }\n }\n `\n },\n {\n next: async ({ data }) => {\n if (data) {\n fetchActivitySummary()\n }\n }\n }\n )\n}\n\nasync function subscribeActivityApproval() {\n return await subscribe(\n {\n query: gql`\n subscription {\n activityApproval {\n judgment\n }\n }\n `\n },\n {\n next: async ({ data }) => {\n if (data) {\n fetchActivitySummary()\n }\n }\n }\n )\n}\n\nvar summary = {}\nvar generatorLocks = {\n numberOfToDos: new AsyncLock(true),\n numberOfApprovalPendings: new AsyncLock(true),\n numberOfPicks: new AsyncLock(true),\n numberOfDrafts: new AsyncLock(true)\n}\n\nconst fetchActivitySummary = debounce(async () => {\n const response = await client.query({\n query: gql`\n query {\n activitySummary {\n numberOfToDos\n numberOfApprovalPendings\n numberOfPicks\n numberOfDrafts\n }\n }\n `\n })\n\n if (response.data) {\n const { numberOfToDos, numberOfApprovalPendings, numberOfPicks, numberOfDrafts } = response.data.activitySummary\n\n summary['numberOfToDos'] = numberOfToDos\n summary['numberOfApprovalPendings'] = numberOfApprovalPendings\n summary['numberOfPicks'] = numberOfPicks\n summary['numberOfDrafts'] = numberOfDrafts\n\n generatorLocks['numberOfToDos']?.unlock(numberOfToDos)\n generatorLocks['numberOfApprovalPendings']?.unlock(numberOfApprovalPendings)\n generatorLocks['numberOfPicks']?.unlock(numberOfPicks)\n generatorLocks['numberOfDrafts']?.unlock(numberOfDrafts)\n }\n}, 1000)\n\nexport async function* generateActivitySummary(name: string) {\n /* 1. 앞에 사용되었던 generator가 종료될 기회를 준다. /\n generatorLocks[name]?.unlock()\n\n / 2. 마지막 값을 일단 yield 한다. /\n yield summary[name]\n\n while (true) {\n generatorLocks[name].lock()\n\n let badge = await generatorLocks[name].promise\n if (badge === undefined) {\n / 새로운 generator가 생성된 경우이면, 기존 generator는 종료한다. */\n return\n }\n\n yield badge\n }\n}\n\nexport async function startSubscribeActivitySummary() {\n await subscribeActivityInstance()\n await subscribeActivityThread()\n await subscribeActivityApproval()\n\n fetchActivitySummary()\n}\n"]}

package/dist-client/bootstrap.js CHANGED Viewed

@@ -5,12 +5,13 @@ import { html } from 'lit-html';
 import { store } from '@operato/shell';
 import { openOverlay, TOOL_POSITION } from '@operato/layout';
 import { APPEND_CONTEXT_TOOL } from '@things-factory/context-ui';
-import { OxGristRendererJson5, registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist';
+import { registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist';
 import { OxGristEditorDuration } from '@operato/grist-editor/ox-grist-editor-duration.js';
 import { OxGristEditorQuantifier } from '@operato/grist-editor/ox-grist-editor-quantifier.js';
 import { OxGristRendererDuration } from '@operato/grist-editor/ox-grist-renderer-duration.js';
 import { OxGristRendererQuantifier } from '@operato/grist-editor/ox-grist-renderer-quantifier.js';
 import { GristEditorActivitySearchKeys } from './grist-editor/grist-editor-activity-search-key.js';
+import { GristRendererActivitySearchKeys } from './grist-editor/grist-renderer-activity-search-key.js';
 export default function bootstrap() {
     ;
     [
@@ -46,6 +47,6 @@ export default function bootstrap() {
     registerGristEditor('quantifier', OxGristEditorQuantifier);
     registerGristRenderer('quantifier', OxGristRendererQuantifier);
     registerGristEditor('activity-search-keys', GristEditorActivitySearchKeys);
-    registerGristRenderer('activity-search-keys', OxGristRendererJson5);
+    registerGristRenderer('activity-search-keys', GristRendererActivitySearchKeys);
 }
 //# sourceMappingURL=bootstrap.js.map

package/dist-client/bootstrap.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../client/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAC3B,OAAO,mDAAmD,CAAA;AAC1D,OAAO,iDAAiD,CAAA;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAEhE,OAAO,~~EACL~~,~~oBAAoB,EACpB,~~cAAc,IAAI,mBAAmB,~~EACrC~~,gBAAgB,IAAI,qBAAqB,~~EAC1C~~,MAAM,qBAAqB,CAAA;~~AAC5B~~,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAA;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAA;AAC7F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAA;AACjG,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAA;~~AAElG~~,MAAM,CAAC,OAAO,UAAU,SAAS;IAC/B,CAAC;IAAA;QACC;YACE,QAAQ,EAAE,IAAI,CAAA,6EAA6E;YAC3F,OAAO,EAAE,kBAAkB;SAC5B;QACD;YACE,QAAQ,EAAE,IAAI,CAAA,yEAAyE;YACvF,OAAO,EAAE,gBAAgB;SAC1B;KACF,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QAClC,KAAK,CAAC,QAAQ,CAAC;YACb,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE;gBACJ,QAAQ,EAAE,aAAa,CAAC,KAAK;gBAC7B,QAAQ,EAAE,IAAI,CAAA;;qBAED,KAAK,EAAC,CAAC,EAAC,EAAE;oBACjB,WAAW,CAAC,yBAAyB,EAAE;wBACrC,QAAQ;qBACT,CAAC,CAAA;gBACJ,CAAC;;;SAGJ;gBACD,OAAO;aACR;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,mBAAmB,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAA;IACtD,qBAAqB,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAA;IAC1D,mBAAmB,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;IAC1D,qBAAqB,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAA;IAE9D,mBAAmB,CAAC,sBAAsB,EAAE,6BAA6B,CAAC,CAAA;IAC1E,qBAAqB,CAAC,sBAAsB,EAAE,~~oBAAoB,~~CAAC,CAAA;~~AACrE~~,CAAC","sourcesContent":["import '@material/mwc-icon'\nimport './templates/activity-approval-context-template.js'\nimport './templates/activity-thread-context-template.js'\n\nimport { html } from 'lit-html'\nimport { store } from '@operato/shell'\nimport { openOverlay, TOOL_POSITION } from '@operato/layout'\nimport { APPEND_CONTEXT_TOOL } from '@things-factory/context-ui'\n\nimport {~~\n OxGristRendererJson5,\n~~ registerEditor as registerGristEditor~~,\n~~ registerRenderer as registerGristRenderer\n} from '@operato/data-grist'\nimport { OxGristEditorDuration } from '@operato/grist-editor/ox-grist-editor-duration.js'\nimport { OxGristEditorQuantifier } from '@operato/grist-editor/ox-grist-editor-quantifier.js'\nimport { OxGristRendererDuration } from '@operato/grist-editor/ox-grist-renderer-duration.js'\nimport { OxGristRendererQuantifier } from '@operato/grist-editor/ox-grist-renderer-quantifier.js'\nimport { GristEditorActivitySearchKeys } from './grist-editor/grist-editor-activity-search-key.js'\n\nexport default function bootstrap() {\n ;[\n {\n template: html` <activity-approval-context-template></activity-approval-context-template> `,\n context: 'activityApproval'\n },\n {\n template: html` <activity-thread-context-template></activity-thread-context-template> `,\n context: 'activityThread'\n }\n ].forEach(({ template, context }) => {\n store.dispatch({\n type: APPEND_CONTEXT_TOOL,\n tool: {\n position: TOOL_POSITION.FRONT,\n template: html`\n <mwc-icon\n @click=${async e => {\n openOverlay('context-toolbar-overlay', {\n template\n })\n }}\n >info</mwc-icon\n >\n `,\n context\n }\n })\n })\n\n registerGristEditor('duration', OxGristEditorDuration)\n registerGristRenderer('duration', OxGristRendererDuration)\n registerGristEditor('quantifier', OxGristEditorQuantifier)\n registerGristRenderer('quantifier', OxGristRendererQuantifier)\n\n registerGristEditor('activity-search-keys', GristEditorActivitySearchKeys)\n registerGristRenderer('activity-search-keys', ~~OxGristRendererJson5~~)\n}\n"]}
1	+ {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../client/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAC3B,OAAO,mDAAmD,CAAA;AAC1D,OAAO,iDAAiD,CAAA;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAEhE,OAAO,EAAE,cAAc,IAAI,mBAAmB,EAAE,gBAAgB,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AACtH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAA;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAA;AAC7F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAA;AACjG,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAA;AAClG,OAAO,EAAE,+BAA+B,EAAE,MAAM,sDAAsD,CAAA;AAEtG,MAAM,CAAC,OAAO,UAAU,SAAS;IAC/B,CAAC;IAAA;QACC;YACE,QAAQ,EAAE,IAAI,CAAA,6EAA6E;YAC3F,OAAO,EAAE,kBAAkB;SAC5B;QACD;YACE,QAAQ,EAAE,IAAI,CAAA,yEAAyE;YACvF,OAAO,EAAE,gBAAgB;SAC1B;KACF,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;QAClC,KAAK,CAAC,QAAQ,CAAC;YACb,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE;gBACJ,QAAQ,EAAE,aAAa,CAAC,KAAK;gBAC7B,QAAQ,EAAE,IAAI,CAAA;;qBAED,KAAK,EAAC,CAAC,EAAC,EAAE;oBACjB,WAAW,CAAC,yBAAyB,EAAE;wBACrC,QAAQ;qBACT,CAAC,CAAA;gBACJ,CAAC;;;SAGJ;gBACD,OAAO;aACR;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,mBAAmB,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAA;IACtD,qBAAqB,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAA;IAC1D,mBAAmB,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;IAC1D,qBAAqB,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAA;IAE9D,mBAAmB,CAAC,sBAAsB,EAAE,6BAA6B,CAAC,CAAA;IAC1E,qBAAqB,CAAC,sBAAsB,EAAE,+BAA+B,CAAC,CAAA;AAChF,CAAC","sourcesContent":["import '@material/mwc-icon'\nimport './templates/activity-approval-context-template.js'\nimport './templates/activity-thread-context-template.js'\n\nimport { html } from 'lit-html'\nimport { store } from '@operato/shell'\nimport { openOverlay, TOOL_POSITION } from '@operato/layout'\nimport { APPEND_CONTEXT_TOOL } from '@things-factory/context-ui'\n\nimport { registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist'\nimport { OxGristEditorDuration } from '@operato/grist-editor/ox-grist-editor-duration.js'\nimport { OxGristEditorQuantifier } from '@operato/grist-editor/ox-grist-editor-quantifier.js'\nimport { OxGristRendererDuration } from '@operato/grist-editor/ox-grist-renderer-duration.js'\nimport { OxGristRendererQuantifier } from '@operato/grist-editor/ox-grist-renderer-quantifier.js'\nimport { GristEditorActivitySearchKeys } from './grist-editor/grist-editor-activity-search-key.js'\nimport { GristRendererActivitySearchKeys } from './grist-editor/grist-renderer-activity-search-key.js'\n\nexport default function bootstrap() {\n ;[\n {\n template: html` <activity-approval-context-template></activity-approval-context-template> `,\n context: 'activityApproval'\n },\n {\n template: html` <activity-thread-context-template></activity-thread-context-template> `,\n context: 'activityThread'\n }\n ].forEach(({ template, context }) => {\n store.dispatch({\n type: APPEND_CONTEXT_TOOL,\n tool: {\n position: TOOL_POSITION.FRONT,\n template: html`\n <mwc-icon\n @click=${async e => {\n openOverlay('context-toolbar-overlay', {\n template\n })\n }}\n >info</mwc-icon\n >\n `,\n context\n }\n })\n })\n\n registerGristEditor('duration', OxGristEditorDuration)\n registerGristRenderer('duration', OxGristRendererDuration)\n registerGristEditor('quantifier', OxGristEditorQuantifier)\n registerGristRenderer('quantifier', OxGristRendererQuantifier)\n\n registerGristEditor('activity-search-keys', GristEditorActivitySearchKeys)\n registerGristRenderer('activity-search-keys', GristRendererActivitySearchKeys)\n}\n"]}

package/dist-client/grist-editor/grist-editor-activity-search-key.js CHANGED Viewed

@@ -10,8 +10,9 @@ import { i18next } from '@operato/i18n';
 import { openPopup } from '@operato/popup';
 let GristEditorActivitySearchKeys = class GristEditorActivitySearchKeys extends OxGristEditor {
     get editorTemplate() {
-        const value = typeof this.value === 'object' ? JSON.stringify(this.value) : this.value;
-        return html ` <div tabindex="0">${value || ''}</div> `;
+        return this.value && this.value instanceof Array && this.value.length > 0
+            ? html `<mwc-icon style="--mdc-icon-size:1.3em">key</mwc-icon>`
+            : html ``;
     }
     _onclick(e) {
         e.stopPropagation();

package/dist-client/grist-editor/grist-editor-activity-search-key.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grist-editor-activity-search-key.js","sourceRoot":"","sources":["../../client/grist-editor/grist-editor-activity-search-key.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,OAAO,qDAAqD,CAAA;AAE5D,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,SAAS,EAAe,MAAM,gBAAgB,CAAA;AAGhD,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,aAAa;IAG9D,IAAI,cAAc;QAChB,~~MAAM,KAAK,GAAG,~~OAAO,IAAI,CAAC,KAAK,~~KAAK~~,~~QAAQ~~,CAAC,~~CAAC~~,~~CAAC~~,IAAI,~~CAAC,SAAS,CAAC,~~IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,~~CAAC~~,~~KAAK,CAAA~~;~~QACtF~~,~~OAAO~~,IAAI,CAAA,~~sBAAsB,KAAK,IAAI,~~EAAE,~~SAAS,~~CAAA;~~IACvD~~,CAAC;IAED,QAAQ,CAAC,CAAQ;QACf,CAAC,CAAC,eAAe,EAAE,CAAA;QACnB,IAAI,CAAC,eAAe,EAAE,CAAA;IACxB,CAAC;IAED,UAAU,CAAC,CAAgB;QACzB,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAA;QACjB,IAAI,GAAG,IAAI,OAAO,EAAE;YAClB,CAAC,CAAC,eAAe,EAAE,CAAA;YACnB,IAAI,CAAC,eAAe,EAAE,CAAA;SACvB;IACH,CAAC;IAED,KAAK,CAAC,eAAe;;QACnB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAA;SAClB;QAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,OAAO,KAAI,EAAE,CAAA;QAExD,MAAM,eAAe,GAAG,CAAC,MAAW,EAAE,EAAE;YACtC,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,cAAc,EAAE;gBAC9B,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE;oBACN,MAAM,EAAE,IAAI,CAAC,KAAK;oBAClB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd;aACF,CAAC,CACH,CAAA;QACH,CAAC,CAAA;QAED;;;;;;;UAOE;QACF,IAAI,QAAQ,GAAG,IAAI,CAAA;iDAC0B,IAAI,CAAC,KAAK,qBAAqB,eAAe;;KAE1F,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE;YAC/B,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,EAAE,KAAI,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG;YAClE,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;~~AAhEY~~,6BAA6B;IADzC,aAAa,CAAC,mCAAmC,CAAC;GACtC,6BAA6B,~~CAgEzC~~;~~SAhEY~~,6BAA6B","sourcesContent":["/*\n @license Copyright © HatioLab Inc. All rights reserved.\n /\n\nimport '../grist-editor/popup-activity-search-keys-input.js'\n\nimport { html } from 'lit'\nimport { customElement } from 'lit/decorators.js'\n\nimport { OxGristEditor } from '@operato/data-grist'\nimport { i18next } from '@operato/i18n'\nimport { openPopup, PopupHandle } from '@operato/popup'\n\n@customElement('grist-editor-activity-search-keys')\nexport class GristEditorActivitySearchKeys extends OxGristEditor {\n private popup?: PopupHandle\n\n get editorTemplate() {\n ~~const~~ value = ~~typeof~~ this.value ~~===~~ ~~'object'~~ ? ~~JSON.stringify(~~this.value) : ~~this.value~~\n ~~return~~ html` ~~<div tabindex~~=\"0\"~~>${value \|\| ''}~~</~~div>~~ `\n }\n\n _onclick(e: Event): void {\n e.stopPropagation()\n this.openEditorPopup()\n }\n\n _onkeydown(e: KeyboardEvent): void {\n const key = e.key\n if (key == 'Enter') {\n e.stopPropagation()\n this.openEditorPopup()\n }\n }\n\n async openEditorPopup() {\n if (this.popup) {\n delete this.popup\n }\n\n const { name, help } = this.column.record?.options \|\| {}\n\n const confirmCallback = (newval: any) => {\n this.dispatchEvent(\n new CustomEvent('field-change', {\n bubbles: true,\n composed: true,\n detail: {\n before: this.value,\n after: newval,\n record: this.record,\n column: this.column,\n row: this.row\n }\n })\n )\n }\n\n / \n 주의 : 이 팝업 템플릿은 layout 모듈에 의해서 render 되므로, \n layout의 구성에 변화가 발생하면, 다시 render된다.\n 이 팝업이 떠 있는 상태에서, 또 다른 팝업이 뜨는 경우도 layout 구성의 변화를 야기한다. (overlay의 갯수의 증가)\n 이 경우 value, options, confirmCallback 등 클로져를 사용한 것들이 초기 바인딩된 값으로 다시 바인딩되게 되는데,\n 만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.\n 따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.\n */\n var template = html`\n <popup-activity-search-keys-input .value=${this.value} .confirmCallback=${confirmCallback}>\n </popup-activity-search-keys-input>\n `\n\n this.popup = openPopup(template, {\n backdrop: true,\n size: 'large',\n title: `${name?.toUpperCase() \|\| i18next.t('field.search-keys')} `,\n help\n })\n }\n}\n"]}
1	+ {"version":3,"file":"grist-editor-activity-search-key.js","sourceRoot":"","sources":["../../client/grist-editor/grist-editor-activity-search-key.ts"],"names":[],"mappings":"AAAA;;GAEG;;AAEH,OAAO,qDAAqD,CAAA;AAE5D,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,SAAS,EAAe,MAAM,gBAAgB,CAAA;AAGhD,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,aAAa;IAG9D,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,YAAY,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YACvE,CAAC,CAAC,IAAI,CAAA,wDAAwD;YAC9D,CAAC,CAAC,IAAI,CAAA,EAAE,CAAA;IACZ,CAAC;IAED,QAAQ,CAAC,CAAQ;QACf,CAAC,CAAC,eAAe,EAAE,CAAA;QACnB,IAAI,CAAC,eAAe,EAAE,CAAA;IACxB,CAAC;IAED,UAAU,CAAC,CAAgB;QACzB,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAA;QACjB,IAAI,GAAG,IAAI,OAAO,EAAE;YAClB,CAAC,CAAC,eAAe,EAAE,CAAA;YACnB,IAAI,CAAC,eAAe,EAAE,CAAA;SACvB;IACH,CAAC;IAED,KAAK,CAAC,eAAe;;QACnB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAA;SAClB;QAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,OAAO,KAAI,EAAE,CAAA;QAExD,MAAM,eAAe,GAAG,CAAC,MAAW,EAAE,EAAE;YACtC,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,cAAc,EAAE;gBAC9B,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE;oBACN,MAAM,EAAE,IAAI,CAAC,KAAK;oBAClB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,GAAG,EAAE,IAAI,CAAC,GAAG;iBACd;aACF,CAAC,CACH,CAAA;QACH,CAAC,CAAA;QAED;;;;;;;UAOE;QACF,IAAI,QAAQ,GAAG,IAAI,CAAA;iDAC0B,IAAI,CAAC,KAAK,qBAAqB,eAAe;;KAE1F,CAAA;QAED,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE;YAC/B,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,EAAE,KAAI,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG;YAClE,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAjEY,6BAA6B;IADzC,aAAa,CAAC,mCAAmC,CAAC;GACtC,6BAA6B,CAiEzC;SAjEY,6BAA6B","sourcesContent":["/*\n @license Copyright © HatioLab Inc. All rights reserved.\n /\n\nimport '../grist-editor/popup-activity-search-keys-input.js'\n\nimport { html } from 'lit'\nimport { customElement } from 'lit/decorators.js'\n\nimport { OxGristEditor } from '@operato/data-grist'\nimport { i18next } from '@operato/i18n'\nimport { openPopup, PopupHandle } from '@operato/popup'\n\n@customElement('grist-editor-activity-search-keys')\nexport class GristEditorActivitySearchKeys extends OxGristEditor {\n private popup?: PopupHandle\n\n get editorTemplate() {\n return this.value && this.value instanceof Array && this.value.length > 0\n ? html`<mwc-icon style=\"--mdc-icon-size:1.3em\">key</mwc-icon>`\n : html``\n }\n\n _onclick(e: Event): void {\n e.stopPropagation()\n this.openEditorPopup()\n }\n\n _onkeydown(e: KeyboardEvent): void {\n const key = e.key\n if (key == 'Enter') {\n e.stopPropagation()\n this.openEditorPopup()\n }\n }\n\n async openEditorPopup() {\n if (this.popup) {\n delete this.popup\n }\n\n const { name, help } = this.column.record?.options \|\| {}\n\n const confirmCallback = (newval: any) => {\n this.dispatchEvent(\n new CustomEvent('field-change', {\n bubbles: true,\n composed: true,\n detail: {\n before: this.value,\n after: newval,\n record: this.record,\n column: this.column,\n row: this.row\n }\n })\n )\n }\n\n / \n 주의 : 이 팝업 템플릿은 layout 모듈에 의해서 render 되므로, \n layout의 구성에 변화가 발생하면, 다시 render된다.\n 이 팝업이 떠 있는 상태에서, 또 다른 팝업이 뜨는 경우도 layout 구성의 변화를 야기한다. (overlay의 갯수의 증가)\n 이 경우 value, options, confirmCallback 등 클로져를 사용한 것들이 초기 바인딩된 값으로 다시 바인딩되게 되는데,\n 만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.\n 따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.\n */\n var template = html`\n <popup-activity-search-keys-input .value=${this.value} .confirmCallback=${confirmCallback}>\n </popup-activity-search-keys-input>\n `\n\n this.popup = openPopup(template, {\n backdrop: true,\n size: 'large',\n title: `${name?.toUpperCase() \|\| i18next.t('field.search-keys')} `,\n help\n })\n }\n}\n"]}

package/dist-client/grist-editor/grist-renderer-activity-search-key.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import '@material/mwc-icon';
+import { FieldRenderer } from '@operato/data-grist';
+export declare const GristRendererActivitySearchKeys: FieldRenderer;

package/dist-client/grist-editor/grist-renderer-activity-search-key.js ADDED Viewed

@@ -0,0 +1,22 @@
+import '@material/mwc-icon';
+import { html } from 'lit';
+function onmouseover(e, value) {
+    const element = e.target;
+    const tooltip = value.map(key => key.name).join(',');
+    element.setAttribute('data-tooltip', tooltip);
+}
+function onmouseout(e) {
+    const element = e.target;
+    element.removeAttribute('data-tooltip');
+}
+export const GristRendererActivitySearchKeys = (value, column, record, rowIndex, field) => {
+    return value && value instanceof Array && value.length > 0
+        ? html `<mwc-icon
+        style="--mdc-icon-size:1.3em"
+        @mouseover=${(e) => onmouseover(e, value)}
+        @mouseout=${onmouseout}
+        >key</mwc-icon
+      >`
+        : html ``;
+};
+//# sourceMappingURL=grist-renderer-activity-search-key.js.map

package/dist-client/grist-editor/grist-renderer-activity-search-key.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"grist-renderer-activity-search-key.js","sourceRoot":"","sources":["../../client/grist-editor/grist-renderer-activity-search-key.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AAG1B,SAAS,WAAW,CAAC,CAAa,EAAE,KAAY;IAC9C,MAAM,OAAO,GAAG,CAAC,CAAC,MAAwB,CAAA;IAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACpD,OAAO,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC;AAED,SAAS,UAAU,CAAC,CAAa;IAC/B,MAAM,OAAO,GAAG,CAAC,CAAC,MAAwB,CAAA;IAC1C,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;IACvG,OAAO,KAAK,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QACxD,CAAC,CAAC,IAAI,CAAA;;qBAEW,CAAC,CAAa,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC;oBACzC,UAAU;;QAEtB;QACJ,CAAC,CAAC,IAAI,CAAA,EAAE,CAAA;AACZ,CAAC,CAAA","sourcesContent":["import '@material/mwc-icon'\nimport { html } from 'lit'\nimport { FieldRenderer } from '@operato/data-grist'\n\nfunction onmouseover(e: MouseEvent, value: any[]) {\n const element = e.target as HTMLPreElement\n const tooltip = value.map(key => key.name).join(',')\n element.setAttribute('data-tooltip', tooltip)\n}\n\nfunction onmouseout(e: MouseEvent) {\n const element = e.target as HTMLPreElement\n element.removeAttribute('data-tooltip')\n}\n\nexport const GristRendererActivitySearchKeys: FieldRenderer = (value, column, record, rowIndex, field) => {\n return value && value instanceof Array && value.length > 0\n ? html`<mwc-icon\n style=\"--mdc-icon-size:1.3em\"\n @mouseover=${(e: MouseEvent) => onmouseover(e, value)}\n @mouseout=${onmouseout}\n >key</mwc-icon\n >`\n : html``\n}\n"]}

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

@@ -16,9 +16,9 @@ import { isMobileDevice } from '@operato/utils';
 import { ActivityTypes, ActivityUITypes } from '../../types/types.js';
 export const ActivityStatus = [
     { display: '', value: '' },
-    { display: 'Draft', value: 'draft' },
-    { display: 'Released', value: 'released' },
-    { display: 'Deprecated', value: 'deprecated' }
+    { display: i18next.t('label.activity-state-draft'), value: 'draft' },
+    { display: i18next.t('label.activity-state-released'), value: 'released' },
+    { display: i18next.t('label.activity-state-deprecated'), value: 'deprecated' }
 ];
 const DEFAULT_TZ = Intl.DateTimeFormat().resolvedOptions().timeZone;
 const TIMEZONE_OPTIONS = ['', DEFAULT_TZ, ...moment.tz.names().filter(tz => tz !== DEFAULT_TZ)];
@@ -94,6 +94,7 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                 {
                     type: 'gutter',
                     gutterName: 'button',
+                    title: i18next.t('title.activity schedule (un)register'),
                     icon: record => (!record || !record.name ? '' : record.scheduleId ? 'pause' : 'play_arrow'),
                     handlers: {
                         click: (columns, data, column, record, rowIndex) => {
@@ -113,6 +114,7 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                 {
                     type: 'gutter',
                     gutterName: 'button',
+                    title: i18next.t('title.activity model item list'),
                     icon: 'reorder',
                     handlers: {
                         click: (columns, data, column, record, rowIndex) => {
@@ -173,9 +175,18 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                         options: ActivityTypes
                     },
                     sortable: true,
-                    // filter: true,
                     width: 60
                 },
+                {
+                    type: 'boolean',
+                    name: 'startable',
+                    label: true,
+                    header: i18next.t('field.startable'),
+                    record: {
+                        editable: true
+                    },
+                    width: 50
+                },
                 {
                     type: 'activity-search-keys',
                     name: 'searchKeys',
@@ -184,26 +195,21 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                     record: {
                         editable: true
                     },
-                    width: 120
+                    width: 50
                 },
                 {
                     type: 'number',
                     name: 'priority',
                     header: i18next.t('field.priority'),
                     record: {
-                        editable: true
-                    },
-                    width: 30
-                },
-                {
-                    type: 'boolean',
-                    name: 'startable',
-                    label: true,
-                    header: i18next.t('field.startable'),
-                    record: {
-                        editable: true
+                        editable: true,
+                        renderer: function (value, column, record, rowIndex, field) {
+                            const color = ['', 'gray', 'yellow', 'orange', 'red'][value || 0];
+                            const count = new Array(value > 4 ? 4 : value || 0).fill('');
+                            return html `${count.map(() => html `<mwc-icon style="color:${color};">star</mwc-icon>`)}`;
+                        }
                     },
-                    width: 80
+                    width: 60
                 },
                 {
                     type: 'crontab',
@@ -290,7 +296,7 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                     record: {
                         editable: true
                     },
-                    width: 120
+                    width: 50
                 },
                 {
                     type: 'approval-line',
@@ -299,7 +305,7 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                     record: {
                         editable: true
                     },
-                    width: 120
+                    width: 50
                 },
                 {
                     type: 'select',
@@ -395,36 +401,6 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
                     sortable: true,
                     width: 80
                 },
-                {
-                    type: 'duration',
-                    name: 'cycleTime',
-                    header: i18next.t('field.cycle-time'),
-                    record: {
-                        editable: true
-                    },
-                    sortable: true,
-                    width: 80
-                },
-                {
-                    type: 'duration',
-                    name: 'tactTime',
-                    header: i18next.t('field.tact-time'),
-                    record: {
-                        editable: true
-                    },
-                    sortable: true,
-                    width: 80
-                },
-                {
-                    type: 'duration',
-                    name: 'leadTime',
-                    header: i18next.t('field.lead-time'),
-                    record: {
-                        editable: true
-                    },
-                    sortable: true,
-                    width: 80
-                },
                 {
                     type: 'resource-object',
                     name: 'updater',
@@ -535,9 +511,6 @@ let ActivityListPage = class ActivityListPage extends connect(store)(localize(i1
               timezone
               scheduleId
               standardTime
-              leadTime
-              cycleTime
-              tactTime
               updater {
                 id
                 name