@things-factory/setting-ui 4.3.123 → 4.3.138

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

@@ -93,12 +93,7 @@ export class PartnerSettingList extends connect(store)(localize(i18next)(PageVie
   }
 
   pageInitialized() {
-    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.searchFields = []
     this.config = {
       list: {
         fields: ['name', 'description', 'value']
@@ -250,7 +245,14 @@ export class PartnerSettingList extends connect(store)(localize(i18next)(PageVie
       context: gqlContext()
     })
 
-    return { records: response.data.partnerSettings.items || [], total: response.data.partnerSettings.total || 0 }
+    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 }
   }
 
   async save() {

package/client/pages/setting-list.js

@@ -8,6 +8,9 @@ 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() {
@@ -62,7 +65,7 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
       actions: [
         {
           title: i18next.t('button.save'),
-          action: this._saveSettings.bind(this),
+          action: () => this._saveSettings(this.dataGrist.exportPatchList({ flagName: 'cuFlag' })),
           ...CommonButtonStyles.save
         },
         {
@@ -76,7 +79,26 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
         data: this._exportableData.bind(this)
       },
       importable: {
-        handler: () => {}
+        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)
+            }
+          })
+        }
       }
     }
   }
@@ -121,7 +143,13 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             header: i18next.t('field.name'),
             record: { editable: true, align: 'left' },
             sortable: true,
-            width: 100
+            width: 100,
+            imex: {
+              header: i18next.t('field.name'),
+              key: 'name',
+              width: 50,
+              type: 'string'
+            }
           },
           {
             type: 'string',
@@ -129,7 +157,13 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             header: i18next.t('field.description'),
             record: { editable: true, align: 'left' },
             sortable: true,
-            width: 200
+            width: 200,
+            imex: {
+              header: i18next.t('field.description'),
+              key: 'description',
+              width: 50,
+              type: 'string'
+            }
           },
           {
             type: 'code',
@@ -137,7 +171,13 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
             header: i18next.t('field.category'),
             record: { editable: true, codeName: 'SETTING_CATEGORIES' },
             sortable: true,
-            width: 150
+            width: 150,
+            imex: {
+              header: i18next.t('field.category'),
+              key: 'category',
+              width: 30,
+              type: 'code'
+            }
           },
           {
             type: 'string',
@@ -153,15 +193,28 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
               editable: true
             },
             sortable: true,
-            width: 180
+            width: 180,
+            imex: {
+              header: i18next.t('field.value'),
+              key: 'value',
+              width: 40,
+              type: 'string'
+            }
           },
           {
-            type: 'datetime',
+            type: 'date',
             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',
@@ -170,6 +223,13 @@ 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'
+            // }
           }
         ]
       }
@@ -220,47 +280,55 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
-  async _saveSettings() {
-    let patches = this.dataGrist.dirtyRecords
+  async _saveSettings(patches) {
+    try {
+      if (!patches?.length) {
+        return this.showToast(i18next.t('text.nothing_changed'))
+      }
 
-    if (!patches?.length) {
-      return this.showToast(i18next.t('text.nothing_changed'))
-    }
+      this._validate()
 
-    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__
+      const response = await client.mutate({
+        mutation: gql`
+          mutation updateMultipleSetting($patches: [SettingPatch!]!) {
+            updateMultipleSetting(patches: $patches) {
+              name
+            }
+          }
+        `,
+        variables: { patches },
+        context: gqlContext()
+      })
 
-      return patchField
-    })
+      if (!response.errors) {
+        this.showToast(i18next.t('text.data_updated_successfully'))
+        this.dataGrist.fetch()
+      }
+    } catch (error) {
+      this.showToast(error.message)
+    }
+  }
 
-    let checkValidation = true
-    patches.forEach(patch => {
-      if (patch.cuFlag === '+' && (!patch.name || !patch.category)) return (checkValidation = false)
-    })
+  _validate() {
+    let errors = []
 
-    if (!checkValidation) return this.showToast(i18next.t('error.value is empty', { value: 'name or category' }))
+    let data = this.dataGrist._data.records.map(itm => {
+      itm.error = false
 
-    const response = await client.mutate({
-      mutation: gql`
-        mutation updateMultipleSetting($patches: [SettingPatch!]!) {
-          updateMultipleSetting(patches: $patches) {
-            name
-          }
-        }
-      `,
-      variables: { patches },
-      context: gqlContext()
+      if (isEmpty(itm.name) || '') {
+        itm.error = true
+        if (!errors.find(err => err.type == 'name')) errors.push({ type: 'name', value: 'Name is required' })
+      }
+      return itm
     })
 
-    if (!response.errors) {
-      this.showToast(i18next.t('text.data_updated_successfully'))
-      this.dataGrist.fetch()
-      this.applyRefreshHandlers()
+    if (errors.length > 0) {
+      this._data = {
+        ...this.dataGrist.dirtyData,
+        records: data
+      }
+
+      throw new Error(errors.map(itm => itm.value).join(', '))
     }
   }
 
@@ -306,8 +374,70 @@ export class SettingList extends connect(store)(localize(i18next)(PageView)) {
     this.refreshHandlers.forEach(refreshHandler => refreshHandler())
   }
 
-  _exportableData() {
-    return this.dataGrist.exportRecords()
+  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(', ')}`)
+    }
   }
 
   stateChanged(state) {

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@things-factory/setting-ui",
-  "version": "4.3.123",
+  "version": "4.3.138",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
-  "license": "MIT",
   "author": "horwengliang95",
   "description": "User interface for providing setting options",
   "publishConfig": {
@@ -25,14 +24,14 @@
   },
   "dependencies": {
     "@material/mwc-button": "^0.25.3",
-    "@things-factory/form-ui": "^4.3.122",
-    "@things-factory/grist-ui": "^4.3.123",
-    "@things-factory/i18n-base": "^4.3.122",
-    "@things-factory/layout-base": "^4.3.122",
-    "@things-factory/more-base": "^4.3.122",
-    "@things-factory/setting-base": "^4.3.122",
-    "@things-factory/styles": "^4.3.122",
-    "@things-factory/utils": "^4.3.122"
+    "@things-factory/form-ui": "^4.3.131",
+    "@things-factory/grist-ui": "^4.3.138",
+    "@things-factory/i18n-base": "^4.3.131",
+    "@things-factory/layout-base": "^4.3.131",
+    "@things-factory/more-base": "^4.3.131",
+    "@things-factory/setting-base": "^4.3.138",
+    "@things-factory/styles": "^4.3.131",
+    "@things-factory/utils": "^4.3.131"
   },
-  "gitHead": "4b257504bfc8c0a626dd90dc0216abb7ca30d8d3"
+  "gitHead": "1d4e0a3ff6b8792c843b9735a28a3f5fb946b144"
 }

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.