From 0d19f76f2d0bd071f727b3a8ae16db1e5746cbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= Date: Wed, 21 Jun 2023 12:49:59 +0200 Subject: [PATCH] Add alteration params translations --- .../Admin/Module/DalSchemaAlterations.vue | 34 +++++++------------ .../compose/src/views/Admin/Modules/Edit.vue | 7 ++-- locale/en/corteza-webapp-compose/module.yaml | 11 ++++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue b/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue index 8fd1d7a70..cc3d96c5b 100644 --- a/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue +++ b/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue @@ -25,12 +25,6 @@ {{ $t('alteration') }} - - {{ $t('operation') }} - - - {{ a.kind }} - - - {{ stringifyParams(a.params) }} @@ -329,28 +319,28 @@ export default { throw new Error('Unknown alteration type') }, - stringifyAttributeAddParams (params) { - return `Add column ${params.attr.ident} encoded as ${params.attr.store.type} of type ${params.attr.type.type}` + stringifyAttributeAddParams ({ attr = {} }) { + return this.$t('module.schemaAlteration.params.attribute.add', { ident: attr.ident, storeType: attr.store.type, attrType: attr.type.type }) }, - stringifyAttributeDeleteParams (params) { - return `Delete column ${params.attr.ident} encoded as ${params.attr.store.type}` + stringifyAttributeDeleteParams ({ attr = {} }) { + return this.$t('module.schemaAlteration.params.attribute.delete', { ident: attr.ident, storeType: attr.store.type }) }, - stringifyAttributeReTypeParams (params) { - return `Changing type of column ${params.attr.ident} to ${params.to.type}` + stringifyAttributeReTypeParams ({ attr = {}, to = {} }) { + return this.$t('module.schemaAlteration.params.attribute.delete', { ident: attr.ident, toType: to.type }) }, - stringifyAttributeReEncodeParams (params) { - return `Changing encoding of column ${params.attr.ident} to ${params.to.type}` + stringifyAttributeReEncodeParams ({ attr = {}, to = {} }) { + return this.$t('module.schemaAlteration.params.attribute.delete', { ident: attr.ident, toType: to.type }) }, - stringifyModelAddParams (params) { - return `Add schema for model ${params.model.ident}` + stringifyModelAddParams ({ attr = {} }) { + return this.$t('module.schemaAlteration.params.model.add', { ident: attr.ident }) }, - stringifyModelDeleteParams (params) { - return `Delete schema for model ${params.model.ident}` + stringifyModelDeleteParams ({ attr = {} }) { + return this.$t('module.schemaAlteration.params.model.delete', { ident: attr.ident }) }, canDismiss (alteration) { diff --git a/client/web/compose/src/views/Admin/Modules/Edit.vue b/client/web/compose/src/views/Admin/Modules/Edit.vue index 7789fa616..ed03a0bb7 100644 --- a/client/web/compose/src/views/Admin/Modules/Edit.vue +++ b/client/web/compose/src/views/Admin/Modules/Edit.vue @@ -383,6 +383,7 @@ v-if="module.issues.length > 0" :title="$t('edit.issues.label', { count: module.issues.length })" title-link-class="text-danger" + @click="checkAlterations" > { this.hasRecords = (set.length > 0) }) }) } + }, - this.fetchSensitivityLevels() - + checkAlterations () { // Check if module has Alterations to resolve for (const i of this.module.issues) { if (i.meta.batchID) { diff --git a/locale/en/corteza-webapp-compose/module.yaml b/locale/en/corteza-webapp-compose/module.yaml index 92e224d61..4b2593fab 100644 --- a/locale/en/corteza-webapp-compose/module.yaml +++ b/locale/en/corteza-webapp-compose/module.yaml @@ -84,7 +84,6 @@ edit: title: Schema alterations columns: alteration: Alteration - operation: Operation change: Change status: Status resolve: Resolve @@ -93,7 +92,15 @@ edit: dismiss: Dismiss waitingFor: Waiting for {{id}} noAlterations: No schema alterations need to be resolved - + params: + attribute: + add: Add column {{ident}} encoded as {{storeType}} of type {{attrType}} + delete: Delete column {{ident}} encoded as {{storeType}} + reType: Changing type of column {{ident}} to {{toType}} + reEncode: Changing encoding of column {{ident}} to {{toType}} + model: + add: Add schema for model {{ident}} + delete: Delete schema for model {{ident}} config: dal: title: Data store