From ec27f3c0532d14aa8104113882cb14a70662f90b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 14 Dec 2022 00:10:27 -0800 Subject: [PATCH] move permissions input components --- src-ui/src/app/app.module.ts | 6 +++--- .../components/common/edit-dialog/edit-dialog.component.ts | 2 +- .../permissions-form/permissions-form.component.html | 0 .../permissions-form/permissions-form.component.scss | 0 .../permissions-form/permissions-form.component.ts | 2 +- .../permissions-group/permissions-group.component.html | 0 .../permissions-group/permissions-group.component.scss | 0 .../permissions-group/permissions-group.component.ts | 2 +- .../permissions-user/permissions-user.component.html | 0 .../permissions-user/permissions-user.component.scss | 0 .../permissions-user/permissions-user.component.ts | 2 +- 11 files changed, 7 insertions(+), 7 deletions(-) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-form/permissions-form.component.html (100%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-form/permissions-form.component.scss (100%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-form/permissions-form.component.ts (96%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-group/permissions-group.component.html (100%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-group/permissions-group.component.scss (100%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-group/permissions-group.component.ts (93%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-user/permissions-user.component.html (100%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-user/permissions-user.component.scss (100%) rename src-ui/src/app/components/common/input/{ => permissions}/permissions-user/permissions-user.component.ts (94%) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 46121a54f..061f1cdd5 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -84,8 +84,8 @@ import { GroupEditDialogComponent } from './components/common/edit-dialog/group- import { PermissionsSelectComponent } from './components/common/permissions-select/permissions-select.component' import { MailAccountEditDialogComponent } from './components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component' import { MailRuleEditDialogComponent } from './components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component' -import { PermissionsUserComponent } from './components/common/input/permissions-user/permissions-user.component' -import { PermissionsGroupComponent } from './components/common/input/permissions-group/permissions-group.component' +import { PermissionsUserComponent } from './components/common/input/permissions/permissions-user/permissions-user.component' +import { PermissionsGroupComponent } from './components/common/input/permissions/permissions-group/permissions-group.component' import { IfOwnerDirective } from './directives/if-owner.directive' import { IfObjectPermissionsDirective } from './directives/if-object-permissions.directive' @@ -109,7 +109,7 @@ import localeSv from '@angular/common/locales/sv' import localeTr from '@angular/common/locales/tr' import localeZh from '@angular/common/locales/zh' import { PermissionsDialogComponent } from './components/common/permissions-dialog/permissions-dialog.component' -import { PermissionsFormComponent } from './components/common/input/permissions-form/permissions-form.component' +import { PermissionsFormComponent } from './components/common/input/permissions/permissions-form/permissions-form.component' registerLocaleData(localeBe) registerLocaleData(localeCs) diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index 8acbdb9c2..daed850db 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -8,7 +8,7 @@ import { ObjectWithPermissions } from 'src/app/data/object-with-permissions' import { PaperlessUser } from 'src/app/data/paperless-user' import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service' import { UserService } from 'src/app/services/rest/user.service' -import { PermissionsFormObject } from '../input/permissions-form/permissions-form.component' +import { PermissionsFormObject } from '../input/permissions/permissions-form/permissions-form.component' @Directive() export abstract class EditDialogComponent< diff --git a/src-ui/src/app/components/common/input/permissions-form/permissions-form.component.html b/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.html similarity index 100% rename from src-ui/src/app/components/common/input/permissions-form/permissions-form.component.html rename to src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.html diff --git a/src-ui/src/app/components/common/input/permissions-form/permissions-form.component.scss b/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.scss similarity index 100% rename from src-ui/src/app/components/common/input/permissions-form/permissions-form.component.scss rename to src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.scss diff --git a/src-ui/src/app/components/common/input/permissions-form/permissions-form.component.ts b/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.ts similarity index 96% rename from src-ui/src/app/components/common/input/permissions-form/permissions-form.component.ts rename to src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.ts index 728f83162..8fcde88cb 100644 --- a/src-ui/src/app/components/common/input/permissions-form/permissions-form.component.ts +++ b/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.ts @@ -1,7 +1,7 @@ import { Component, forwardRef, Input, OnInit } from '@angular/core' import { FormControl, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms' import { PaperlessUser } from 'src/app/data/paperless-user' -import { AbstractInputComponent } from '../abstract-input' +import { AbstractInputComponent } from '../../abstract-input' export interface PermissionsFormObject { owner?: number diff --git a/src-ui/src/app/components/common/input/permissions-group/permissions-group.component.html b/src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.html similarity index 100% rename from src-ui/src/app/components/common/input/permissions-group/permissions-group.component.html rename to src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.html diff --git a/src-ui/src/app/components/common/input/permissions-group/permissions-group.component.scss b/src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.scss similarity index 100% rename from src-ui/src/app/components/common/input/permissions-group/permissions-group.component.scss rename to src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.scss diff --git a/src-ui/src/app/components/common/input/permissions-group/permissions-group.component.ts b/src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.ts similarity index 93% rename from src-ui/src/app/components/common/input/permissions-group/permissions-group.component.ts rename to src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.ts index ee2dfdf18..f047ac6c2 100644 --- a/src-ui/src/app/components/common/input/permissions-group/permissions-group.component.ts +++ b/src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.ts @@ -3,7 +3,7 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms' import { first } from 'rxjs/operators' import { PaperlessGroup } from 'src/app/data/paperless-group' import { GroupService } from 'src/app/services/rest/group.service' -import { AbstractInputComponent } from '../abstract-input' +import { AbstractInputComponent } from '../../abstract-input' @Component({ providers: [ diff --git a/src-ui/src/app/components/common/input/permissions-user/permissions-user.component.html b/src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.html similarity index 100% rename from src-ui/src/app/components/common/input/permissions-user/permissions-user.component.html rename to src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.html diff --git a/src-ui/src/app/components/common/input/permissions-user/permissions-user.component.scss b/src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.scss similarity index 100% rename from src-ui/src/app/components/common/input/permissions-user/permissions-user.component.scss rename to src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.scss diff --git a/src-ui/src/app/components/common/input/permissions-user/permissions-user.component.ts b/src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.ts similarity index 94% rename from src-ui/src/app/components/common/input/permissions-user/permissions-user.component.ts rename to src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.ts index 2e0ba82f8..5c08a06a2 100644 --- a/src-ui/src/app/components/common/input/permissions-user/permissions-user.component.ts +++ b/src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.ts @@ -4,7 +4,7 @@ import { first } from 'rxjs/operators' import { PaperlessUser } from 'src/app/data/paperless-user' import { UserService } from 'src/app/services/rest/user.service' import { SettingsService } from 'src/app/services/settings.service' -import { AbstractInputComponent } from '../abstract-input' +import { AbstractInputComponent } from '../../abstract-input' @Component({ providers: [