mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⚡ Copy tweaks (#2780)

Browse Source 
* Update en.json

* More copy tweaks and addressed PR comments

* 🔥 Remove empty strings from base text

* ⚡ Adjust `$showMessage` signature type

* 🔥 Remove message from Vue components

* ✏️ Fix typo

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
This commit is contained in:
sirdavidoff
2022-02-18 16:26:44 +01:00
committed by GitHub
parent c026642f7b
commit 68c356c17c
16 changed files with 105 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
View File

@@ -456,7 +456,6 @@ export default mixins(showMessage, nodeHelpers).extend({
this.$showError(
error,
this.$locale.baseText('credentialEdit.credentialEdit.showError.loadCredential.title'),
this.$locale.baseText('credentialEdit.credentialEdit.showError.loadCredential.message'),
);
this.closeDialog();
@@ -658,7 +657,6 @@ export default mixins(showMessage, nodeHelpers).extend({
this.$showError(
error,
this.$locale.baseText('credentialEdit.credentialEdit.showError.createCredential.title'),
this.$locale.baseText('credentialEdit.credentialEdit.showError.createCredential.message'),
);
return null;
@@ -687,7 +685,6 @@ export default mixins(showMessage, nodeHelpers).extend({
this.$showError(
error,
this.$locale.baseText('credentialEdit.credentialEdit.showError.updateCredential.title'),
this.$locale.baseText('credentialEdit.credentialEdit.showError.updateCredential.message'),
);
return null;
@@ -728,7 +725,6 @@ export default mixins(showMessage, nodeHelpers).extend({
this.$showError(
error,
this.$locale.baseText('credentialEdit.credentialEdit.showError.deleteCredential.title'),
this.$locale.baseText('credentialEdit.credentialEdit.showError.deleteCredential.message'),
);
this.isDeleting = false;
@@ -741,10 +737,6 @@ export default mixins(showMessage, nodeHelpers).extend({
this.$showMessage({
title: this.$locale.baseText('credentialEdit.credentialEdit.showMessage.title'),
message: this.$locale.baseText(
'credentialEdit.credentialEdit.showMessage.message',
{ interpolate: { savedCredentialName } },
),
type: 'success',
});
this.closeDialog();

5
packages/editor-ui/src/components/CredentialsList.vue
View File

@@ -124,7 +124,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('credentialsList.showError.deleteCredential.title'),
this.$locale.baseText('credentialsList.showError.deleteCredential.message'),
);
return;
@@ -135,10 +134,6 @@ export default mixins(
this.$showMessage({
title: this.$locale.baseText('credentialsList.showMessage.title'),
message: this.$locale.baseText(
'credentialsList.showMessage.message',
{ interpolate: { credentialName: credential.name }},
),
type: 'success',
});
},

1
packages/editor-ui/src/components/Error/NodeErrorView.vue
View File

@@ -104,7 +104,6 @@ export default mixins(
copySuccess() {
this.$showMessage({
title: this.$locale.baseText('nodeErrorView.showMessage.title'),
message: this.$locale.baseText('nodeErrorView.showMessage.message'),
type: 'info',
});
},

9
packages/editor-ui/src/components/ExecutionsList.vue
View File

@@ -409,7 +409,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('executionsList.showError.handleDeleteSelected.title'),
this.$locale.baseText('executionsList.showError.handleDeleteSelected.message'),
);
return;
@@ -418,7 +417,6 @@ export default mixins(
this.$showMessage({
title: this.$locale.baseText('executionsList.showMessage.handleDeleteSelected.title'),
message: this.$locale.baseText('executionsList.showMessage.handleDeleteSelected.message'),
type: 'success',
});
@@ -572,7 +570,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('executionsList.showError.loadMore.title'),
this.$locale.baseText('executionsList.showError.loadMore.message') + ':',
);
return;
}
@@ -612,7 +609,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('executionsList.showError.loadWorkflows.title'),
this.$locale.baseText('executionsList.showError.loadWorkflows.message') + ':',
);
}
},
@@ -625,13 +621,11 @@ export default mixins(
if (retrySuccessful === true) {
this.$showMessage({
title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulTrue.title'),
message: this.$locale.baseText('executionsList.showMessage.retrySuccessfulTrue.message'),
type: 'success',
});
} else {
this.$showMessage({
title: this.$locale.baseText('executionsList.showMessage.retrySuccessfulFalse.title'),
message: this.$locale.baseText('executionsList.showMessage.retrySuccessfulFalse.message'),
type: 'error',
});
}
@@ -641,7 +635,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('executionsList.showError.retryExecution.title'),
this.$locale.baseText('executionsList.showError.retryExecution.message'),
);
this.isDataLoading = false;
@@ -658,7 +651,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('executionsList.showError.refreshData.title'),
this.$locale.baseText('executionsList.showError.refreshData.message') + ':',
);
}
@@ -731,7 +723,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('executionsList.showError.stopExecution.title'),
this.$locale.baseText('executionsList.showError.stopExecution.message'),
);
}
},

12
packages/editor-ui/src/components/MainSidebar.vue
View File

@@ -318,17 +318,12 @@ export default mixins(
await this.restApi().stopCurrentExecution(executionId);
this.$showMessage({
title: this.$locale.baseText('mainSidebar.showMessage.stopExecution.title'),
message: this.$locale.baseText(
'mainSidebar.showMessage.stopExecution.message',
{ interpolate: { executionId }},
),
type: 'success',
});
} catch (error) {
this.$showError(
error,
this.$locale.baseText('mainSidebar.showError.stopExecution.title'),
this.$locale.baseText('mainSidebar.showError.stopExecution.message') + ':',
);
}
this.stopExecutionInProgress = false;
@@ -411,7 +406,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('mainSidebar.showError.stopExecution.title'),
this.$locale.baseText('mainSidebar.showError.stopExecution.message') + ':',
);
return;
}
@@ -420,10 +414,6 @@ export default mixins(
this.$titleReset();
this.$showMessage({
title: this.$locale.baseText('mainSidebar.showMessage.handleSelect1.title'),
message: this.$locale.baseText(
'mainSidebar.showMessage.handleSelect1.message',
{ interpolate: { workflowName: this.workflowName }},
),
type: 'success',
});
@@ -476,7 +466,6 @@ export default mixins(
this.$showMessage({
title: this.$locale.baseText('mainSidebar.showMessage.handleSelect2.title'),
message: this.$locale.baseText('mainSidebar.showMessage.handleSelect2.message'),
type: 'success',
});
}
@@ -487,7 +476,6 @@ export default mixins(
this.$showMessage({
title: this.$locale.baseText('mainSidebar.showMessage.handleSelect3.title'),
message: this.$locale.baseText('mainSidebar.showMessage.handleSelect3.message'),
type: 'success',
});
}

1
packages/editor-ui/src/components/NodeWebhooks.vue
View File

@@ -84,7 +84,6 @@ export default mixins(
this.$showMessage({
title: this.$locale.baseText('nodeWebhooks.showMessage.title'),
message: this.$locale.baseText('nodeWebhooks.showMessage.message'),
type: 'success',
});
},

12
packages/editor-ui/src/components/TagsManager/TagsManager.vue
View File

@@ -127,15 +127,8 @@ export default mixins(showMessage).extend({
const updatedTag = await this.$store.dispatch("tags/rename", { id, name });
cb(!!updatedTag);
const escapedName = escape(name);
const escapedOldName = escape(oldName);
this.$showMessage({
title: this.$locale.baseText('tagsManager.showMessage.onUpdate.title'),
message: this.$locale.baseText(
'tagsManager.showMessage.onUpdate.message',
{ interpolate: { escapedName, escapedOldName } },
),
type: "success",
});
} catch (error) {
@@ -168,13 +161,8 @@ export default mixins(showMessage).extend({
cb(deleted);
const escapedName = escape(name);
this.$showMessage({
title: this.$locale.baseText('tagsManager.showMessage.onDelete.title'),
message: this.$locale.baseText(
'tagsManager.showMessage.onDelete.message',
{ interpolate: { escapedName } },
),
type: "success",
});
} catch (error) {

3
packages/editor-ui/src/components/WorkflowActivator.vue
View File

@@ -125,9 +125,8 @@ export default mixins(
const newStateName = newActiveState === true ? 'activated' : 'deactivated';
this.$showError(
error,
this.$locale.baseText('workflowActivator.showError.title'),
this.$locale.baseText(
'workflowActivator.showError.message',
'workflowActivator.showError.title',
{ interpolate: { newStateName } },
) + ':',
);

1
packages/editor-ui/src/components/WorkflowOpen.vue
View File

@@ -205,7 +205,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('workflowOpen.showError.title'),
this.$locale.baseText('workflowOpen.showError.message') + ':',
);
this.isDataLoading = false;
},

2
packages/editor-ui/src/components/WorkflowSettings.vue
View File

@@ -523,7 +523,6 @@ export default mixins(
this.$showError(
error,
this.$locale.baseText('workflowSettings.showError.saveSettings3.title'),
this.$locale.baseText('workflowSettings.showError.saveSettings3.message') + ':',
);
this.isLoading = false;
return;
@@ -545,7 +544,6 @@ export default mixins(
this.$showMessage({
title: this.$locale.baseText('workflowSettings.showMessage.saveSettings.title'),
message: this.$locale.baseText('workflowSettings.showMessage.saveSettings.message'),
type: 'success',
});

1
packages/editor-ui/src/components/mixins/pushConnection.ts
View File

@@ -264,7 +264,6 @@ export const pushConnection = mixins(
this.$titleSet(workflow.name as string, 'IDLE');
this.$showMessage({
title: this.$locale.baseText('pushConnection.showMessage.title'),
message: this.$locale.baseText('pushConnection.showMessage.message'),
type: 'success',
});
}

7
packages/editor-ui/src/components/mixins/showMessage.ts
View File

@@ -12,13 +12,16 @@ let stickyNotificationQueue: ElNotificationComponent[] = [];
export const showMessage = mixins(externalHooks).extend({
methods: {
$showMessage(messageData: ElNotificationOptions, track = true) {
$showMessage(
messageData: Omit<ElNotificationOptions, 'message'> & { message?: string },
track = true,
) {
messageData.dangerouslyUseHTMLString = true;
if (messageData.position === undefined) {
messageData.position = 'bottom-right';
}
const notification = this.$notify(messageData);
const notification = this.$notify(messageData as ElNotificationOptions);
if (messageData.duration === 0) {
stickyNotificationQueue.push(notification);

4
packages/editor-ui/src/components/mixins/workflowHelpers.ts
View File

@@ -500,12 +500,12 @@ export const workflowHelpers = mixins(
this.$externalHooks().run('workflow.afterUpdate', { workflowData });
return true;
} catch (e) {
} catch (error) {
this.$store.commit('removeActiveAction', 'workflowSaving');
this.$showMessage({
title: this.$locale.baseText('workflowHelpers.showMessage.title'),
message: this.$locale.baseText('workflowHelpers.showMessage.message') + `"${e.message}"`,
message: error.message,
type: 'error',
});

1
packages/editor-ui/src/components/mixins/workflowRun.ts
View File

@@ -205,7 +205,6 @@ export const workflowRun = mixins(
this.$showError(
error,
this.$locale.baseText('workflowRun.showError.title'),
this.$locale.baseText('workflowRun.showError.message'),
);
return undefined;
}