@things-factory/setting-ui 4.3.109-alpha.0 → 4.3.111

package/client/pages/partner-setting-list.js

@@ -93,7 +93,12 @@ export class PartnerSettingList extends connect(store)(localize(i18next)(PageVie
   }
 
   pageInitialized() {
-    this.searchFields = []
+    this.searchFields = [
+      { name: 'name', label: i18next.t('field.name'), type: 'text', props: { searchOper: 'i_like' } },
+      { name: 'description', label: i18next.t('field.description'), type: 'text', props: { searchOper: 'i_like' } },
+      { name: 'category', label: i18next.t('field.category'), type: 'text', props: { searchOper: 'i_like' } }
+    ]
+
     this.config = {
       list: {
         fields: ['name', 'description', 'value']
@@ -245,14 +250,7 @@ export class PartnerSettingList extends connect(store)(localize(i18next)(PageVie
       context: gqlContext()
     })
 
-    let res = response.data.partnerSettings.items.map(data => {
-      return {
-        ...data,
-        category: data.setting.category,
-        description: data.setting.description
-      }
-    })
-    return { records: res || [], total: response.data.partnerSettings.total || 0 }
+    return { records: response.data.partnerSettings.items || [], total: response.data.partnerSettings.total || 0 }
   }
 
   async save() {

package/client/pages/setting-list.js

@@ -8,9 +8,6 @@ import gql from 'graphql-tag'
 import { css, html } from 'lit'
 import { connect } from 'pwa-helpers/connect-mixin'
 import { CommonButtonStyles } from '../../../styles/src'
-import { openImportPopUp } from '@things-factory/import-ui'
-import _ from 'lodash'
-import isEmpty from 'lodash-es/isEmpty'
 
 export class SettingList extends connect(store)(localize(i18next)(PageView)) {
   static get styles() {
@@ -65,7 +62,7 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
       actions: [
         {
           title: i18next.t('button.save'),
-          action: () => this._saveSettings(this.dataGrist.exportPatchList({ flagName: 'cuFlag' })),
+          action: this._saveSettings.bind(this),
           ...CommonButtonStyles.save
         },
         {
@@ -79,26 +76,7 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
         data: this._exportableData.bind(this)
       },
       importable: {
-        handler: records => {
-          const config = {
-            rows: this.config.rows,
-            columns: [...this.config.columns.filter(column => column.imex !== undefined)]
-          }
-          openImportPopUp(records, config, async patches => {
-            try {
-              patches = patches.map(patch => {
-                if (!patch?.id) delete patch.id
-
-                return patch
-              })
-              this._validateImport(patches)
-              await this._saveSettings(patches)
-              history.back()
-            } catch (e) {
-              this.showToast(e.message)
-            }
-          })
-        }
+        handler: () => {}
       }
     }
   }
@@ -143,13 +121,7 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             header: i18next.t('field.name'),
             record: { editable: true, align: 'left' },
             sortable: true,
-            width: 100,
-            imex: {
-              header: i18next.t('field.name'),
-              key: 'name',
-              width: 50,
-              type: 'string'
-            }
+            width: 100
           },
           {
             type: 'string',
@@ -157,13 +129,7 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             header: i18next.t('field.description'),
             record: { editable: true, align: 'left' },
             sortable: true,
-            width: 200,
-            imex: {
-              header: i18next.t('field.description'),
-              key: 'description',
-              width: 50,
-              type: 'string'
-            }
+            width: 200
           },
           {
             type: 'code',
@@ -171,13 +137,7 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             header: i18next.t('field.category'),
             record: { editable: true, codeName: 'SETTING_CATEGORIES' },
             sortable: true,
-            width: 150,
-            imex: {
-              header: i18next.t('field.category'),
-              key: 'category',
-              width: 30,
-              type: 'code'
-            }
+            width: 150
           },
           {
             type: 'string',
@@ -193,28 +153,15 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
               editable: true
             },
             sortable: true,
-            width: 180,
-            imex: {
-              header: i18next.t('field.value'),
-              key: 'value',
-              width: 40,
-              type: 'string'
-            }
+            width: 180
           },
           {
-            type: 'date',
+            type: 'datetime',
             name: 'updatedAt',
             header: i18next.t('field.updated_at'),
             record: { editable: false, align: 'left' },
             sortable: true,
             width: 150
-            // imex:
-            // {
-            //   header: i18next.t('field.updated_at'),
-            //   key: 'updatedAt',
-            //   width: 20,
-            //   type: 'date'
-            // }
           },
           {
             type: 'object',
@@ -223,13 +170,6 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             record: { editable: false, align: 'left' },
             sortable: true,
             width: 150
-            // imex:
-            // {
-            //   header: i18next.t('field.updater'),
-            //   key: 'updater.name',
-            //   width: 30,
-            //   type: 'object'
-            // }
           }
         ]
       }
@@ -280,55 +220,47 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _saveSettings(patches) {
-    try {
-      if (!patches?.length) {
-        return this.showToast(i18next.t('text.nothing_changed'))
-      }
-
-      this._validate()
-
-      const response = await client.mutate({
-        mutation: gql`
-          mutation updateMultipleSetting($patches: [SettingPatch!]!) {
-            updateMultipleSetting(patches: $patches) {
-              name
-            }
-          }
-        `,
-        variables: { patches },
-        context: gqlContext()
-      })
+  async _saveSettings() {
+    let patches = this.dataGrist.dirtyRecords
 
-      if (!response.errors) {
-        this.showToast(i18next.t('text.data_updated_successfully'))
-        this.dataGrist.fetch()
-      }
-    } catch (error) {
-      this.showToast(error.message)
+    if (!patches?.length) {
+      return this.showToast(i18next.t('text.nothing_changed'))
     }
-  }
 
-  _validate() {
-    let errors = []
+    patches = patches.map(setting => {
+      let patchField = setting.id ? { id: setting.id } : {}
+      const dirtyFields = setting.__dirtyfields__
+      for (let key in dirtyFields) {
+        patchField[key] = dirtyFields[key].after
+      }
+      patchField.cuFlag = setting.__dirty__
 
-    let data = this.dataGrist._data.records.map(itm => {
-      itm.error = false
+      return patchField
+    })
 
-      if (isEmpty(itm.name) || '') {
-        itm.error = true
-        if (!errors.find(err => err.type == 'name')) errors.push({ type: 'name', value: 'Name is required' })
-      }
-      return itm
+    let checkValidation = true
+    patches.forEach(patch => {
+      if (patch.cuFlag === '+' && (!patch.name || !patch.category)) return (checkValidation = false)
     })
 
-    if (errors.length > 0) {
-      this._data = {
-        ...this.dataGrist.dirtyData,
-        records: data
-      }
+    if (!checkValidation) return this.showToast(i18next.t('error.value is empty', { value: 'name or category' }))
+
+    const response = await client.mutate({
+      mutation: gql`
+        mutation updateMultipleSetting($patches: [SettingPatch!]!) {
+          updateMultipleSetting(patches: $patches) {
+            name
+          }
+        }
+      `,
+      variables: { patches },
+      context: gqlContext()
+    })
 
-      throw new Error(errors.map(itm => itm.value).join(', '))
+    if (!response.errors) {
+      this.showToast(i18next.t('text.data_updated_successfully'))
+      this.dataGrist.fetch()
+      this.applyRefreshHandlers()
     }
   }
 
@@ -374,70 +306,8 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
     this.refreshHandlers.forEach(refreshHandler => refreshHandler())
   }
 
-  async _exportableData() {
-    let records = []
-    if (this.dataGrist.selected && this.dataGrist.selected.length > 0) {
-      records = this.dataGrist.selected
-    } else {
-      records = (await this.fetchHandler({ page: 0, limit: 999999 })).records || []
-    }
-
-    var headerSetting = this.dataGrist._config.columns
-      .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
-      .map(column => {
-        return column.imex
-      })
-
-    var data = records.map(item => {
-      return {
-        id: item.id,
-        ...this.config.columns
-          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
-          .reduce((record, column) => {
-            record[column.imex.key] = column.imex.key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
-            return record
-          }, {})
-      }
-    })
-    return { header: headerSetting, data: data }
-  }
-
-  _validateImport(data) {
-    let errors = []
-
-    data = data.map(item => {
-      if (_.isEmpty(item.name) || '') {
-        if (!errors.find(error => error.type == 'name')) {
-          errors.push({ type: 'name', value: 'Name is required' })
-        }
-      }
-
-      if (_.isEmpty(item.description) || '') {
-        if (!errors.find(error => error.type == 'description')) {
-          errors.push({ type: 'description', value: 'Description is required' })
-        }
-      }
-
-      if (_.isEmpty(item.category) || '') {
-        if (!errors.find(error => error.type == 'category')) {
-          errors.push({ type: 'category', value: 'Category is required' })
-        }
-      }
-
-      if (_.isEmpty(item.value) || '') {
-        if (!errors.find(error => error.type == 'value')) {
-          errors.push({ type: 'value', value: 'Value is required' })
-        }
-      }
-
-      return item
-    })
-
-    if (errors.length > 0) {
-      throw new Error(`${errors.map(item => item.value).join(', ')}`)
-    }
+  _exportableData() {
+    return this.dataGrist.exportRecords()
   }
 
   stateChanged(state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/setting-ui",
-  "version": "4.3.109-alpha.0",
+  "version": "4.3.111",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,14 +25,14 @@
   },
   "dependencies": {
     "@material/mwc-button": "^0.25.3",
-    "@things-factory/form-ui": "^4.3.109-alpha.0",
-    "@things-factory/grist-ui": "^4.3.109-alpha.0",
-    "@things-factory/i18n-base": "^4.3.109-alpha.0",
-    "@things-factory/layout-base": "^4.3.109-alpha.0",
-    "@things-factory/more-base": "^4.3.109-alpha.0",
-    "@things-factory/setting-base": "^4.3.109-alpha.0",
-    "@things-factory/styles": "^4.3.109-alpha.0",
-    "@things-factory/utils": "^4.3.109-alpha.0"
+    "@things-factory/form-ui": "^4.3.111",
+    "@things-factory/grist-ui": "^4.3.111",
+    "@things-factory/i18n-base": "^4.3.111",
+    "@things-factory/layout-base": "^4.3.111",
+    "@things-factory/more-base": "^4.3.111",
+    "@things-factory/setting-base": "^4.3.111",
+    "@things-factory/styles": "^4.3.111",
+    "@things-factory/utils": "^4.3.111"
   },
-  "gitHead": "a4e928b10c5db079df6e2a9ece616de77625ed0a"
+  "gitHead": "71a701731b643b32dd78334647dbcc287519aa1d"
 }