From 782113a5261776d31f1b0e5505b63a6f10f7962e Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 22 Sep 2023 21:59:22 -0700 Subject: [PATCH] Unify list styling, add tour step, refactor components --- src-ui/src/app/app-routing.module.ts | 4 +- src-ui/src/app/app.component.ts | 8 ++++ src-ui/src/app/app.module.ts | 4 +- .../app-frame/app-frame.component.html | 2 +- .../consumption-templates.component.html} | 43 ++++++++++--------- .../consumption-templates.component.scss} | 0 .../consumption-templates.component.spec.ts} | 10 ++--- .../consumption-templates.component.ts} | 8 ++-- 8 files changed, 45 insertions(+), 34 deletions(-) rename src-ui/src/app/components/manage/{consumption-templates-list/consumption-templates-list.component.html => consumption-templates/consumption-templates.component.html} (52%) rename src-ui/src/app/components/manage/{consumption-templates-list/consumption-templates-list.component.scss => consumption-templates/consumption-templates.component.scss} (100%) rename src-ui/src/app/components/manage/{consumption-templates-list/consumption-templates-list.component.spec.ts => consumption-templates/consumption-templates.component.spec.ts} (94%) rename src-ui/src/app/components/manage/{consumption-templates-list/consumption-templates-list.component.ts => consumption-templates/consumption-templates.component.ts} (94%) diff --git a/src-ui/src/app/app-routing.module.ts b/src-ui/src/app/app-routing.module.ts index 422098b19..f2888b596 100644 --- a/src-ui/src/app/app-routing.module.ts +++ b/src-ui/src/app/app-routing.module.ts @@ -21,7 +21,7 @@ import { PermissionAction, PermissionType, } from './services/permissions.service' -import { ConsumptionTemplatesListComponent } from './components/manage/consumption-templates-list/consumption-templates-list.component' +import { ConsumptionTemplatesComponent } from './components/manage/consumption-templates/consumption-templates.component' import { MailComponent } from './components/manage/mail/mail.component' import { UsersAndGroupsComponent } from './components/admin/users-groups/users-groups.component' @@ -191,7 +191,7 @@ export const routes: Routes = [ }, { path: 'templates', - component: ConsumptionTemplatesListComponent, + component: ConsumptionTemplatesComponent, canActivate: [PermissionsGuard], data: { requiredPermission: { diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index 97dcdd930..9ca963337 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -187,6 +187,14 @@ export class AppComponent implements OnInit, OnDestroy { offset: 0, }, }, + { + anchorId: 'tour.consumption-templates', + content: $localize`Consumption templates give you finer control over the document ingestion process.`, + route: '/templates', + backdropConfig: { + offset: 0, + }, + }, { anchorId: 'tour.file-tasks', content: $localize`File Tasks shows you documents that have been consumed, are waiting to be, or may have failed during the process.`, diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 758e531d4..9d9307492 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -95,7 +95,7 @@ import { UsernamePipe } from './pipes/username.pipe' import { LogoComponent } from './components/common/logo/logo.component' import { IsNumberPipe } from './pipes/is-number.pipe' import { ShareLinksDropdownComponent } from './components/common/share-links-dropdown/share-links-dropdown.component' -import { ConsumptionTemplatesListComponent } from './components/manage/consumption-templates-list/consumption-templates-list.component' +import { ConsumptionTemplatesComponent } from './components/manage/consumption-templates/consumption-templates.component' import { ConsumptionTemplateEditDialogComponent } from './components/common/edit-dialog/consumption-template-edit-dialog/consumption-template-edit-dialog.component' import { MailComponent } from './components/manage/mail/mail.component' import { UsersAndGroupsComponent } from './components/admin/users-groups/users-groups.component' @@ -237,7 +237,7 @@ function initializeApp(settings: SettingsService) { LogoComponent, IsNumberPipe, ShareLinksDropdownComponent, - ConsumptionTemplatesListComponent, + ConsumptionTemplatesComponent, ConsumptionTemplateEditDialogComponent, MailComponent, UsersAndGroupsComponent, diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index b766da393..ac3c9ab8d 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -155,7 +155,7 @@  Storage paths -
  • +
  • diff --git a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.html b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html similarity index 52% rename from src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.html rename to src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html index 098c2af41..e6eb8f57c 100644 --- a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.html +++ b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html @@ -5,29 +5,32 @@ Add Template - + - - - - - - - - - - - - - - - - - -
    NameSort orderDocument SourcesActions
    {{template.order}}{{getSourceList(template)}} +
      + +
    • +
      +
      Name
      +
      Sort order
      +
      Document Sources
      +
      Actions
      +
      +
      • + +
    • +
      +
      +
      {{template.order}}
      +
      {{getSourceList(template)}}
      +
      -
    + + +
    • + +
    No templates defined.
    diff --git a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.scss b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.scss similarity index 100% rename from src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.scss rename to src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.scss diff --git a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.spec.ts b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.spec.ts similarity index 94% rename from src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.spec.ts rename to src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.spec.ts index fb971faa1..7cf49c28f 100644 --- a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.spec.ts +++ b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.spec.ts @@ -18,7 +18,7 @@ import { ConsumptionTemplateService } from 'src/app/services/rest/consumption-te import { ToastService } from 'src/app/services/toast.service' import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { ConsumptionTemplatesListComponent } from './consumption-templates-list.component' +import { ConsumptionTemplatesComponent } from './consumption-templates.component' import { ConsumptionTemplateEditDialogComponent } from '../../common/edit-dialog/consumption-template-edit-dialog/consumption-template-edit-dialog.component' import { PermissionsService } from 'src/app/services/permissions.service' @@ -48,8 +48,8 @@ const templates: PaperlessConsumptionTemplate[] = [ ] describe('ConsumptionTemplatesComponent', () => { - let component: ConsumptionTemplatesListComponent - let fixture: ComponentFixture + let component: ConsumptionTemplatesComponent + let fixture: ComponentFixture let consumptionTemplateService: ConsumptionTemplateService let modalService: NgbModal let toastService: ToastService @@ -57,7 +57,7 @@ describe('ConsumptionTemplatesComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ declarations: [ - ConsumptionTemplatesListComponent, + ConsumptionTemplatesComponent, IfPermissionsDirective, PageHeaderComponent, ConfirmDialogComponent, @@ -92,7 +92,7 @@ describe('ConsumptionTemplatesComponent', () => { modalService = TestBed.inject(NgbModal) toastService = TestBed.inject(ToastService) - fixture = TestBed.createComponent(ConsumptionTemplatesListComponent) + fixture = TestBed.createComponent(ConsumptionTemplatesComponent) component = fixture.componentInstance fixture.detectChanges() }) diff --git a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.ts b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.ts similarity index 94% rename from src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.ts rename to src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.ts index 3682061f0..5274dc20c 100644 --- a/src-ui/src/app/components/manage/consumption-templates-list/consumption-templates-list.component.ts +++ b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.ts @@ -14,11 +14,11 @@ import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dial import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component' @Component({ - selector: 'pngx-consumption-templates-list', - templateUrl: './consumption-templates-list.component.html', - styleUrls: ['./consumption-templates-list.component.scss'], + selector: 'pngx-consumption-templates', + templateUrl: './consumption-templates.component.html', + styleUrls: ['./consumption-templates.component.scss'], }) -export class ConsumptionTemplatesListComponent +export class ConsumptionTemplatesComponent extends ComponentWithPermissions implements OnInit {