From 10734fc02444f60c1529606628b8a76683916ce5 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Tue, 21 Sep 2021 10:49:05 +1000 Subject: [PATCH] Move custom fields to separate components (#2072) * Move add-edit custom fields to own component * Fix linting and mistakes * Update directive * Removed linked fields work * Move view custom fields to own component * Remove unnecessary imports * Wrap template in ng-container * Update jslib * Fix imports --- jslib | 2 +- src/popup/app.module.ts | 4 ++ .../add-edit-custom-fields.component.html | 53 +++++++++++++++++++ .../vault/add-edit-custom-fields.component.ts | 18 +++++++ src/popup/vault/add-edit.component.html | 51 +----------------- .../vault/view-custom-fields.component.html | 37 +++++++++++++ .../vault/view-custom-fields.component.ts | 19 +++++++ src/popup/vault/view.component.html | 37 +------------ 8 files changed, 135 insertions(+), 86 deletions(-) create mode 100644 src/popup/vault/add-edit-custom-fields.component.html create mode 100644 src/popup/vault/add-edit-custom-fields.component.ts create mode 100644 src/popup/vault/view-custom-fields.component.html create mode 100644 src/popup/vault/view-custom-fields.component.ts diff --git a/jslib b/jslib index 83548a6753..b7429b0c0c 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 83548a6753a974c57cb373b529a4da3ea5c3b5c0 +Subproject commit b7429b0c0cdca8783fd9fa304918ee91f23c6f76 diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts index 3c69c0f615..57aa6a5507 100644 --- a/src/popup/app.module.ts +++ b/src/popup/app.module.ts @@ -40,6 +40,7 @@ import { SettingsComponent } from './settings/settings.component'; import { SyncComponent } from './settings/sync.component'; import { VaultTimeoutInputComponent } from './settings/vault-timeout-input.component'; +import { AddEditCustomFieldsComponent } from './vault/add-edit-custom-fields.component'; import { AddEditComponent } from './vault/add-edit.component'; import { AttachmentsComponent } from './vault/attachments.component'; import { CiphersComponent } from './vault/ciphers.component'; @@ -48,6 +49,7 @@ import { CurrentTabComponent } from './vault/current-tab.component'; import { GroupingsComponent } from './vault/groupings.component'; import { PasswordHistoryComponent } from './vault/password-history.component'; import { ShareComponent } from './vault/share.component'; +import { ViewCustomFieldsComponent } from './vault/view-custom-fields.component'; import { ViewComponent } from './vault/view.component'; import { EffluxDatesComponent as SendEffluxDatesComponent } from './send/efflux-dates.component'; @@ -248,6 +250,8 @@ registerLocaleData(localeZhTw, 'zh-TW'); PasswordRepromptComponent, SetPinComponent, VaultTimeoutInputComponent, + AddEditCustomFieldsComponent, + ViewCustomFieldsComponent, ], entryComponents: [], providers: [ diff --git a/src/popup/vault/add-edit-custom-fields.component.html b/src/popup/vault/add-edit-custom-fields.component.html new file mode 100644 index 0000000000..843fde75d0 --- /dev/null +++ b/src/popup/vault/add-edit-custom-fields.component.html @@ -0,0 +1,53 @@ +