Browse Source

fix: column validation logic

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
pull/1137/head
Wing-Kam Wong 3 years ago
parent
commit
9b4172361f
  1. 22
      packages/nc-gui/components/project/spreadsheet/components/importExport/columnMappingModal.vue

22
packages/nc-gui/components/project/spreadsheet/components/importExport/columnMappingModal.vue

@ -7,7 +7,11 @@
</v-card-title> </v-card-title>
<v-spacer /> <v-spacer />
<v-btn <v-btn
:disabled="!valid || requiredColumnValidationError" :disabled="
!valid ||
(typeof requiredColumnValidationError === 'string' || requiredColumnValidationError) ||
(typeof noSelectedColumnError === 'string' || noSelectedColumnError)
"
color="primary" color="primary"
large large
@click="$emit('import',mappings)" @click="$emit('import',mappings)"
@ -21,6 +25,9 @@
<div v-if="requiredColumnValidationError" class="error--text caption pa-2 text-center"> <div v-if="requiredColumnValidationError" class="error--text caption pa-2 text-center">
{{ requiredColumnValidationError }} {{ requiredColumnValidationError }}
</div> </div>
<div v-if="noSelectedColumnError" class="error--text caption pa-2 text-center">
{{ noSelectedColumnError }}
</div>
<v-divider /> <v-divider />
<v-container fluid> <v-container fluid>
<v-form ref="form" v-model="valid"> <v-form ref="form" v-model="valid">
@ -39,7 +46,7 @@
<tbody> <tbody>
<tr v-for="(r,i) in mappings" :key="i"> <tr v-for="(r,i) in mappings" :key="i">
<td> <td>
<v-checkbox v-model="r.enabled" class="mt-0" dense hide-details /> <v-checkbox v-model="r.enabled" class="mt-0" dense hide-details @change="$refs.form.validate()"/>
</td> </td>
<td class="caption" style="width:45%"> <td class="caption" style="width:45%">
<div :title="r.sourceCn" style=""> <div :title="r.sourceCn" style="">
@ -117,6 +124,12 @@ export default {
return `Following columns are required : ${missingRequiredColumns.map(c => c._cn).join(', ')}` return `Following columns are required : ${missingRequiredColumns.map(c => c._cn).join(', ')}`
} }
return false return false
},
noSelectedColumnError() {
if ((this.mappings || []).filter(v => v.enabled === true).length == 0) {
return 'At least one column has to be selected'
}
return false
} }
}, },
mounted() { mounted() {
@ -129,6 +142,11 @@ export default {
return true return true
} }
// if it is not selected, then pass validation
if (!row.enabled) {
return true
}
const v = this.meta && this.meta.columns.find(c => c._cn === _cn) const v = this.meta && this.meta.columns.find(c => c._cn === _cn)
if ((this.mappings || []).filter(v => v.destCn === _cn).length > 1) { return 'Duplicate mapping found, please remove one of the mapping' } if ((this.mappings || []).filter(v => v.destCn === _cn).length > 1) { return 'Duplicate mapping found, please remove one of the mapping' }

Loading…
Cancel
Save