@things-factory/worklist 6.0.45 → 6.0.47

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

@@ -14,6 +14,7 @@ import { openPopup } from '@operato/layout'
 import { PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
+import { ActivityStartingTypes, ActivityTypes } from '../../types/types.js'
 
 const FILTERS = [
   {
@@ -67,7 +68,8 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
         handler: () => {
           this.grist.toggleHeadroom()
         }
-      }
+      },
+      help: 'worklist/starter-list'
     }
   }
 
@@ -115,7 +117,7 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
           type: 'gutter',
           gutterName: 'button',
           name: 'start',
-          icon: 'add_task',
+          icon: 'rocket_launch',
           handlers: {
             click: (columns, data, column, record, rowIndex) => {
               if (!record.id) {
@@ -128,7 +130,9 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
                   backdrop: true,
                   help: 'worklist/activity-starter-form',
                   size: 'large',
-                  title: i18next.t('title.activity starter')
+                  title: i18next.t(
+                    record.startingType == 'issue' ? 'title.activity starter' : 'title.activity application'
+                  )
                 }
               )
               popup.onclosed = () => {
@@ -153,16 +157,16 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
           width: 240
         },
         {
-          type: 'string',
-          name: 'activityType',
+          type: 'select',
+          name: 'startingType',
           label: true,
-          header: i18next.t('field.activity-type'),
+          header: i18next.t('field.starting-type'),
+          record: {
+            editable: false,
+            options: ActivityStartingTypes
+          },
           sortable: true,
-          // filter: {
-          //   type: 'select',
-          //   options: ActivityTypes
-          // },
-          width: 100
+          width: 80
         },
         {
           type: 'resource-object',
@@ -215,6 +219,7 @@ export class StarterListPage extends connect(store)(localize(i18next)(PageView))
               activityType
               priority
               thumbnail
+              startingType
               updater {
                 id
                 name

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

@@ -117,9 +117,10 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
         margin: 0;
         padding: 0;
         opacity: 0.8;
+        margin-top: auto;
       }
 
-      textarea {
+      div[comment] textarea {
         flex: 1;
         padding: 10px;
         resize: none;
@@ -145,19 +146,19 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
         : [
             {
               title: i18next.t('button.reject'),
-              action: this._rejectActivityApproval.bind(this),
+              action: this.rejectActivityApproval.bind(this),
               ...CommonButtonStyles.play
             },
 
             {
               title: i18next.t('button.approve'),
-              action: this._approveActivityApproval.bind(this),
+              action: this.approveActivityApproval.bind(this),
               ...CommonButtonStyles.save
             },
 
             {
               title: i18next.t('button.save'),
-              action: this._saveActivityApproval.bind(this),
+              action: this.saveActivityApproval.bind(this),
               ...CommonButtonStyles.save
             }
           ],
@@ -210,7 +211,8 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
       .map(item => {
         return {
           ...item,
-          label: item.name
+          label: item.name,
+          property: item.options
         }
       })
   }
@@ -223,7 +225,8 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
       .map(item => {
         return {
           ...item,
-          label: item.name
+          label: item.name,
+          property: item.options
         }
       })
   }
@@ -348,7 +351,7 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
     this.updateContext()
   }
 
-  async _rejectActivityApproval() {
+  async rejectActivityApproval() {
     var { id, comment } = this.activityApproval
 
     const response = await client.mutate({
@@ -365,6 +368,9 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
 
     if (!response.errors) {
       this.activityApproval = response.data.rejectActivityApproval
+      this.activityThread = this.activityApproval.activityThread
+
+      this.updateContext()
 
       document.dispatchEvent(
         new CustomEvent('notify', {
@@ -376,7 +382,7 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
     }
   }
 
-  async _approveActivityApproval() {
+  async approveActivityApproval() {
     var { id, comment } = this.activityApproval
 
     const response = await client.mutate({
@@ -393,6 +399,9 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
 
     if (!response.errors) {
       this.activityApproval = response.data.approveActivityApproval
+      this.activityThread = this.activityApproval.activityThread
+
+      this.updateContext()
 
       document.dispatchEvent(
         new CustomEvent('notify', {
@@ -404,7 +413,7 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
     }
   }
 
-  async _saveActivityApproval() {
+  async saveActivityApproval() {
     var { id, comment } = this.activityApproval
 
     const response = await client.mutate({
@@ -421,6 +430,9 @@ export class ActivityApprovalPage extends connect(store)(localize(i18next)(PageV
 
     if (!response.errors) {
       this.activityApproval = response.data.saveActivityApproval
+      this.activityThread = this.activityApproval.activityThread
+
+      this.updateContext()
 
       document.dispatchEvent(
         new CustomEvent('notify', {

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

@@ -6,15 +6,7 @@ import { css, html } from 'lit'
 import { customElement, property, query, state } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin'
 
-import {
-  getEditor,
-  getRenderer,
-  ColumnConfig,
-  DataGrist,
-  FetchOption,
-  SortersControl,
-  GristRecord
-} from '@operato/data-grist'
+import { DataGrist, FetchOption, GristRecord } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
 import { openPopup } from '@operato/layout'
@@ -81,12 +73,7 @@ export class ActivityInstanceSearchPage extends connect(store)(localize(i18next)
     const mode = this.mode || (isMobileDevice() ? 'LIST' : 'GRID')
 
     return html`
-      <ox-grist
-        .mode=${mode}
-        .config=${this.gristConfig}
-        .fetchHandler=${this.fetchHandler.bind(this)}
-        ?url-params-sensitive=${this.active}
-      >
+      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
         <div slot="headroom">
           <div id="filters">
             <ox-filters-form autofocus without-search></ox-filters-form>
@@ -152,8 +139,6 @@ export class ActivityInstanceSearchPage extends connect(store)(localize(i18next)
       this.activity = response.data.activity
       this.searchKeys = this.activity?.searchKeys
       this.refreshGristConfig()
-
-      this.grist.fetch()
     }
   }
 
@@ -177,8 +162,6 @@ export class ActivityInstanceSearchPage extends connect(store)(localize(i18next)
   }
 
   refreshGristConfig() {
-    const today = new Date().toISOString().split('T')[0]
-
     this.gristConfig = {
       list: {
         fields: ['name', 'description'],