From cb5b42a2a2c78f55711cc354c4e2ed4061ef1861 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:35:55 -0700 Subject: [PATCH] Call it copy cause thats less weird --- src-ui/messages.xlf | 35 +++++++++---------- .../manage/mail/mail.component.html | 6 ++-- .../manage/mail/mail.component.spec.ts | 6 ++-- .../components/manage/mail/mail.component.ts | 8 ++--- .../manage/workflows/workflows.component.html | 6 ++-- .../workflows/workflows.component.spec.ts | 6 ++-- .../manage/workflows/workflows.component.ts | 6 ++-- 7 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index ae6d80c19..c36aca84b 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -5057,6 +5057,22 @@ src/app/components/common/system-status-dialog/system-status-dialog.component.html 156 + + src/app/components/manage/mail/mail.component.html + 101 + + + src/app/components/manage/mail/mail.component.html + 118 + + + src/app/components/manage/workflows/workflows.component.html + 42 + + + src/app/components/manage/workflows/workflows.component.html + 57 + Regenerate auth token @@ -7476,25 +7492,6 @@ 79 - - Clone - - src/app/components/manage/mail/mail.component.html - 101 - - - src/app/components/manage/mail/mail.component.html - 118 - - - src/app/components/manage/workflows/workflows.component.html - 42 - - - src/app/components/manage/workflows/workflows.component.html - 57 - - No mail rules defined. diff --git a/src-ui/src/app/components/manage/mail/mail.component.html b/src-ui/src/app/components/manage/mail/mail.component.html index 54eca048c..680b4e7ae 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.html +++ b/src-ui/src/app/components/manage/mail/mail.component.html @@ -98,7 +98,7 @@ - + @@ -114,8 +114,8 @@
-
diff --git a/src-ui/src/app/components/manage/mail/mail.component.spec.ts b/src-ui/src/app/components/manage/mail/mail.component.spec.ts index 3cb8d57ae..4a134b880 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.spec.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.spec.ts @@ -226,14 +226,14 @@ describe('MailComponent', () => { component.editMailRule() }) - it('should support clone mail rule', () => { + it('should support copy mail rule', () => { completeSetup() let modal: NgbModalRef modalService.activeInstances.subscribe((refs) => (modal = refs[0])) - component.cloneMailRule(mailRules[0] as MailRule) + component.copyMailRule(mailRules[0] as MailRule) const editDialog = modal.componentInstance as MailRuleEditDialogComponent expect(editDialog.object.id).toBeNull() - expect(editDialog.object.name).toEqual(`${mailRules[0].name} (clone)`) + expect(editDialog.object.name).toEqual(`${mailRules[0].name} (copy)`) expect(editDialog.dialogMode).toEqual(EditDialogMode.CREATE) }) diff --git a/src-ui/src/app/components/manage/mail/mail.component.ts b/src-ui/src/app/components/manage/mail/mail.component.ts index bbd4e292c..5d00b6c13 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.ts @@ -137,13 +137,13 @@ export class MailComponent }) } - editMailRule(rule: MailRule = null, clone = false) { + editMailRule(rule: MailRule = null, forceCreate = false) { const modal = this.modalService.open(MailRuleEditDialogComponent, { backdrop: 'static', size: 'xl', }) modal.componentInstance.dialogMode = - rule && !clone ? EditDialogMode.EDIT : EditDialogMode.CREATE + rule && !forceCreate ? EditDialogMode.EDIT : EditDialogMode.CREATE modal.componentInstance.object = rule modal.componentInstance.succeeded .pipe(takeUntil(this.unsubscribeNotifier)) @@ -163,10 +163,10 @@ export class MailComponent }) } - cloneMailRule(rule: MailRule) { + copyMailRule(rule: MailRule) { const clone = { ...rule } clone.id = null - clone.name = `${rule.name} (clone)` + clone.name = `${rule.name} (copy)` this.editMailRule(clone, true) } diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.html b/src-ui/src/app/components/manage/workflows/workflows.component.html index 7fb2854d8..e262f96ea 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.html +++ b/src-ui/src/app/components/manage/workflows/workflows.component.html @@ -39,7 +39,7 @@
- +
@@ -53,8 +53,8 @@
-
diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts index 07f7eadac..0bccbad2d 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts @@ -174,12 +174,12 @@ describe('WorkflowsComponent', () => { expect(reloadSpy).toHaveBeenCalled() }) - it('should support clone', () => { + it('should support copy', () => { let modal: NgbModalRef modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1])) - const cloneButton = fixture.debugElement.queryAll(By.css('button'))[6] - cloneButton.triggerEventHandler('click') + const copyButton = fixture.debugElement.queryAll(By.css('button'))[6] + copyButton.triggerEventHandler('click') expect(modal).not.toBeUndefined() const editDialog = modal.componentInstance as WorkflowEditDialogComponent diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.ts b/src-ui/src/app/components/manage/workflows/workflows.component.ts index 757d3c75f..92b421e9f 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.ts @@ -57,13 +57,13 @@ export class WorkflowsComponent .join(', ') } - editWorkflow(workflow: Workflow, clone: boolean = false) { + editWorkflow(workflow: Workflow, forceCreate: boolean = false) { const modal = this.modalService.open(WorkflowEditDialogComponent, { backdrop: 'static', size: 'xl', }) modal.componentInstance.dialogMode = - workflow && !clone ? EditDialogMode.EDIT : EditDialogMode.CREATE + workflow && !forceCreate ? EditDialogMode.EDIT : EditDialogMode.CREATE if (workflow) { // quick "deep" clone so original doesn't get modified const clone = Object.assign({}, workflow) @@ -87,7 +87,7 @@ export class WorkflowsComponent }) } - cloneWorkflow(workflow: Workflow) { + copyWorkflow(workflow: Workflow) { const clone = Object.assign({}, workflow) clone.id = null clone.name = `${workflow.name} (copy)`