@things-factory/worklist 6.0.37 → 6.0.40

package/client/activity-summary-generator.ts

@@ -69,7 +69,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)
 }
@@ -80,7 +80,7 @@ const fetchActivitySummary = debounce(async () => {
       query {
         activitySummary {
           numberOfToDos
-          numberOfApprovalWaitings
+          numberOfApprovalPendings
           numberOfPicks
           numberOfDrafts
         }
@@ -89,15 +89,15 @@ 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
 
     generatorLocks['numberOfToDos']?.unlock(numberOfToDos)
-    generatorLocks['numberOfApprovalWaitings']?.unlock(numberOfApprovalWaitings)
+    generatorLocks['numberOfApprovalPendings']?.unlock(numberOfApprovalPendings)
     generatorLocks['numberOfPicks']?.unlock(numberOfPicks)
     generatorLocks['numberOfDrafts']?.unlock(numberOfDrafts)
   }

package/client/bootstrap.ts

@@ -7,16 +7,13 @@ 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() {
   ;[
@@ -54,5 +51,5 @@ export default function bootstrap() {
   registerGristRenderer('quantifier', OxGristRendererQuantifier)
 
   registerGristEditor('activity-search-keys', GristEditorActivitySearchKeys)
-  registerGristRenderer('activity-search-keys', OxGristRendererJson5)
+  registerGristRenderer('activity-search-keys', GristRendererActivitySearchKeys)
 }

package/client/grist-editor/grist-editor-activity-search-key.ts

@@ -16,8 +16,9 @@ export class GristEditorActivitySearchKeys extends OxGristEditor {
   private popup?: PopupHandle
 
   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: Event): void {

package/client/grist-editor/grist-renderer-activity-search-key.ts

@@ -0,0 +1,25 @@
+import '@material/mwc-icon'
+import { html } from 'lit'
+import { FieldRenderer } from '@operato/data-grist'
+
+function onmouseover(e: MouseEvent, value: any[]) {
+  const element = e.target as HTMLPreElement
+  const tooltip = value.map(key => key.name).join(',')
+  element.setAttribute('data-tooltip', tooltip)
+}
+
+function onmouseout(e: MouseEvent) {
+  const element = e.target as HTMLPreElement
+  element.removeAttribute('data-tooltip')
+}
+
+export const GristRendererActivitySearchKeys: FieldRenderer = (value, column, record, rowIndex, field) => {
+  return value && value instanceof Array && value.length > 0
+    ? html`<mwc-icon
+        style="--mdc-icon-size:1.3em"
+        @mouseover=${(e: MouseEvent) => onmouseover(e, value)}
+        @mouseout=${onmouseout}
+        >key</mwc-icon
+      >`
+    : html``
+}

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

@@ -19,9 +19,9 @@ 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)]
@@ -123,6 +123,7 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
         {
           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) => {
@@ -141,6 +142,7 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
         {
           type: 'gutter',
           gutterName: 'button',
+          title: i18next.t('title.activity model item list'),
           icon: 'reorder',
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
@@ -202,9 +204,18 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
             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',
@@ -213,26 +224,21 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
           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',
@@ -319,7 +325,7 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
           record: {
             editable: true
           },
-          width: 120
+          width: 50
         },
         {
           type: 'approval-line',
@@ -328,7 +334,7 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
           record: {
             editable: true
           },
-          width: 120
+          width: 50
         },
         {
           type: 'select',
@@ -424,36 +430,6 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
           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',
@@ -565,9 +541,6 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
               timezone
               scheduleId
               standardTime
-              leadTime
-              cycleTime
-              tactTime
               updater {
                 id
                 name

package/client/pages/activity/activity-page.ts

@@ -18,7 +18,7 @@ const formatter = new Intl.DateTimeFormat(navigator.language, { dateStyle: 'full
 export const ActivityInstanceStatus = {
   Draft: 'draft',
   Posted: 'posted',
-  WaitingAssignment: 'waiting-assignment',
+  PendingAssignment: 'pending-assignment',
   Assigned: 'assigned',
   Started: 'started',
   Pending: 'pending',

package/client/pages/activity/activity-partial-view.ts

@@ -48,9 +48,6 @@ export class ActivityView extends localize(i18next)(LitElement) {
       schedule,
       timzeone,
       standardTime,
-      cycleTime,
-      tactTime,
-      leadTime,
       issuerRole,
       assigneeRole,
       supervisoryRole,

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

@@ -89,7 +89,6 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
               @change=${(e: CustomEvent) => {
                 this.filters = (e.currentTarget as any)?.value
               }}
-              multiple
             ></ox-input-select-buttons>
           </div>
 

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

@@ -127,9 +127,14 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
           name: 'priority',
           header: i18next.t('field.priority'),
           record: {
-            editable: false
+            editable: false,
+            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: 30
+          width: 60
         },
         {
           type: 'string',
@@ -138,7 +143,7 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
           record: {
             editable: false
           },
-          width: 60
+          width: 80
         },
         {
           type: 'resource-object',

package/client/pages/activity-instance/activity-instance-page.ts

@@ -19,7 +19,7 @@ const formatter = new Intl.DateTimeFormat(navigator.language, { dateStyle: 'full
 export const ActivityInstanceStatus = {
   Draft: 'draft',
   Posted: 'posted',
-  WaitingAssignment: 'waiting-assignment',
+  PendingAssignment: 'pending-assignment',
   Assigned: 'assigned',
   Started: 'started',
   Pending: 'pending',
@@ -68,7 +68,7 @@ export class ActivityInstancePage extends connect(store)(localize(i18next)(PageV
   @property({ type: Object }) board: any
 
   get context() {
-    const assignable = [ActivityInstanceStatus.Posted, ActivityInstanceStatus.WaitingAssignment].includes(
+    const assignable = [ActivityInstanceStatus.Posted, ActivityInstanceStatus.PendingAssignment].includes(
       this.activityInstance?.state
     )
     const abortable = [ActivityInstanceStatus.Draft, ActivityInstanceStatus.Posted].includes(

package/client/pages/activity-thread/activity-thread-page.ts

@@ -106,23 +106,16 @@ export class ActivityThreadPage extends connect(store)(localize(i18next)(PageVie
   get context() {
     const state = this.activityThread?.state
 
-    const startable = [ActivityThreadStatus.Assigned].includes(state)
-    const endable = [ActivityThreadStatus.Started].includes(state)
-    const savable = endable
     const restartable = [ActivityThreadStatus.Rejected].includes(state)
-    const delegatable = [ActivityThreadStatus.Assigned, ActivityThreadStatus.Started].includes(state)
-    const abortable = [ActivityThreadStatus.Assigned, ActivityThreadStatus.Started].includes(state)
+    const savable = !restartable
+    const endable = !restartable
+    const delegatable = !restartable
+    const abortable = !restartable
 
     return {
       title: this.lifecycle?.params?.['title'] || i18next.t('title.activity'),
       help: 'worklist/activity',
       actions: [
-        startable && {
-          title: i18next.t('button.start'),
-          action: this._startActivityThread.bind(this),
-          ...CommonButtonStyles.play
-        },
-
         savable && {
           title: i18next.t('button.save'),
           action: this._saveActivityThread.bind(this),

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

@@ -1,5 +1,6 @@
 import '@operato/data-grist'
 import './installable-activity-model-item-list.js'
+
 import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
@@ -10,7 +11,7 @@ import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { notify, openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
-import { CommonButtonStyles, CommonGristStyles, ScrollbarStyles } from '@operato/styles'
+import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 
 import { ActivityTypes, ActivityUITypes } from '../../types/types.js'
@@ -172,7 +173,7 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
           },
           filter: 'search',
           sortable: true,
-          width: 150
+          width: 80
         },
         {
           type: 'string',
@@ -183,7 +184,7 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
           },
           filter: 'search',
           sortable: true,
-          width: 150
+          width: 120
         },
         {
           type: 'select',
@@ -195,7 +196,20 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
             options: ActivityTypes
           },
           sortable: true,
-          // filter: true,
+          width: 60
+        },
+        {
+          type: 'number',
+          name: 'priority',
+          header: i18next.t('field.priority'),
+          record: {
+            editable: false,
+            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: 60
         },
         {
@@ -293,23 +307,6 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
           record: {
             editable: false
           },
-          // filter: true,
-          sortable: true,
-          width: 60
-        },
-        {
-          type: 'checkbox',
-          name: 'active',
-          label: true,
-          header: i18next.t('field.active'),
-          record: {
-            editable: false,
-            renderer: function (value, column, record, rowIndex, field) {
-              var type = record.reportType !== 'board' ? 'script' : 'board'
-              return getRenderer(type)(value, column, record, rowIndex, field)
-            }
-          },
-          // filter: true,
           sortable: true,
           width: 60
         }
@@ -326,11 +323,6 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
     }
   }
 
-  async pageUpdated(changes, lifecycle) {
-    if (this.active) {
-    }
-  }
-
   async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
     const response = await client.query({
       query: gql`
@@ -346,6 +338,7 @@ export class ActivityTemplateListPage extends connect(store)(localize(i18next)(P
               provider
               release
               activityType
+              priority
               startable
               model {
                 name

package/client/pages/todo/{approval-waiting-list-page.ts → approval-pending-list-page.ts}

@@ -14,15 +14,12 @@ import { navigate, PageView, store } from '@operato/shell'
 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
 const DAY = 24 * HOUR
 
-@customElement('approval-waiting-list-page')
-export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(PageView)) {
+@customElement('approval-pending-list-page')
+export class ApprovalPendingListPage extends connect(store)(localize(i18next)(PageView)) {
   static styles = [
     ScrollbarStyles,
     CommonGristStyles,
@@ -55,7 +52,7 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
         handler: (search: string) => {
           this.grist.searchText = search
         },
-        placeholder: i18next.t('title.approval waiting list'),
+        placeholder: i18next.t('title.approval pending list'),
         value: this.grist.searchText
       },
       filter: {
@@ -63,7 +60,7 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
           this.grist.toggleHeadroom()
         }
       },
-      help: 'worklist/approval-waiting-list',
+      help: 'worklist/approval-pending-list',
       actions: []
     }
   }
@@ -95,7 +92,6 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
                 this.filters = (e.currentTarget as any)?.value
                 this.grist.fetch()
               }}
-              multiple
             ></ox-input-select-buttons>
           </div>
 
@@ -167,14 +163,17 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
           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,19 +183,11 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
           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-submitted'), value: 'submitted' },
+              { display: i18next.t('label.activity-state-escalated'), value: 'escalated' }
             ]
           },
-          // filter: true,
-          width: 60
+          width: 80
         },
         {
           type: 'datetime',
@@ -289,7 +280,7 @@ export class ApprovalWaitingListPage extends connect(store)(localize(i18next)(Pa
     const response = await client.query({
       query: gql`
         query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
-          responses: approvalWaitingList(filters: $filters, pagination: $pagination, sortings: $sortings) {
+          responses: approvalPendingList(filters: $filters, pagination: $pagination, sortings: $sortings) {
             items {
               id
               round

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

@@ -14,7 +14,6 @@ import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { adjustFilters, isMobileDevice } from '@operato/utils'
 
 import { ActivityThreadStatus } from '../../types/activity-thread'
-import { Priorities } from '../../types/types.js'
 
 @customElement('done-list-page')
 export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
@@ -90,7 +89,6 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
                 this.filters = (e.currentTarget as any)?.value
                 this.grist.fetch()
               }}
-              multiple
             ></ox-input-select-buttons>
           </div>
 
@@ -116,8 +114,9 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'gutter',
           gutterName: 'button',
-          name: 'start',
-          icon: 'play_arrow',
+          name: 'view',
+          icon: 'pageview',
+          title: i18next.t('title.view page'),
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               const { id } = record
@@ -162,14 +161,17 @@ export class DoneListPage 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
         },
         {
@@ -179,19 +181,18 @@ export class DoneListPage 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: false,
-          width: 60
+          width: 80
         },
         {
           type: 'datetime',
@@ -262,8 +263,8 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
       },
       sorters: [
         {
-          name: 'dueAt',
-          desc: false
+          name: 'terminatedAt',
+          desc: true
         }
       ]
     }
@@ -339,14 +340,14 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
       total: response.data.responses.total || 0,
       records: (response.data.responses.items || []).map(item => {
         return {
+          ...item.activityInstance,
           id: item.id,
           state: item.state,
           output: item.output,
           dueAt: item.dueAt,
           assignedAt: item.assignedAt,
           startedAt: item.startedAt,
-          terminatedAt: item.terminatedAt,
-          ...item.activityInstance
+          terminatedAt: item.terminatedAt
         }
       })
     }