scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-05 04:03:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7663 from aignatov-bio/ai-sci-10808-exclude-default-columns-from-automapping

Browse source 
Exclude default columns from mapping [SCI-10808]
This commit is contained in:
ajugo 2024-06-27 10:43:49 +02:00 committed by GitHub
commit 9a05c154d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
View file

@ -24,7 +24,7 @@
:size="'sm'"
class="max-w-96"
:class="{
'outline-sn-alert-brittlebush outline-1 outline rounded': matchNotFound
'outline-sn-alert-brittlebush outline-1 outline rounded': computeMatchNotFound
}"
:placeholder="computeMatchNotFound ?
i18n.t('repositories.import_records.steps.step2.table.tableRow.placeholders.matchNotFound') :
@ -52,7 +52,7 @@
<i v-if="differentMapingName" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.importedColumnTitle')"
class="sn-icon sn-icon-info text-sn-science-blue"></i>
<i v-else-if="columnMapped" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.importedColumnTitle')" class="sn-icon sn-icon-check"></i>
<i v-else-if="matchNotFound" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.matchNotFoundColumnTitle')"
<i v-else-if="matchNotFound && !isSystemColumn(item)" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.matchNotFoundColumnTitle')"
class="sn-icon sn-icon-close text-sn-alert-brittlebush"></i>
<i v-else :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.doNotImportColumnTitle')" class="sn-icon sn-icon-close text-sn-sleepy-grey"></i>
</div>
@ -101,6 +101,16 @@ export default {
type: 'Text',
name: ''
},
systemColumns: [
this.i18n.t('repositories.import_records.steps.step2.systemColumns.added_by'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.created_on'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.updated_by'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.updated_on'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.archived_by'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.archived_on'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.parents'),
this.i18n.t('repositories.import_records.steps.step2.systemColumns.children')
],
newColumnTypes: [
['Text', this.i18n.t('repositories.import_records.steps.step2.table.tableRow.newColumnType.text')],
['List', this.i18n.t('repositories.import_records.steps.step2.table.tableRow.newColumnType.list')]
@ -123,7 +133,7 @@ export default {
},
computed: {
computeMatchNotFound() {
return this.autoMapping && ((this.selectedColumnType && !this.selectedColumnType.key) || !this.selectedColumnType);
return this.autoMapping && !this.isSystemColumn(this.item) && ((this.selectedColumnType && !this.selectedColumnType.key) || !this.selectedColumnType);
},
selected() {
return !!this.value?.key;
@ -139,6 +149,9 @@ export default {
}
},
methods: {
isSystemColumn(column) {
return this.systemColumns.includes(column);
},
autoMap() {
Object.entries(this.params.import_data.available_fields).forEach(([key, value]) => {
if (this.item === value) {

9
config/locales/en.yml
View file

@ -2228,6 +2228,15 @@ en:
cancelBtnText: 'Cancel'
confirmBtnText: 'Confirm'
importedIgnoredSection: '<b>%{imported}</b> columns to <b>import.</b> <b>%{ignored}</b> columns <b>ignored.</b>'
systemColumns:
added_by: 'Added by'
created_on: 'Created on'
updated_by: 'Updated by'
updated_on: 'Updated on'
archived_by: 'Archived by'
archived_on: 'Archived on'
parents: 'Parents'
children: 'Children'
computedDropdownOptions:
name: 'Name'
id: 'ID'