From 90b337198916177b82ce84a9b1e350ccf645f3f5 Mon Sep 17 00:00:00 2001 From: Martin Rojas Miguel Angel Date: Fri, 23 Mar 2018 11:01:46 +0100 Subject: [PATCH] TSK-403 refactor web application path --- .travis.yml | 6 +- .../app/shared/sort/sort.component.spec.ts | 40 ------------ admin/src/assets/icons/logo.svg | 1 - {admin => web}/.angular-cli.json | 0 {admin => web}/.editorconfig | 0 {admin => web}/.gitignore | 0 {admin => web}/.vscode/launch.json | 0 {admin => web}/README.md | 0 {admin => web}/karma.conf.js | 0 {admin => web}/package-lock.json | 0 {admin => web}/package.json | 0 .../access-items/access-items.component.html | 0 .../access-items/access-items.component.scss | 0 .../access-items.component.spec.ts | 30 +++++---- .../access-items/access-items.component.ts | 19 +++--- .../distribution-targets.component.html | 0 .../distribution-targets.component.scss | 0 .../distribution-targets.component.spec.ts | 40 ++++++------ .../distribution-targets.component.ts | 30 ++++----- .../dual-list/dual-list.component.html | 0 .../dual-list/dual-list.component.scss | 8 +-- .../dual-list/dual-list.component.ts | 4 +- .../workbasket-information.component.html | 0 .../workbasket-information.component.scss | 0 .../workbasket-information.component.spec.ts | 29 +++++---- .../workbasket-information.component.ts | 25 +++---- .../noAccess/no-access.component.html | 0 .../noAccess/no-access.component.scss | 0 .../noAccess/no-access.component.spec.ts | 0 .../details}/noAccess/no-access.component.ts | 0 .../details/workbasket-details.component.html | 0 .../details/workbasket-details.component.scss | 0 .../workbasket-details.component.spec.ts | 61 +++++++++--------- .../details/workbasket-details.component.ts | 23 ++++--- .../workbasket-list-toolbar.component.html | 0 .../workbasket-list-toolbar.component.scss | 0 .../workbasket-list-toolbar.component.spec.ts | 33 ++++++---- .../workbasket-list-toolbar.component.ts | 21 +++--- .../list/workbasket-list.component.html | 0 .../list/workbasket-list.component.scss | 0 .../list/workbasket-list.component.spec.ts | 41 +++++++----- .../master}/list/workbasket-list.component.ts | 14 ++-- {admin => web}/src/app/app-routing.module.ts | 6 +- {admin => web}/src/app/app.component.html | 0 {admin => web}/src/app/app.component.scss | 0 {admin => web}/src/app/app.component.spec.ts | 12 ++-- {admin => web}/src/app/app.component.ts | 8 ++- {admin => web}/src/app/app.module.ts | 39 +++++------ .../model => web/src/app/models}/action.ts | 0 web/src/app/models/alert.ts | 15 +++++ web/src/app/models/filter.ts | 14 ++++ .../app/model => web/src/app/models}/links.ts | 0 .../src/app/models}/modal-error.ts | 0 web/src/app/models/sorting.ts | 14 ++++ .../app/model => web/src/app/models}/type.ts | 0 .../workbasket-access-items-resource.ts | 0 .../app/models}/workbasket-access-items.ts | 0 ...orkbasket-distribution-targets-resource.ts | 0 .../models}/workbasket-summary-resource.ts | 0 .../src/app/models}/workbasket-summary.ts | 0 .../src/app/models}/workbasket.ts | 0 .../app/pipes/mapValues}/map-values.pipe.ts | 0 .../removeNoneType/remove-none-type.pipe.ts | 0 .../seleted-workbasket.pipe.ts | 0 .../app/services/alert}/alert.service.spec.ts | 0 .../src/app/services/alert}/alert.service.ts | 18 +----- .../errorModal}/error-modal.service.ts | 4 +- .../http-client-interceptor.service.spec.ts | 2 +- .../http-client-interceptor.service.ts | 2 +- .../master-and-detail.service.spec.ts | 0 .../master-and-detail.service.ts | 0 .../permission}/permission.service.spec.ts | 0 .../permission}/permission.service.ts | 0 .../request-in-progress.service.ts | 0 .../saving-workbaskets.service.spec.ts | 0 .../saving-workbaskets.service.ts | 1 - .../workbasket}/workbasket.service.spec.ts | 4 +- .../workbasket}/workbasket.service.ts | 18 +++--- .../src/app/shared/alert/alert.component.html | 0 .../src/app/shared/alert/alert.component.scss | 2 +- .../app/shared/alert/alert.component.spec.ts | 3 +- .../src/app/shared/alert/alert.component.ts | 10 +-- .../app/shared/filter/filter.component.html | 0 .../app/shared/filter/filter.component.scss | 0 .../shared/filter/filter.component.spec.ts | 6 +- .../src/app/shared/filter/filter.component.ts | 18 +----- .../general-message-modal.component.html | 0 .../general-message-modal.component.scss | 0 .../general-message-modal.component.spec.ts | 0 .../general-message-modal.component.ts | 0 .../master-and-detail.component.html | 0 .../master-and-detail.component.scss | 0 .../master-and-detail.component.spec.ts | 9 ++- .../master-and-detail.component.ts | 2 +- .../src/app/shared/sort/sort.component.html | 0 .../src/app/shared/sort/sort.component.scss | 0 .../app/shared/sort/sort.component.spec.ts | 41 ++++++++++++ .../src/app/shared/sort/sort.component.ts | 16 +---- .../app/shared/spinner/spinner.component.html | 0 .../app/shared/spinner/spinner.component.scss | 0 .../shared/spinner/spinner.component.spec.ts | 0 .../app/shared/spinner/spinner.component.ts | 0 .../shared/type-icon/icon-type.component.html | 0 .../shared/type-icon/icon-type.component.scss | 0 .../type-icon/icon-type.component.spec.ts | 0 .../shared/type-icon/icon-type.component.ts | 2 +- {admin => web}/src/assets/.gitkeep | 0 {admin => web}/src/assets/_forms.scss | 0 {admin => web}/src/assets/_site.scss | 6 +- {admin => web}/src/assets/icons/clearance.svg | 0 .../src/app => web/src/assets}/icons/logo.svg | 0 {admin => web}/src/assets/icons/noaccess.svg | 0 {admin => web}/src/assets/icons/topic.svg | 0 {admin => web}/src/assets/icons/user.svg | 0 {admin => web}/src/assets/icons/users.svg | 0 {admin => web}/src/assets/icons/wb-add.svg | 0 {admin => web}/src/assets/icons/wb-empty.svg | 0 {admin => web}/src/assets/icons/wb-full.svg | 0 .../src/environments/environment.prod.ts | 0 .../src/environments/environment.ts | 0 {admin => web}/src/index.html | 0 {admin => web}/src/main.ts | 0 {admin => web}/src/polyfills.ts | 0 {admin => web}/src/taskana.ico | Bin {admin => web}/src/test.ts | 0 {admin => web}/src/tsconfig.app.json | 0 {admin => web}/src/tsconfig.spec.json | 0 {admin => web}/src/typings.d.ts | 0 {admin => web}/tsconfig.json | 0 {admin => web}/tslint.json | 0 130 files changed, 369 insertions(+), 328 deletions(-) delete mode 100644 admin/src/app/shared/sort/sort.component.spec.ts delete mode 100644 admin/src/assets/icons/logo.svg rename {admin => web}/.angular-cli.json (100%) rename {admin => web}/.editorconfig (100%) rename {admin => web}/.gitignore (100%) rename {admin => web}/.vscode/launch.json (100%) rename {admin => web}/README.md (100%) rename {admin => web}/karma.conf.js (100%) rename {admin => web}/package-lock.json (100%) mode change 100755 => 100644 rename {admin => web}/package.json (100%) mode change 100755 => 100644 rename {admin/src/app => web/src/app/administration}/workbasket/details/access-items/access-items.component.html (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/access-items/access-items.component.scss (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/access-items/access-items.component.spec.ts (78%) rename {admin/src/app => web/src/app/administration}/workbasket/details/access-items/access-items.component.ts (84%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/distribution-targets.component.html (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/distribution-targets.component.scss (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/distribution-targets.component.spec.ts (82%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/distribution-targets.component.ts (87%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/dual-list/dual-list.component.html (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/dual-list/dual-list.component.scss (90%) rename {admin/src/app => web/src/app/administration}/workbasket/details/distribution-targets/dual-list/dual-list.component.ts (88%) rename {admin/src/app => web/src/app/administration}/workbasket/details/information/workbasket-information.component.html (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/information/workbasket-information.component.scss (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/information/workbasket-information.component.spec.ts (88%) rename {admin/src/app => web/src/app/administration}/workbasket/details/information/workbasket-information.component.ts (86%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/details}/noAccess/no-access.component.html (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/details}/noAccess/no-access.component.scss (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/details}/noAccess/no-access.component.spec.ts (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/details}/noAccess/no-access.component.ts (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/workbasket-details.component.html (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/workbasket-details.component.scss (100%) rename {admin/src/app => web/src/app/administration}/workbasket/details/workbasket-details.component.spec.ts (74%) rename {admin/src/app => web/src/app/administration}/workbasket/details/workbasket-details.component.ts (86%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list-toolbar/workbasket-list-toolbar.component.scss (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts (83%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts (79%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list.component.html (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list.component.scss (100%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list.component.spec.ts (85%) rename {admin/src/app/workbasket => web/src/app/administration/workbasket/master}/list/workbasket-list.component.ts (88%) rename {admin => web}/src/app/app-routing.module.ts (80%) rename {admin => web}/src/app/app.component.html (100%) rename {admin => web}/src/app/app.component.scss (100%) rename {admin => web}/src/app/app.component.spec.ts (89%) rename {admin => web}/src/app/app.component.ts (84%) rename {admin => web}/src/app/app.module.ts (57%) rename {admin/src/app/model => web/src/app/models}/action.ts (100%) create mode 100644 web/src/app/models/alert.ts create mode 100644 web/src/app/models/filter.ts rename {admin/src/app/model => web/src/app/models}/links.ts (100%) rename {admin/src/app/model => web/src/app/models}/modal-error.ts (100%) create mode 100644 web/src/app/models/sorting.ts rename {admin/src/app/model => web/src/app/models}/type.ts (100%) rename {admin/src/app/model => web/src/app/models}/workbasket-access-items-resource.ts (100%) rename {admin/src/app/model => web/src/app/models}/workbasket-access-items.ts (100%) rename {admin/src/app/model => web/src/app/models}/workbasket-distribution-targets-resource.ts (100%) rename {admin/src/app/model => web/src/app/models}/workbasket-summary-resource.ts (100%) rename {admin/src/app/model => web/src/app/models}/workbasket-summary.ts (100%) rename {admin/src/app/model => web/src/app/models}/workbasket.ts (100%) rename {admin/src/app/pipes => web/src/app/pipes/mapValues}/map-values.pipe.ts (100%) rename admin/src/app/pipes/remove-none-type.ts => web/src/app/pipes/removeNoneType/remove-none-type.pipe.ts (100%) rename {admin/src/app/pipes => web/src/app/pipes/selectedWorkbasket}/seleted-workbasket.pipe.ts (100%) rename {admin/src/app/services => web/src/app/services/alert}/alert.service.spec.ts (100%) rename {admin/src/app/services => web/src/app/services/alert}/alert.service.ts (57%) rename {admin/src/app/services => web/src/app/services/errorModal}/error-modal.service.ts (88%) rename {admin/src/app/services => web/src/app/services/httpClientInterceptor}/http-client-interceptor.service.spec.ts (87%) rename {admin/src/app/services => web/src/app/services/httpClientInterceptor}/http-client-interceptor.service.ts (91%) rename {admin/src/app/services => web/src/app/services/masterAndDetail}/master-and-detail.service.spec.ts (100%) rename {admin/src/app/services => web/src/app/services/masterAndDetail}/master-and-detail.service.ts (100%) rename {admin/src/app/services => web/src/app/services/permission}/permission.service.spec.ts (100%) rename {admin/src/app/services => web/src/app/services/permission}/permission.service.ts (100%) rename {admin/src/app/services => web/src/app/services/requestInProgress}/request-in-progress.service.ts (100%) rename {admin => web}/src/app/services/saving-workbaskets/saving-workbaskets.service.spec.ts (100%) rename {admin => web}/src/app/services/saving-workbaskets/saving-workbaskets.service.ts (99%) rename {admin/src/app/services => web/src/app/services/workbasket}/workbasket.service.spec.ts (97%) rename {admin/src/app/services => web/src/app/services/workbasket}/workbasket.service.ts (89%) rename {admin => web}/src/app/shared/alert/alert.component.html (100%) rename {admin => web}/src/app/shared/alert/alert.component.scss (79%) rename {admin => web}/src/app/shared/alert/alert.component.spec.ts (95%) rename {admin => web}/src/app/shared/alert/alert.component.ts (71%) rename {admin => web}/src/app/shared/filter/filter.component.html (100%) rename {admin => web}/src/app/shared/filter/filter.component.scss (100%) rename {admin => web}/src/app/shared/filter/filter.component.spec.ts (93%) rename {admin => web}/src/app/shared/filter/filter.component.ts (65%) rename {admin => web}/src/app/shared/general-message-modal/general-message-modal.component.html (100%) rename {admin => web}/src/app/shared/general-message-modal/general-message-modal.component.scss (100%) rename {admin => web}/src/app/shared/general-message-modal/general-message-modal.component.spec.ts (100%) rename {admin => web}/src/app/shared/general-message-modal/general-message-modal.component.ts (100%) rename {admin => web}/src/app/shared/masterAndDetail/master-and-detail.component.html (100%) rename {admin => web}/src/app/shared/masterAndDetail/master-and-detail.component.scss (100%) rename {admin => web}/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts (92%) rename {admin => web}/src/app/shared/masterAndDetail/master-and-detail.component.ts (94%) rename {admin => web}/src/app/shared/sort/sort.component.html (100%) rename {admin => web}/src/app/shared/sort/sort.component.scss (100%) create mode 100644 web/src/app/shared/sort/sort.component.spec.ts rename {admin => web}/src/app/shared/sort/sort.component.ts (75%) rename {admin => web}/src/app/shared/spinner/spinner.component.html (100%) rename {admin => web}/src/app/shared/spinner/spinner.component.scss (100%) rename {admin => web}/src/app/shared/spinner/spinner.component.spec.ts (100%) rename {admin => web}/src/app/shared/spinner/spinner.component.ts (100%) rename {admin => web}/src/app/shared/type-icon/icon-type.component.html (100%) rename {admin => web}/src/app/shared/type-icon/icon-type.component.scss (100%) rename {admin => web}/src/app/shared/type-icon/icon-type.component.spec.ts (100%) rename {admin => web}/src/app/shared/type-icon/icon-type.component.ts (92%) rename {admin => web}/src/assets/.gitkeep (100%) rename {admin => web}/src/assets/_forms.scss (100%) rename {admin => web}/src/assets/_site.scss (97%) rename {admin => web}/src/assets/icons/clearance.svg (100%) rename {admin/src/app => web/src/assets}/icons/logo.svg (100%) rename {admin => web}/src/assets/icons/noaccess.svg (100%) rename {admin => web}/src/assets/icons/topic.svg (100%) rename {admin => web}/src/assets/icons/user.svg (100%) rename {admin => web}/src/assets/icons/users.svg (100%) rename {admin => web}/src/assets/icons/wb-add.svg (100%) rename {admin => web}/src/assets/icons/wb-empty.svg (100%) rename {admin => web}/src/assets/icons/wb-full.svg (100%) rename {admin => web}/src/environments/environment.prod.ts (100%) rename {admin => web}/src/environments/environment.ts (100%) rename {admin => web}/src/index.html (100%) rename {admin => web}/src/main.ts (100%) rename {admin => web}/src/polyfills.ts (100%) rename {admin => web}/src/taskana.ico (100%) rename {admin => web}/src/test.ts (100%) rename {admin => web}/src/tsconfig.app.json (100%) rename {admin => web}/src/tsconfig.spec.json (100%) rename {admin => web}/src/typings.d.ts (100%) rename {admin => web}/tsconfig.json (100%) rename {admin => web}/tslint.json (100%) diff --git a/.travis.yml b/.travis.yml index 40dbf3b06..62f01714a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,19 +9,19 @@ cache: directories: - "$HOME/.m2" - "workplace/node_modules" - - "admin/node_modules" + - "web/node_modules" - "monitor/node_modules" before_install: - nvm install $NODE_VERSION - npm install -g @angular/cli >/dev/null 2>&1 install: - (cd workplace && npm install --no-progress && ng build --environment=prod --no-progress) - && (cd admin && npm install --no-progress && npm run build:prod) + && (cd web && npm install --no-progress && npm run build:prod) && (cd monitor && npm install --no-progress && ng build --environment=prod --no-progress) && mvn clean install -q -f lib/ -DskipTests=true -Dmaven.javadoc.skip=true -B && mvn clean install -q -f rest/ -DskipTests=true -Dmaven.javadoc.skip=true -B script: - - (cd admin && npm run test-phantom) + - (cd web && npm run test-phantom) && mvn verify -f lib/ && mvn verify -f rest/ && lib/deployment/release.sh -ik -p lib/ -m "lib/taskana-core/ lib/taskana-spring/ lib/taskana-cdi/" diff --git a/admin/src/app/shared/sort/sort.component.spec.ts b/admin/src/app/shared/sort/sort.component.spec.ts deleted file mode 100644 index 867cc84f1..000000000 --- a/admin/src/app/shared/sort/sort.component.spec.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MapValuesPipe } from '../../pipes/map-values.pipe'; - -import { SortComponent, Direction } from './sort.component'; - -describe('SortComponent', () => { - let component: SortComponent; - let fixture: ComponentFixture; - let debugElement; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SortComponent, MapValuesPipe ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SortComponent); - component = fixture.componentInstance; - debugElement = fixture.debugElement.nativeElement; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); - - it('should change order when click on order ', () => { - expect(component.sort.sortDirection).toBe(Direction.ASC); - debugElement.querySelector('#sort-by-direction-desc').click(); - expect(component.sort.sortDirection).toBe(Direction.DESC); - }); - - it('should change sort by when click on sort by ', () => { - expect(component.sort.sortBy).toBe('key'); - debugElement.querySelector('#sort-by-name').click(); - expect(component.sort.sortBy).toBe('name'); - }); -}); diff --git a/admin/src/assets/icons/logo.svg b/admin/src/assets/icons/logo.svg deleted file mode 100644 index 0df1447f1..000000000 --- a/admin/src/assets/icons/logo.svg +++ /dev/null @@ -1 +0,0 @@ -Taskana \ No newline at end of file diff --git a/admin/.angular-cli.json b/web/.angular-cli.json similarity index 100% rename from admin/.angular-cli.json rename to web/.angular-cli.json diff --git a/admin/.editorconfig b/web/.editorconfig similarity index 100% rename from admin/.editorconfig rename to web/.editorconfig diff --git a/admin/.gitignore b/web/.gitignore similarity index 100% rename from admin/.gitignore rename to web/.gitignore diff --git a/admin/.vscode/launch.json b/web/.vscode/launch.json similarity index 100% rename from admin/.vscode/launch.json rename to web/.vscode/launch.json diff --git a/admin/README.md b/web/README.md similarity index 100% rename from admin/README.md rename to web/README.md diff --git a/admin/karma.conf.js b/web/karma.conf.js similarity index 100% rename from admin/karma.conf.js rename to web/karma.conf.js diff --git a/admin/package-lock.json b/web/package-lock.json old mode 100755 new mode 100644 similarity index 100% rename from admin/package-lock.json rename to web/package-lock.json diff --git a/admin/package.json b/web/package.json old mode 100755 new mode 100644 similarity index 100% rename from admin/package.json rename to web/package.json diff --git a/admin/src/app/workbasket/details/access-items/access-items.component.html b/web/src/app/administration/workbasket/details/access-items/access-items.component.html similarity index 100% rename from admin/src/app/workbasket/details/access-items/access-items.component.html rename to web/src/app/administration/workbasket/details/access-items/access-items.component.html diff --git a/admin/src/app/workbasket/details/access-items/access-items.component.scss b/web/src/app/administration/workbasket/details/access-items/access-items.component.scss similarity index 100% rename from admin/src/app/workbasket/details/access-items/access-items.component.scss rename to web/src/app/administration/workbasket/details/access-items/access-items.component.scss diff --git a/admin/src/app/workbasket/details/access-items/access-items.component.spec.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts similarity index 78% rename from admin/src/app/workbasket/details/access-items/access-items.component.spec.ts rename to web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts index 6b7f835cc..bc32deb93 100644 --- a/admin/src/app/workbasket/details/access-items/access-items.component.spec.ts +++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.spec.ts @@ -1,21 +1,27 @@ import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { WorkbasketService } from '../../../services/workbasket.service'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { HttpModule, JsonpModule } from '@angular/http'; -import { Workbasket } from 'app/model/workbasket'; -import { SpinnerComponent } from '../../../shared/spinner/spinner.component'; -import { AlertService, AlertModel, AlertType } from '../../../services/alert.service'; -import { GeneralMessageModalComponent } from '../../../shared/general-message-modal/general-message-modal.component'; -import { Links } from '../../../model/links'; +import { AngularSvgIconModule } from 'angular-svg-icon'; import { Observable } from 'rxjs/Observable'; + +import { Workbasket } from 'app/models/workbasket'; +import { AlertModel, AlertType } from 'app/models/alert'; +import { Links } from 'app/models/links'; +import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; +import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; +import { ICONTYPES } from 'app/models/type'; + import { AccessItemsComponent } from './access-items.component'; -import { WorkbasketAccessItems } from '../../../model/workbasket-access-items'; -import { WorkbasketAccessItemsResource } from '../../../model/workbasket-access-items-resource'; -import { ICONTYPES } from '../../../model/type'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { SavingWorkbasketService, SavingInformation } from '../../../services/saving-workbaskets/saving-workbaskets.service'; +import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component'; + +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { AlertService } from 'app/services/alert/alert.service'; + + describe('AccessItemsComponent', () => { let component: AccessItemsComponent; diff --git a/admin/src/app/workbasket/details/access-items/access-items.component.ts b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts similarity index 84% rename from admin/src/app/workbasket/details/access-items/access-items.component.ts rename to web/src/app/administration/workbasket/details/access-items/access-items.component.ts index 7311f31f3..c56b8090c 100644 --- a/admin/src/app/workbasket/details/access-items/access-items.component.ts +++ b/web/src/app/administration/workbasket/details/access-items/access-items.component.ts @@ -1,16 +1,17 @@ import { Component, OnInit, Input, AfterViewInit, OnDestroy } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { Workbasket } from '../../../model/workbasket'; -import { WorkbasketAccessItems } from '../../../model/workbasket-access-items'; +import { Workbasket } from 'app/models/workbasket'; +import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; +import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; +import { ErrorModel } from 'app/models/modal-error'; +import { ACTION } from 'app/models/action'; +import { AlertModel, AlertType } from 'app/models/alert'; -import { WorkbasketService } from '../../../services/workbasket.service'; -import { AlertService, AlertModel, AlertType } from '../../../services/alert.service'; -import { WorkbasketAccessItemsResource } from '../../../model/workbasket-access-items-resource'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { ErrorModel } from '../../../model/modal-error'; -import { SavingWorkbasketService, SavingInformation } from '../../../services/saving-workbaskets/saving-workbaskets.service'; -import { ACTION } from '../../../model/action'; +import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { AlertService } from 'app/services/alert/alert.service'; declare var $: any; diff --git a/admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.html b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.html similarity index 100% rename from admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.html rename to web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.html diff --git a/admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.scss b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.scss similarity index 100% rename from admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.scss rename to web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.scss diff --git a/admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.spec.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts similarity index 82% rename from admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.spec.ts rename to web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts index 7844a79d5..183448f99 100644 --- a/admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.spec.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts @@ -1,28 +1,30 @@ -import { Input } from '@angular/core'; +import { Input, Component } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { Observable } from 'rxjs/Observable'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { HttpModule, JsonpModule } from '@angular/http'; -import { DistributionTargetsComponent, Side } from './distribution-targets.component'; -import { SpinnerComponent } from '../../../shared/spinner/spinner.component'; -import { GeneralMessageModalComponent } from '../../../shared/general-message-modal/general-message-modal.component'; -import { IconTypeComponent } from '../../../shared/type-icon/icon-type.component'; -import { SelectWorkBasketPipe } from '../../../pipes/seleted-workbasket.pipe'; -import { WorkbasketSummaryResource } from '../../../model/workbasket-summary-resource'; -import { WorkbasketSummary } from '../../../model/workbasket-summary'; -import { Links } from '../../../model/links'; -import { Component } from '@angular/core'; -import { WorkbasketService } from '../../../services/workbasket.service'; -import { AlertService } from '../../../services/alert.service'; -import { Observable } from 'rxjs/Observable'; -import { Workbasket } from '../../../model/workbasket'; -import { WorkbasketDistributionTargetsResource } from '../../../model/workbasket-distribution-targets-resource'; -import { FilterModel } from '../../../shared/filter/filter.component'; +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { ICONTYPES } from 'app/models/type'; +import { Links } from 'app/models/links'; +import { FilterModel } from 'app/models/filter'; +import { Workbasket } from 'app/models/workbasket'; +import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; + +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { AlertService } from 'app/services/alert/alert.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service'; + import { DualListComponent } from './dual-list/dual-list.component'; -import { ICONTYPES } from '../../../model/type'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { SavingWorkbasketService, SavingInformation } from '../../../services/saving-workbaskets/saving-workbaskets.service'; +import { DistributionTargetsComponent, Side } from './distribution-targets.component'; +import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component'; +import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component'; +import { SelectWorkBasketPipe } from 'app/pipes/selectedWorkbasket/seleted-workbasket.pipe'; + const workbasketSummaryResource: WorkbasketSummaryResource = new WorkbasketSummaryResource({ 'workbaskets': new Array( diff --git a/admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts similarity index 87% rename from admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.ts rename to web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts index 022f2b350..69f3b358a 100644 --- a/admin/src/app/workbasket/details/distribution-targets/distribution-targets.component.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts @@ -1,21 +1,19 @@ import { Component, OnInit, Input, OnDestroy } from '@angular/core'; -import { Workbasket } from '../../../model/workbasket'; -import { WorkbasketSummary } from '../../../model/workbasket-summary'; -import { WorkbasketAccessItems } from '../../../model/workbasket-access-items'; -import { FilterModel } from '../../../shared/filter/filter.component' -import { TREE_ACTIONS, KEYS, IActionMapping, ITreeOptions } from 'angular-tree-component'; - -import { WorkbasketService } from '../../../services/workbasket.service'; -import { AlertService, AlertModel, AlertType } from '../../../services/alert.service'; - import { Subscription } from 'rxjs/Subscription'; -import { element } from 'protractor'; -import { WorkbasketSummaryResource } from '../../../model/workbasket-summary-resource'; -import { WorkbasketDistributionTargetsResource } from '../../../model/workbasket-distribution-targets-resource'; -import { SavingWorkbasketService, SavingInformation } from '../../../services/saving-workbaskets/saving-workbaskets.service'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { ErrorModel } from '../../../model/modal-error'; -import { ACTION } from '../../../model/action'; + +import { Workbasket } from 'app/models/workbasket'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; +import { ErrorModel } from 'app/models/modal-error'; +import { ACTION } from 'app/models/action'; +import { AlertModel, AlertType } from 'app/models/alert'; + +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { AlertService } from 'app/services/alert/alert.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; export enum Side { LEFT, diff --git a/admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.html b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html similarity index 100% rename from admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.html rename to web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html diff --git a/admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.scss b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss similarity index 90% rename from admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.scss rename to web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss index cf6fb5b6e..4de24722c 100644 --- a/admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.scss +++ b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss @@ -1,5 +1,5 @@ .dual-list { - min-height: 300px; + min-height: 290px; padding: 0px; background-color: #f5f5f5; border: 1px solid #e3e3e3; @@ -27,12 +27,12 @@ } overflow-x: hidden; - overflow-y: scroll; + overflow-y: auto; @media screen and (max-width: 991px){ - max-height: 38vh; + max-height: 35vh; } - max-height: 78vh; + max-height: 75vh; } diff --git a/admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.ts b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts similarity index 88% rename from admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.ts rename to web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts index ea703ed75..46f80d436 100644 --- a/admin/src/app/workbasket/details/distribution-targets/dual-list/dual-list.component.ts +++ b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { WorkbasketSummary } from '../../../../model/workbasket-summary'; -import { FilterModel } from '../../../../shared/filter/filter.component'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { FilterModel } from 'app/models/filter'; import { filter } from 'rxjs/operators'; import { Side } from '../distribution-targets.component'; diff --git a/admin/src/app/workbasket/details/information/workbasket-information.component.html b/web/src/app/administration/workbasket/details/information/workbasket-information.component.html similarity index 100% rename from admin/src/app/workbasket/details/information/workbasket-information.component.html rename to web/src/app/administration/workbasket/details/information/workbasket-information.component.html diff --git a/admin/src/app/workbasket/details/information/workbasket-information.component.scss b/web/src/app/administration/workbasket/details/information/workbasket-information.component.scss similarity index 100% rename from admin/src/app/workbasket/details/information/workbasket-information.component.scss rename to web/src/app/administration/workbasket/details/information/workbasket-information.component.scss diff --git a/admin/src/app/workbasket/details/information/workbasket-information.component.spec.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts similarity index 88% rename from admin/src/app/workbasket/details/information/workbasket-information.component.spec.ts rename to web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts index fab19cc1e..6d686b8cf 100644 --- a/admin/src/app/workbasket/details/information/workbasket-information.component.spec.ts +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.spec.ts @@ -1,24 +1,27 @@ import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { WorkbasketService } from '../../../services/workbasket.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; import { WorkbasketInformationComponent } from './workbasket-information.component'; import { FormsModule } from '@angular/forms'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { HttpModule, JsonpModule } from '@angular/http'; -import { Workbasket } from 'app/model/workbasket'; -import { IconTypeComponent } from '../../../shared/type-icon/icon-type.component'; -import { SpinnerComponent } from '../../../shared/spinner/spinner.component'; -import { GeneralMessageModalComponent } from '../../../shared/general-message-modal/general-message-modal.component'; -import { MapValuesPipe } from '../../../pipes/map-values.pipe'; -import { RemoveNoneTypePipe } from '../../../pipes/remove-none-type'; -import { AlertService } from '../../../services/alert.service'; import { RouterTestingModule } from '@angular/router/testing'; -import { Links } from '../../../model/links'; import { Observable } from 'rxjs/Observable'; -import { ICONTYPES } from '../../../model/type'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { SavingWorkbasketService, SavingInformation } from '../../../services/saving-workbaskets/saving-workbaskets.service'; -import { ACTION } from '../../../model/action'; + +import { Workbasket } from 'app/models/workbasket'; +import { ICONTYPES } from 'app/models/type'; +import { ACTION } from 'app/models/action'; +import { Links } from 'app/models/links'; + +import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component'; +import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component'; +import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe'; +import { RemoveNoneTypePipe } from 'app/pipes/removeNoneType/remove-none-type.pipe'; + +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service'; +import { AlertService } from 'app/services/alert/alert.service'; describe('InformationComponent', () => { let component: WorkbasketInformationComponent; diff --git a/admin/src/app/workbasket/details/information/workbasket-information.component.ts b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts similarity index 86% rename from admin/src/app/workbasket/details/information/workbasket-information.component.ts rename to web/src/app/administration/workbasket/details/information/workbasket-information.component.ts index dc06a2f97..c91607371 100644 --- a/admin/src/app/workbasket/details/information/workbasket-information.component.ts +++ b/web/src/app/administration/workbasket/details/information/workbasket-information.component.ts @@ -1,17 +1,20 @@ import { Component, OnInit, Input, Output, OnDestroy } from '@angular/core'; -import { Workbasket } from '../../../model/workbasket'; -import { WorkbasketService } from '../../../services/workbasket.service'; -import { IconTypeComponent } from '../../../shared/type-icon/icon-type.component'; -import { Subscription } from 'rxjs/Subscription'; -import { AlertService, AlertModel, AlertType } from '../../../services/alert.service'; -import { ActivatedRoute, Params, Router, NavigationStart } from '@angular/router'; -import { ICONTYPES } from '../../../model/type'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { ErrorModel } from '../../../model/modal-error'; import { DatePipe } from '@angular/common'; +import { ActivatedRoute, Params, Router, NavigationStart } from '@angular/router'; +import { Subscription } from 'rxjs/Subscription'; + +import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component'; +import { ICONTYPES } from 'app/models/type'; +import { ErrorModel } from 'app/models/modal-error'; +import { ACTION } from 'app/models/action'; +import { Workbasket } from 'app/models/workbasket'; + +import { AlertService } from 'app/services/alert/alert.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { FormGroup } from '@angular/forms'; -import { ACTION } from '../../../model/action'; -import { SavingWorkbasketService, SavingInformation } from '../../../services/saving-workbaskets/saving-workbaskets.service'; +import { SavingWorkbasketService, SavingInformation } from 'app/services/saving-workbaskets/saving-workbaskets.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { AlertModel, AlertType } from 'app/models/alert'; const dateFormat = 'yyyy-MM-ddTHH:mm:ss'; const dateLocale = 'en-US'; diff --git a/admin/src/app/workbasket/noAccess/no-access.component.html b/web/src/app/administration/workbasket/details/noAccess/no-access.component.html similarity index 100% rename from admin/src/app/workbasket/noAccess/no-access.component.html rename to web/src/app/administration/workbasket/details/noAccess/no-access.component.html diff --git a/admin/src/app/workbasket/noAccess/no-access.component.scss b/web/src/app/administration/workbasket/details/noAccess/no-access.component.scss similarity index 100% rename from admin/src/app/workbasket/noAccess/no-access.component.scss rename to web/src/app/administration/workbasket/details/noAccess/no-access.component.scss diff --git a/admin/src/app/workbasket/noAccess/no-access.component.spec.ts b/web/src/app/administration/workbasket/details/noAccess/no-access.component.spec.ts similarity index 100% rename from admin/src/app/workbasket/noAccess/no-access.component.spec.ts rename to web/src/app/administration/workbasket/details/noAccess/no-access.component.spec.ts diff --git a/admin/src/app/workbasket/noAccess/no-access.component.ts b/web/src/app/administration/workbasket/details/noAccess/no-access.component.ts similarity index 100% rename from admin/src/app/workbasket/noAccess/no-access.component.ts rename to web/src/app/administration/workbasket/details/noAccess/no-access.component.ts diff --git a/admin/src/app/workbasket/details/workbasket-details.component.html b/web/src/app/administration/workbasket/details/workbasket-details.component.html similarity index 100% rename from admin/src/app/workbasket/details/workbasket-details.component.html rename to web/src/app/administration/workbasket/details/workbasket-details.component.html diff --git a/admin/src/app/workbasket/details/workbasket-details.component.scss b/web/src/app/administration/workbasket/details/workbasket-details.component.scss similarity index 100% rename from admin/src/app/workbasket/details/workbasket-details.component.scss rename to web/src/app/administration/workbasket/details/workbasket-details.component.scss diff --git a/admin/src/app/workbasket/details/workbasket-details.component.spec.ts b/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts similarity index 74% rename from admin/src/app/workbasket/details/workbasket-details.component.spec.ts rename to web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts index 565e47f4f..3f9aec8d3 100644 --- a/admin/src/app/workbasket/details/workbasket-details.component.spec.ts +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts @@ -1,43 +1,42 @@ import { Component, Input } from '@angular/core'; import { async, ComponentFixture, TestBed, } from '@angular/core/testing'; -import { WorkbasketDetailsComponent } from './workbasket-details.component'; -import { NoAccessComponent } from '../noAccess/no-access.component'; -import { WorkbasketInformationComponent } from './information/workbasket-information.component'; -import { AccessItemsComponent } from './access-items/access-items.component'; -import { DistributionTargetsComponent } from './distribution-targets/distribution-targets.component'; -import { DualListComponent } from './distribution-targets//dual-list/dual-list.component'; -import { Workbasket } from 'app/model/workbasket'; -import { Observable } from 'rxjs/Observable'; -import { SpinnerComponent } from '../../shared/spinner/spinner.component'; -import { IconTypeComponent } from '../../shared/type-icon/icon-type.component'; -import { MapValuesPipe } from '../../pipes/map-values.pipe'; -import { RemoveNoneTypePipe } from '../../pipes/remove-none-type'; -import { SelectWorkBasketPipe } from '../../pipes/seleted-workbasket.pipe'; -import { AlertComponent } from '../../shared/alert/alert.component'; -import { GeneralMessageModalComponent } from '../../shared/general-message-modal/general-message-modal.component'; -import { Links } from 'app/model/links'; -import { WorkbasketAccessItems } from '../../model/workbasket-access-items'; - -import { WorkbasketService } from '../../services/workbasket.service'; -import { MasterAndDetailService } from '../../services/master-and-detail.service'; -import { PermissionService } from '../../services/permission.service'; -import { AlertService } from '../../services/alert.service'; -import { ErrorModalService } from '../../services/error-modal.service'; -import { SavingWorkbasketService } from '../../services/saving-workbaskets/saving-workbaskets.service'; - import { RouterTestingModule } from '@angular/router/testing'; +import { Router, Routes } from '@angular/router'; import { FormsModule } from '@angular/forms'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { HttpModule } from '@angular/http'; -import { WorkbasketSummary } from '../../model/workbasket-summary'; -import { WorkbasketSummaryResource } from '../../model/workbasket-summary-resource'; -import { WorkbasketAccessItemsResource } from '../../model/workbasket-access-items-resource'; -import { ICONTYPES } from '../../model/type'; -import { Router, Routes } from '@angular/router'; -import { ACTION } from '../../model/action'; +import { Observable } from 'rxjs/Observable'; +import { Workbasket } from 'app/models/workbasket'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { ACTION } from 'app/models/action'; +import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; +import { ICONTYPES } from 'app/models/type'; +import { Links } from 'app/models/links'; +import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; +import { PermissionService } from 'app/services/permission/permission.service'; +import { AlertService } from 'app/services/alert/alert.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { SavingWorkbasketService } from 'app/services/saving-workbaskets/saving-workbaskets.service'; + +import { WorkbasketDetailsComponent } from './workbasket-details.component'; +import { NoAccessComponent } from './noAccess/no-access.component'; +import { WorkbasketInformationComponent } from './information/workbasket-information.component'; +import { AccessItemsComponent } from './access-items/access-items.component'; +import { DistributionTargetsComponent } from './distribution-targets/distribution-targets.component'; +import { DualListComponent } from './distribution-targets//dual-list/dual-list.component'; +import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component'; +import { AlertComponent } from 'app/shared/alert/alert.component'; +import { GeneralMessageModalComponent } from 'app/shared/general-message-modal/general-message-modal.component'; +import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe'; +import { RemoveNoneTypePipe } from 'app/pipes/removeNoneType/remove-none-type.pipe'; +import { SelectWorkBasketPipe } from 'app/pipes/selectedWorkbasket/seleted-workbasket.pipe'; @Component({ selector: 'taskana-filter', diff --git a/admin/src/app/workbasket/details/workbasket-details.component.ts b/web/src/app/administration/workbasket/details/workbasket-details.component.ts similarity index 86% rename from admin/src/app/workbasket/details/workbasket-details.component.ts rename to web/src/app/administration/workbasket/details/workbasket-details.component.ts index 53a808782..548552565 100644 --- a/admin/src/app/workbasket/details/workbasket-details.component.ts +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.ts @@ -1,16 +1,19 @@ import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angular/core'; -import { Workbasket } from '../../model/workbasket'; -import { WorkbasketService } from '../../services/workbasket.service' -import { MasterAndDetailService } from '../../services/master-and-detail.service' import { ActivatedRoute, Params, Router, NavigationStart } from '@angular/router'; -import { PermissionService } from '../../services/permission.service'; import { Subscription } from 'rxjs/Subscription'; -import { WorkbasketSummary } from '../../model/workbasket-summary'; -import { WorkbasketSummaryResource } from '../../model/workbasket-summary-resource'; -import { ICONTYPES } from '../../model/type'; -import { ErrorModel } from '../../model/modal-error'; -import { ErrorModalService } from '../../services/error-modal.service'; -import { ACTION } from '../../model/action'; + +import { Workbasket } from 'app/models/workbasket'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { ICONTYPES } from 'app/models/type'; +import { ErrorModel } from 'app/models/modal-error'; +import { ACTION } from 'app/models/action'; + +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service' +import { PermissionService } from 'app/services/permission/permission.service'; +import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service' + @Component({ selector: 'taskana-workbasket-details', diff --git a/admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html similarity index 100% rename from admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html rename to web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html diff --git a/admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.scss b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.scss similarity index 100% rename from admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.scss rename to web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.scss diff --git a/admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts similarity index 83% rename from admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts rename to web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts index b1162a678..c9c2e1d02 100644 --- a/admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.spec.ts @@ -1,23 +1,30 @@ +import { Component } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { Observable } from 'rxjs/Observable'; +import { Router, Routes } from '@angular/router'; + import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpModule } from '@angular/http'; import { HttpClientModule } from '@angular/common/http'; -import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { WorkbasketService } from '../../../services/workbasket.service'; -import { RequestInProgressService } from '../../../services/request-in-progress.service'; -import { AlertService } from '../../../services/alert.service'; -import { SortComponent, SortingModel } from '../../../shared/sort/sort.component'; -import { FilterComponent, FilterModel } from '../../../shared/filter/filter.component'; -import { IconTypeComponent } from '../../../shared/type-icon/icon-type.component'; -import { MapValuesPipe } from '../../../pipes/map-values.pipe'; + +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { Links } from 'app/models/links'; +import { FilterModel } from 'app/models/filter'; +import { SortingModel } from 'app/models/sorting'; + +import { SortComponent } from 'app/shared/sort/sort.component'; +import { FilterComponent } from 'app/shared/filter/filter.component'; +import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component'; import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar.component'; -import { Component } from '@angular/core'; -import { WorkbasketSummary } from '../../../model/workbasket-summary'; -import { Links } from '../../../model/links'; -import { Observable } from 'rxjs/Observable'; + +import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe'; + +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { AlertService } from 'app/services/alert/alert.service'; @Component({ selector: 'taskana-dummy-detail', diff --git a/admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts similarity index 79% rename from admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts rename to web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts index 229049858..c2737ef77 100644 --- a/admin/src/app/workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.ts @@ -1,14 +1,17 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { SortingModel } from '../../../shared/sort/sort.component'; -import { FilterModel } from '../../../shared/filter/filter.component'; -import { WorkbasketService } from '../../../services/workbasket.service'; -import { Subscription } from 'rxjs/Subscription'; -import { WorkbasketSummary } from '../../../model/workbasket-summary'; import { Router, ActivatedRoute } from '@angular/router'; -import { ErrorModel } from '../../../model/modal-error'; -import { ErrorModalService } from '../../../services/error-modal.service'; -import { RequestInProgressService } from '../../../services/request-in-progress.service'; -import { AlertService, AlertModel, AlertType } from '../../../services/alert.service'; + +import { SortingModel } from 'app/models/sorting'; +import { FilterModel } from 'app/models/filter'; +import { Subscription } from 'rxjs/Subscription'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { ErrorModel } from 'app/models/modal-error'; +import { AlertModel, AlertType } from 'app/models/alert'; + +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; +import { AlertService} from 'app/services/alert/alert.service'; @Component({ selector: 'taskana-workbasket-list-toolbar', diff --git a/admin/src/app/workbasket/list/workbasket-list.component.html b/web/src/app/administration/workbasket/master/list/workbasket-list.component.html similarity index 100% rename from admin/src/app/workbasket/list/workbasket-list.component.html rename to web/src/app/administration/workbasket/master/list/workbasket-list.component.html diff --git a/admin/src/app/workbasket/list/workbasket-list.component.scss b/web/src/app/administration/workbasket/master/list/workbasket-list.component.scss similarity index 100% rename from admin/src/app/workbasket/list/workbasket-list.component.scss rename to web/src/app/administration/workbasket/master/list/workbasket-list.component.scss diff --git a/admin/src/app/workbasket/list/workbasket-list.component.spec.ts b/web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts similarity index 85% rename from admin/src/app/workbasket/list/workbasket-list.component.spec.ts rename to web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts index 9262230fe..6affe4a77 100644 --- a/admin/src/app/workbasket/list/workbasket-list.component.spec.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.spec.ts @@ -1,33 +1,39 @@ import { Component } from '@angular/core'; import { async, ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing'; -import { WorkbasketListComponent } from './workbasket-list.component'; -import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar/workbasket-list-toolbar.component'; +import { Observable } from 'rxjs/Observable'; + import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; -import { WorkbasketSummary } from '../../model/workbasket-summary'; -import { WorkbasketService } from '../../services/workbasket.service'; import { HttpModule } from '@angular/http'; import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { Observable } from 'rxjs/Observable'; -import { SpinnerComponent } from '../../shared/spinner/spinner.component'; -import { FilterModel } from '../../shared/filter/filter.component'; -import { SortComponent } from '../../shared/sort/sort.component'; -import { IconTypeComponent } from '../../shared/type-icon/icon-type.component'; -import { RemoveNoneTypePipe } from '../../pipes/remove-none-type'; -import { MapValuesPipe } from '../../pipes/map-values.pipe'; -import { WorkbasketSummaryResource } from '../../model/workbasket-summary-resource'; -import { Links } from '../../model/links'; -import { ErrorModalService } from '../../services/error-modal.service'; -import { RequestInProgressService } from '../../services/request-in-progress.service'; -import { AlertService } from '../../services/alert.service'; + +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { Links } from 'app/models/links'; +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { FilterModel } from 'app/models/filter'; + + +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { AlertService } from 'app/services/alert/alert.service'; +import { WorkbasketService } from 'app/services/workbasket/workbasket.service'; + +import { WorkbasketListComponent } from './workbasket-list.component'; +import { WorkbasketListToolbarComponent } from './workbasket-list-toolbar/workbasket-list-toolbar.component'; +import { IconTypeComponent } from 'app/shared/type-icon/icon-type.component'; +import { SpinnerComponent } from 'app/shared/spinner/spinner.component'; +import { SortComponent } from 'app/shared/sort/sort.component'; + +import { RemoveNoneTypePipe } from 'app/pipes/removeNoneType/remove-none-type.pipe'; +import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe'; + @Component({ selector: 'taskana-dummy-detail', template: 'dummydetail' }) export class DummyDetailComponent { - } @Component({ @@ -58,6 +64,7 @@ describe('WorkbasketListComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ + declarations: [WorkbasketListComponent, DummyDetailComponent, SpinnerComponent, FilterComponent, WorkbasketListToolbarComponent, RemoveNoneTypePipe, IconTypeComponent, SortComponent, MapValuesPipe], imports: [ diff --git a/admin/src/app/workbasket/list/workbasket-list.component.ts b/web/src/app/administration/workbasket/master/list/workbasket-list.component.ts similarity index 88% rename from admin/src/app/workbasket/list/workbasket-list.component.ts rename to web/src/app/administration/workbasket/master/list/workbasket-list.component.ts index 298b0e0ca..5d386a1e0 100644 --- a/admin/src/app/workbasket/list/workbasket-list.component.ts +++ b/web/src/app/administration/workbasket/master/list/workbasket-list.component.ts @@ -1,11 +1,13 @@ import { Component, OnInit, EventEmitter, OnDestroy, ChangeDetectorRef } from '@angular/core'; -import { WorkbasketSummaryResource } from '../../model/workbasket-summary-resource'; -import { WorkbasketSummary } from '../../model/workbasket-summary'; -import { WorkbasketService } from '../../services/workbasket.service' -import { Subscription } from 'rxjs/Subscription'; -import { FilterModel } from '../../shared/filter/filter.component' -import { Direction, SortingModel } from '../../shared/sort/sort.component' import { Router, ActivatedRoute } from '@angular/router'; +import { Subscription } from 'rxjs/Subscription'; + +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { WorkbasketSummary } from 'app/models/workbasket-summary'; +import { FilterModel } from 'app/models/filter' +import { SortingModel } from 'app/models/sorting'; + +import { WorkbasketService } from 'app/services/workbasket/workbasket.service' @Component({ selector: 'taskana-workbasket-list', diff --git a/admin/src/app/app-routing.module.ts b/web/src/app/app-routing.module.ts similarity index 80% rename from admin/src/app/app-routing.module.ts rename to web/src/app/app-routing.module.ts index 869d82b97..26e80378d 100644 --- a/admin/src/app/app-routing.module.ts +++ b/web/src/app/app-routing.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { AppComponent } from './app.component'; -import { WorkbasketListComponent } from './workbasket/list/workbasket-list.component'; -import { WorkbasketDetailsComponent } from './workbasket/details/workbasket-details.component'; +import { WorkbasketListComponent } from './administration/workbasket/master/list/workbasket-list.component'; +import { WorkbasketDetailsComponent } from './administration/workbasket/details/workbasket-details.component'; import { MasterAndDetailComponent } from './shared/masterAndDetail/master-and-detail.component'; -import { NoAccessComponent } from './workbasket/noAccess/no-access.component'; +import { NoAccessComponent } from './administration/workbasket/details/noAccess/no-access.component'; const appRoutes: Routes = [ { diff --git a/admin/src/app/app.component.html b/web/src/app/app.component.html similarity index 100% rename from admin/src/app/app.component.html rename to web/src/app/app.component.html diff --git a/admin/src/app/app.component.scss b/web/src/app/app.component.scss similarity index 100% rename from admin/src/app/app.component.scss rename to web/src/app/app.component.scss diff --git a/admin/src/app/app.component.spec.ts b/web/src/app/app.component.spec.ts similarity index 89% rename from admin/src/app/app.component.spec.ts rename to web/src/app/app.component.spec.ts index d36d0de33..9728650a2 100644 --- a/admin/src/app/app.component.spec.ts +++ b/web/src/app/app.component.spec.ts @@ -1,16 +1,18 @@ import { TestBed, async, inject, tick, fakeAsync } from '@angular/core/testing'; - +import { Router, Routes } from '@angular/router'; import { AppComponent } from './app.component'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { RouterTestingModule } from '@angular/router/testing'; import { HttpClientModule } from '@angular/common/http'; -import { Router, Routes } from '@angular/router'; + +import { ErrorModalService } from './services/errorModal/error-modal.service'; +import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; +import { AlertService } from './services/alert/alert.service'; + import { GeneralMessageModalComponent } from './shared/general-message-modal/general-message-modal.component' import { SpinnerComponent } from './shared/spinner/spinner.component' -import { ErrorModalService } from './services/error-modal.service'; -import { RequestInProgressService } from './services/request-in-progress.service'; import { AlertComponent } from './shared/alert/alert.component'; -import { AlertService } from './services/alert.service'; + describe('AppComponent', () => { diff --git a/admin/src/app/app.component.ts b/web/src/app/app.component.ts similarity index 84% rename from admin/src/app/app.component.ts rename to web/src/app/app.component.ts index 997d01729..f3acf642f 100644 --- a/admin/src/app/app.component.ts +++ b/web/src/app/app.component.ts @@ -1,9 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { environment } from '../environments/environment'; import { Router, NavigationStart } from '@angular/router'; -import { ErrorModalService } from './services/error-modal.service'; -import { ErrorModel } from './model/modal-error'; -import { RequestInProgressService } from './services/request-in-progress.service'; + +import { ErrorModel } from './models/modal-error'; + +import { ErrorModalService } from './services/errorModal/error-modal.service'; +import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; @Component({ selector: 'taskana-root', diff --git a/admin/src/app/app.module.ts b/web/src/app/app.module.ts similarity index 57% rename from admin/src/app/app.module.ts rename to web/src/app/app.module.ts index be4144436..889a3dbc8 100644 --- a/admin/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -1,3 +1,4 @@ +// tslint:disable:max-line-length /** * Modules */ @@ -16,14 +17,14 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; * Components */ import { AppComponent } from './app.component'; -import { WorkbasketListComponent } from './workbasket/list/workbasket-list.component'; -import { WorkbasketListToolbarComponent } from './workbasket/list/workbasket-list-toolbar/workbasket-list-toolbar.component' -import { WorkbasketDetailsComponent } from './workbasket/details/workbasket-details.component'; -import { WorkbasketInformationComponent } from './workbasket/details/information/workbasket-information.component'; -import { DistributionTargetsComponent } from './workbasket/details/distribution-targets/distribution-targets.component'; -import { DualListComponent } from './workbasket/details/distribution-targets/dual-list/dual-list.component'; -import { AccessItemsComponent } from './workbasket/details/access-items/access-items.component'; -import { NoAccessComponent } from './workbasket/noAccess/no-access.component'; +import { WorkbasketListComponent } from './administration/workbasket/master/list/workbasket-list.component'; +import { WorkbasketListToolbarComponent } from './administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component' +import { WorkbasketDetailsComponent } from './administration/workbasket/details/workbasket-details.component'; +import { WorkbasketInformationComponent } from './administration/workbasket/details/information/workbasket-information.component'; +import { DistributionTargetsComponent } from './administration/workbasket/details/distribution-targets/distribution-targets.component'; +import { DualListComponent } from './administration/workbasket/details/distribution-targets/dual-list/dual-list.component'; +import { AccessItemsComponent } from './administration/workbasket/details/access-items/access-items.component'; +import { NoAccessComponent } from './administration/workbasket/details/noAccess/no-access.component'; import { SpinnerComponent } from './shared/spinner/spinner.component'; import { FilterComponent } from './shared/filter/filter.component'; import { IconTypeComponent } from './shared/type-icon/icon-type.component'; @@ -37,14 +38,14 @@ import { MasterAndDetailComponent } from './shared/masterAndDetail/master-and-de /** * Services */ -import { WorkbasketService } from './services/workbasket.service'; -import { MasterAndDetailService } from './services/master-and-detail.service'; -import { HttpClientInterceptor } from './services/http-client-interceptor.service'; -import { PermissionService } from './services/permission.service'; +import { WorkbasketService } from './services/workbasket/workbasket.service'; +import { MasterAndDetailService } from './services/masterAndDetail/master-and-detail.service'; +import { HttpClientInterceptor } from './services/httpClientInterceptor/http-client-interceptor.service'; +import { PermissionService } from './services/permission/permission.service'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; -import { AlertService } from './services/alert.service'; -import { ErrorModalService } from './services/error-modal.service'; -import { RequestInProgressService } from './services/request-in-progress.service'; +import { AlertService } from './services/alert/alert.service'; +import { ErrorModalService } from './services/errorModal/error-modal.service'; +import { RequestInProgressService } from './services/requestInProgress/request-in-progress.service'; import { SavingWorkbasketService } from './services/saving-workbaskets/saving-workbaskets.service'; @@ -52,9 +53,9 @@ import { SavingWorkbasketService } from './services/saving-workbaskets/saving-wo /** * Pipes */ -import { MapValuesPipe } from './pipes/map-values.pipe'; -import { RemoveNoneTypePipe } from './pipes/remove-none-type'; -import { SelectWorkBasketPipe } from './pipes/seleted-workbasket.pipe'; +import { MapValuesPipe } from './pipes/mapValues/map-values.pipe'; +import { RemoveNoneTypePipe } from './pipes/removeNoneType/remove-none-type.pipe'; +import { SelectWorkBasketPipe } from './pipes/selectedWorkbasket/seleted-workbasket.pipe'; const MODULES = [ BrowserModule, @@ -111,3 +112,5 @@ const DECLARATIONS = [ bootstrap: [AppComponent] }) export class AppModule { } + +// tslint:enable:max-line-length diff --git a/admin/src/app/model/action.ts b/web/src/app/models/action.ts similarity index 100% rename from admin/src/app/model/action.ts rename to web/src/app/models/action.ts diff --git a/web/src/app/models/alert.ts b/web/src/app/models/alert.ts new file mode 100644 index 000000000..704fcd814 --- /dev/null +++ b/web/src/app/models/alert.ts @@ -0,0 +1,15 @@ +export enum AlertType { + SUCCESS = 'success', + INFO = 'info', + WARNING = 'warning', + DANGER = 'danger', +} + +export class AlertModel { + + constructor(public type: string = AlertType.SUCCESS, + public text: string = 'Success', + public autoClosing: boolean = true, + public closingDelay: number = 2500) { + } +} diff --git a/web/src/app/models/filter.ts b/web/src/app/models/filter.ts new file mode 100644 index 000000000..34af40daf --- /dev/null +++ b/web/src/app/models/filter.ts @@ -0,0 +1,14 @@ +export class FilterModel { + type: string; + name: string; + description: string; + owner: string; + key: string; + constructor(type: string = '', name: string = '', description: string = '', owner: string = '', key: string = '') { + this.type = type; + this.name = name; + this.description = description; + this.owner = owner; + this.key = key; + } +} diff --git a/admin/src/app/model/links.ts b/web/src/app/models/links.ts similarity index 100% rename from admin/src/app/model/links.ts rename to web/src/app/models/links.ts diff --git a/admin/src/app/model/modal-error.ts b/web/src/app/models/modal-error.ts similarity index 100% rename from admin/src/app/model/modal-error.ts rename to web/src/app/models/modal-error.ts diff --git a/web/src/app/models/sorting.ts b/web/src/app/models/sorting.ts new file mode 100644 index 000000000..96bb55088 --- /dev/null +++ b/web/src/app/models/sorting.ts @@ -0,0 +1,14 @@ +export enum Direction { + ASC = 'asc', + DESC = 'desc' +}; + + +export class SortingModel { + sortBy: string; + sortDirection: string; + constructor(sortBy: string = 'key', sortDirection: Direction = Direction.ASC) { + this.sortBy = sortBy; + this.sortDirection = sortDirection; + } +} diff --git a/admin/src/app/model/type.ts b/web/src/app/models/type.ts similarity index 100% rename from admin/src/app/model/type.ts rename to web/src/app/models/type.ts diff --git a/admin/src/app/model/workbasket-access-items-resource.ts b/web/src/app/models/workbasket-access-items-resource.ts similarity index 100% rename from admin/src/app/model/workbasket-access-items-resource.ts rename to web/src/app/models/workbasket-access-items-resource.ts diff --git a/admin/src/app/model/workbasket-access-items.ts b/web/src/app/models/workbasket-access-items.ts similarity index 100% rename from admin/src/app/model/workbasket-access-items.ts rename to web/src/app/models/workbasket-access-items.ts diff --git a/admin/src/app/model/workbasket-distribution-targets-resource.ts b/web/src/app/models/workbasket-distribution-targets-resource.ts similarity index 100% rename from admin/src/app/model/workbasket-distribution-targets-resource.ts rename to web/src/app/models/workbasket-distribution-targets-resource.ts diff --git a/admin/src/app/model/workbasket-summary-resource.ts b/web/src/app/models/workbasket-summary-resource.ts similarity index 100% rename from admin/src/app/model/workbasket-summary-resource.ts rename to web/src/app/models/workbasket-summary-resource.ts diff --git a/admin/src/app/model/workbasket-summary.ts b/web/src/app/models/workbasket-summary.ts similarity index 100% rename from admin/src/app/model/workbasket-summary.ts rename to web/src/app/models/workbasket-summary.ts diff --git a/admin/src/app/model/workbasket.ts b/web/src/app/models/workbasket.ts similarity index 100% rename from admin/src/app/model/workbasket.ts rename to web/src/app/models/workbasket.ts diff --git a/admin/src/app/pipes/map-values.pipe.ts b/web/src/app/pipes/mapValues/map-values.pipe.ts similarity index 100% rename from admin/src/app/pipes/map-values.pipe.ts rename to web/src/app/pipes/mapValues/map-values.pipe.ts diff --git a/admin/src/app/pipes/remove-none-type.ts b/web/src/app/pipes/removeNoneType/remove-none-type.pipe.ts similarity index 100% rename from admin/src/app/pipes/remove-none-type.ts rename to web/src/app/pipes/removeNoneType/remove-none-type.pipe.ts diff --git a/admin/src/app/pipes/seleted-workbasket.pipe.ts b/web/src/app/pipes/selectedWorkbasket/seleted-workbasket.pipe.ts similarity index 100% rename from admin/src/app/pipes/seleted-workbasket.pipe.ts rename to web/src/app/pipes/selectedWorkbasket/seleted-workbasket.pipe.ts diff --git a/admin/src/app/services/alert.service.spec.ts b/web/src/app/services/alert/alert.service.spec.ts similarity index 100% rename from admin/src/app/services/alert.service.spec.ts rename to web/src/app/services/alert/alert.service.spec.ts diff --git a/admin/src/app/services/alert.service.ts b/web/src/app/services/alert/alert.service.ts similarity index 57% rename from admin/src/app/services/alert.service.ts rename to web/src/app/services/alert/alert.service.ts index b8fb28e58..0a972ecc1 100644 --- a/admin/src/app/services/alert.service.ts +++ b/web/src/app/services/alert/alert.service.ts @@ -1,23 +1,7 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; - - -export enum AlertType { - SUCCESS = 'success', - INFO = 'info', - WARNING = 'warning', - DANGER = 'danger', -} - -export class AlertModel { - - constructor(public type: string = AlertType.SUCCESS, - public text: string = 'Success', - public autoClosing: boolean = true, - public closingDelay: number = 2500) { - } -} +import { AlertModel } from 'app/models/alert'; @Injectable() export class AlertService { diff --git a/admin/src/app/services/error-modal.service.ts b/web/src/app/services/errorModal/error-modal.service.ts similarity index 88% rename from admin/src/app/services/error-modal.service.ts rename to web/src/app/services/errorModal/error-modal.service.ts index e26109139..c6987d316 100644 --- a/admin/src/app/services/error-modal.service.ts +++ b/web/src/app/services/errorModal/error-modal.service.ts @@ -1,9 +1,7 @@ import { Injectable } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; -import { ErrorModel } from '../model/modal-error'; - - +import { ErrorModel } from 'app/models/modal-error'; @Injectable() export class ErrorModalService { diff --git a/admin/src/app/services/http-client-interceptor.service.spec.ts b/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.spec.ts similarity index 87% rename from admin/src/app/services/http-client-interceptor.service.spec.ts rename to web/src/app/services/httpClientInterceptor/http-client-interceptor.service.spec.ts index 5a11e483b..d2165fb86 100644 --- a/admin/src/app/services/http-client-interceptor.service.spec.ts +++ b/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientModule } from '@angular/common/http'; import { HttpModule } from '@angular/http'; import { HttpClientInterceptor } from './http-client-interceptor.service'; -import { PermissionService } from './permission.service'; +import { PermissionService } from 'app/services/permission/permission.service'; describe('HttpExtensionService', () => { beforeEach(() => { diff --git a/admin/src/app/services/http-client-interceptor.service.ts b/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.ts similarity index 91% rename from admin/src/app/services/http-client-interceptor.service.ts rename to web/src/app/services/httpClientInterceptor/http-client-interceptor.service.ts index 2fb13f7e3..a9bdcf9c8 100644 --- a/admin/src/app/services/http-client-interceptor.service.ts +++ b/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/catch'; import 'rxjs/add/observable/throw'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { PermissionService } from './permission.service'; +import { PermissionService } from 'app/services/permission/permission.service'; @Injectable() export class HttpClientInterceptor implements HttpInterceptor { diff --git a/admin/src/app/services/master-and-detail.service.spec.ts b/web/src/app/services/masterAndDetail/master-and-detail.service.spec.ts similarity index 100% rename from admin/src/app/services/master-and-detail.service.spec.ts rename to web/src/app/services/masterAndDetail/master-and-detail.service.spec.ts diff --git a/admin/src/app/services/master-and-detail.service.ts b/web/src/app/services/masterAndDetail/master-and-detail.service.ts similarity index 100% rename from admin/src/app/services/master-and-detail.service.ts rename to web/src/app/services/masterAndDetail/master-and-detail.service.ts diff --git a/admin/src/app/services/permission.service.spec.ts b/web/src/app/services/permission/permission.service.spec.ts similarity index 100% rename from admin/src/app/services/permission.service.spec.ts rename to web/src/app/services/permission/permission.service.spec.ts diff --git a/admin/src/app/services/permission.service.ts b/web/src/app/services/permission/permission.service.ts similarity index 100% rename from admin/src/app/services/permission.service.ts rename to web/src/app/services/permission/permission.service.ts diff --git a/admin/src/app/services/request-in-progress.service.ts b/web/src/app/services/requestInProgress/request-in-progress.service.ts similarity index 100% rename from admin/src/app/services/request-in-progress.service.ts rename to web/src/app/services/requestInProgress/request-in-progress.service.ts diff --git a/admin/src/app/services/saving-workbaskets/saving-workbaskets.service.spec.ts b/web/src/app/services/saving-workbaskets/saving-workbaskets.service.spec.ts similarity index 100% rename from admin/src/app/services/saving-workbaskets/saving-workbaskets.service.spec.ts rename to web/src/app/services/saving-workbaskets/saving-workbaskets.service.spec.ts diff --git a/admin/src/app/services/saving-workbaskets/saving-workbaskets.service.ts b/web/src/app/services/saving-workbaskets/saving-workbaskets.service.ts similarity index 99% rename from admin/src/app/services/saving-workbaskets/saving-workbaskets.service.ts rename to web/src/app/services/saving-workbaskets/saving-workbaskets.service.ts index cb839ff1f..e8c1b2fbe 100644 --- a/admin/src/app/services/saving-workbaskets/saving-workbaskets.service.ts +++ b/web/src/app/services/saving-workbaskets/saving-workbaskets.service.ts @@ -3,7 +3,6 @@ import { Subject } from 'rxjs/Subject'; import { Observable } from 'rxjs/Observable'; export class SavingInformation { - constructor(public url: string, public workbasketId: string) { } diff --git a/admin/src/app/services/workbasket.service.spec.ts b/web/src/app/services/workbasket/workbasket.service.spec.ts similarity index 97% rename from admin/src/app/services/workbasket.service.spec.ts rename to web/src/app/services/workbasket/workbasket.service.spec.ts index 5c236c9bd..67f4e46c4 100644 --- a/admin/src/app/services/workbasket.service.spec.ts +++ b/web/src/app/services/workbasket/workbasket.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed, inject, async } from '@angular/core/testing'; -import { WorkbasketService } from './workbasket.service'; -import { Direction } from '../shared/sort/sort.component'; import { HttpModule, Http } from '@angular/http'; import { HttpClientModule, HttpClient } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { WorkbasketService } from './workbasket.service'; +import { Direction } from 'app/models/sorting'; describe('WorkbasketService ', () => { diff --git a/admin/src/app/services/workbasket.service.ts b/web/src/app/services/workbasket/workbasket.service.ts similarity index 89% rename from admin/src/app/services/workbasket.service.ts rename to web/src/app/services/workbasket/workbasket.service.ts index 0be14521f..aaf3f668d 100644 --- a/admin/src/app/services/workbasket.service.ts +++ b/web/src/app/services/workbasket/workbasket.service.ts @@ -1,16 +1,17 @@ import { Injectable } from '@angular/core'; import { HttpClientModule, HttpClient, HttpHeaders, HttpResponse, HttpErrorResponse } from '@angular/common/http'; -import { WorkbasketSummary } from '../model/workbasket-summary'; -import { Workbasket } from '../model/workbasket'; -import { WorkbasketAccessItems } from '../model/workbasket-access-items'; -import { environment } from '../../environments/environment'; -import { Direction } from '../shared/sort/sort.component'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { map } from 'rxjs/operator/map'; -import { WorkbasketSummaryResource } from '../model/workbasket-summary-resource'; -import { WorkbasketAccessItemsResource } from '../model/workbasket-access-items-resource'; -import { WorkbasketDistributionTargetsResource } from '../model/workbasket-distribution-targets-resource'; +import { environment } from 'app/../environments/environment'; + +import { WorkbasketSummary } from 'app//models/workbasket-summary'; +import { Workbasket } from 'app/models/workbasket'; +import { WorkbasketAccessItems } from 'app/models/workbasket-access-items'; +import { WorkbasketSummaryResource } from 'app/models/workbasket-summary-resource'; +import { WorkbasketAccessItemsResource } from 'app/models/workbasket-access-items-resource'; +import { WorkbasketDistributionTargetsResource } from 'app/models/workbasket-distribution-targets-resource'; +import { Direction } from 'app/models/sorting'; @Injectable() export class WorkbasketService { @@ -163,7 +164,6 @@ export class WorkbasketService { } private handleError(error: Response | any) { - // In a real world app, you might use a remote logging infrastructure let errMsg: string; if (error instanceof Response) { const body = error.json() || ''; diff --git a/admin/src/app/shared/alert/alert.component.html b/web/src/app/shared/alert/alert.component.html similarity index 100% rename from admin/src/app/shared/alert/alert.component.html rename to web/src/app/shared/alert/alert.component.html diff --git a/admin/src/app/shared/alert/alert.component.scss b/web/src/app/shared/alert/alert.component.scss similarity index 79% rename from admin/src/app/shared/alert/alert.component.scss rename to web/src/app/shared/alert/alert.component.scss index 1276a88a0..66feab8c7 100644 --- a/admin/src/app/shared/alert/alert.component.scss +++ b/web/src/app/shared/alert/alert.component.scss @@ -1,6 +1,6 @@ .footer{ - position: absolute; + position: fixed; bottom: 0; width: 100%; margin-bottom: 0px; diff --git a/admin/src/app/shared/alert/alert.component.spec.ts b/web/src/app/shared/alert/alert.component.spec.ts similarity index 95% rename from admin/src/app/shared/alert/alert.component.spec.ts rename to web/src/app/shared/alert/alert.component.spec.ts index 3bec3878a..85338f73d 100644 --- a/admin/src/app/shared/alert/alert.component.spec.ts +++ b/web/src/app/shared/alert/alert.component.spec.ts @@ -1,7 +1,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AlertService, AlertModel, AlertType } from '../../services/alert.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { AlertModel, AlertType } from 'app/models/alert'; +import { AlertService } from 'app/services/alert/alert.service'; import { AlertComponent } from './alert.component'; describe('AlertComponent', () => { diff --git a/admin/src/app/shared/alert/alert.component.ts b/web/src/app/shared/alert/alert.component.ts similarity index 71% rename from admin/src/app/shared/alert/alert.component.ts rename to web/src/app/shared/alert/alert.component.ts index 26a7b627c..1af8ebc12 100644 --- a/admin/src/app/shared/alert/alert.component.ts +++ b/web/src/app/shared/alert/alert.component.ts @@ -1,20 +1,22 @@ import { Component, OnInit } from '@angular/core'; -import { AlertService, AlertModel } from '../../services/alert.service'; import { trigger, state, style, animate, transition } from '@angular/animations'; +import { AlertModel } from 'app/models/alert'; +import { AlertService } from 'app/services/alert/alert.service'; + @Component({ selector: 'taskana-alert', templateUrl: './alert.component.html', styleUrls: ['./alert.component.scss'], animations: [ trigger('alertState', [ - state('in', style({ transform: 'translateY(0)' })), + state('in', style({ transform: 'translateY(0)', overflow: 'hidden' })), transition('void => *', [ - style({ transform: 'translateY(100%)' }), + style({ transform: 'translateY(100%)', overflow: 'hidden' }), animate(100) ]), transition('* => void', [ - animate(100, style({ transform: 'translateY(100%)' })) + animate(100, style({ transform: 'translateY(100%)', overflow: 'hidden' })) ]) ]) ] diff --git a/admin/src/app/shared/filter/filter.component.html b/web/src/app/shared/filter/filter.component.html similarity index 100% rename from admin/src/app/shared/filter/filter.component.html rename to web/src/app/shared/filter/filter.component.html diff --git a/admin/src/app/shared/filter/filter.component.scss b/web/src/app/shared/filter/filter.component.scss similarity index 100% rename from admin/src/app/shared/filter/filter.component.scss rename to web/src/app/shared/filter/filter.component.scss diff --git a/admin/src/app/shared/filter/filter.component.spec.ts b/web/src/app/shared/filter/filter.component.spec.ts similarity index 93% rename from admin/src/app/shared/filter/filter.component.spec.ts rename to web/src/app/shared/filter/filter.component.spec.ts index 94c9aec23..61b1c8f43 100644 --- a/admin/src/app/shared/filter/filter.component.spec.ts +++ b/web/src/app/shared/filter/filter.component.spec.ts @@ -3,9 +3,11 @@ import { FormsModule } from '@angular/forms'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; import { HttpModule } from '@angular/http'; + +import { FilterModel } from 'app/models/filter'; import { IconTypeComponent } from '../type-icon/icon-type.component'; -import { FilterComponent, FilterModel } from './filter.component'; -import { MapValuesPipe } from '../../pipes/map-values.pipe'; +import { FilterComponent } from './filter.component'; +import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe'; describe('FilterComponent', () => { let component: FilterComponent, diff --git a/admin/src/app/shared/filter/filter.component.ts b/web/src/app/shared/filter/filter.component.ts similarity index 65% rename from admin/src/app/shared/filter/filter.component.ts rename to web/src/app/shared/filter/filter.component.ts index 08e3bcf95..c21886297 100644 --- a/admin/src/app/shared/filter/filter.component.ts +++ b/web/src/app/shared/filter/filter.component.ts @@ -1,21 +1,7 @@ import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core'; import { IconTypeComponent } from '../type-icon/icon-type.component' -import { ICONTYPES } from '../../model/type'; - -export class FilterModel { - type: string; - name: string; - description: string; - owner: string; - key: string; - constructor(type: string = '', name: string = '', description: string = '', owner: string = '', key: string = '') { - this.type = type; - this.name = name; - this.description = description; - this.owner = owner; - this.key = key; - } -} +import { ICONTYPES } from 'app/models/type'; +import { FilterModel } from 'app/models/filter'; @Component({ selector: 'taskana-filter', diff --git a/admin/src/app/shared/general-message-modal/general-message-modal.component.html b/web/src/app/shared/general-message-modal/general-message-modal.component.html similarity index 100% rename from admin/src/app/shared/general-message-modal/general-message-modal.component.html rename to web/src/app/shared/general-message-modal/general-message-modal.component.html diff --git a/admin/src/app/shared/general-message-modal/general-message-modal.component.scss b/web/src/app/shared/general-message-modal/general-message-modal.component.scss similarity index 100% rename from admin/src/app/shared/general-message-modal/general-message-modal.component.scss rename to web/src/app/shared/general-message-modal/general-message-modal.component.scss diff --git a/admin/src/app/shared/general-message-modal/general-message-modal.component.spec.ts b/web/src/app/shared/general-message-modal/general-message-modal.component.spec.ts similarity index 100% rename from admin/src/app/shared/general-message-modal/general-message-modal.component.spec.ts rename to web/src/app/shared/general-message-modal/general-message-modal.component.spec.ts diff --git a/admin/src/app/shared/general-message-modal/general-message-modal.component.ts b/web/src/app/shared/general-message-modal/general-message-modal.component.ts similarity index 100% rename from admin/src/app/shared/general-message-modal/general-message-modal.component.ts rename to web/src/app/shared/general-message-modal/general-message-modal.component.ts diff --git a/admin/src/app/shared/masterAndDetail/master-and-detail.component.html b/web/src/app/shared/masterAndDetail/master-and-detail.component.html similarity index 100% rename from admin/src/app/shared/masterAndDetail/master-and-detail.component.html rename to web/src/app/shared/masterAndDetail/master-and-detail.component.html diff --git a/admin/src/app/shared/masterAndDetail/master-and-detail.component.scss b/web/src/app/shared/masterAndDetail/master-and-detail.component.scss similarity index 100% rename from admin/src/app/shared/masterAndDetail/master-and-detail.component.scss rename to web/src/app/shared/masterAndDetail/master-and-detail.component.scss diff --git a/admin/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts b/web/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts similarity index 92% rename from admin/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts rename to web/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts index 9233a4fa8..f04dfb936 100644 --- a/admin/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts +++ b/web/src/app/shared/masterAndDetail/master-and-detail.component.spec.ts @@ -1,12 +1,12 @@ -import { Location } from '@angular/common'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { TestBed, async, inject, fakeAsync } from '@angular/core/testing'; -import { MasterAndDetailComponent } from './master-and-detail.component'; import { RouterTestingModule } from '@angular/router/testing'; import { Router, Routes, ActivatedRoute, NavigationStart, RouterEvent } from '@angular/router'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; -import { MasterAndDetailService } from '../../services/master-and-detail.service' +import { MasterAndDetailService } from '../../services/masterAndDetail/master-and-detail.service' + +import { MasterAndDetailComponent } from './master-and-detail.component'; @Component({ @@ -27,7 +27,7 @@ export class DummyDetailComponent { describe('MasterAndDetailComponent ', () => { - let component, fixture, debugElement, location, router; + let component, fixture, debugElement, router; const routes: Routes = [ { @@ -66,7 +66,6 @@ describe('MasterAndDetailComponent ', () => { fixture = TestBed.createComponent(MasterAndDetailComponent); component = fixture.debugElement.componentInstance; debugElement = fixture.debugElement.nativeElement; - location = TestBed.get(Location); router = TestBed.get(Router); router.initialNavigation(); diff --git a/admin/src/app/shared/masterAndDetail/master-and-detail.component.ts b/web/src/app/shared/masterAndDetail/master-and-detail.component.ts similarity index 94% rename from admin/src/app/shared/masterAndDetail/master-and-detail.component.ts rename to web/src/app/shared/masterAndDetail/master-and-detail.component.ts index 814be236b..06ad4e9d5 100644 --- a/admin/src/app/shared/masterAndDetail/master-and-detail.component.ts +++ b/web/src/app/shared/masterAndDetail/master-and-detail.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { Router, Routes, ActivatedRoute, NavigationStart, RouterEvent } from '@angular/router'; -import { MasterAndDetailService } from '../../services/master-and-detail.service' +import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service' @Component({ selector: 'taskana-master-and-detail', diff --git a/admin/src/app/shared/sort/sort.component.html b/web/src/app/shared/sort/sort.component.html similarity index 100% rename from admin/src/app/shared/sort/sort.component.html rename to web/src/app/shared/sort/sort.component.html diff --git a/admin/src/app/shared/sort/sort.component.scss b/web/src/app/shared/sort/sort.component.scss similarity index 100% rename from admin/src/app/shared/sort/sort.component.scss rename to web/src/app/shared/sort/sort.component.scss diff --git a/web/src/app/shared/sort/sort.component.spec.ts b/web/src/app/shared/sort/sort.component.spec.ts new file mode 100644 index 000000000..b4ce8aa0e --- /dev/null +++ b/web/src/app/shared/sort/sort.component.spec.ts @@ -0,0 +1,41 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { MapValuesPipe } from 'app/pipes/mapValues/map-values.pipe'; + +import { SortComponent } from './sort.component'; +import { Direction } from 'app/models/sorting'; + +describe('SortComponent', () => { + let component: SortComponent; + let fixture: ComponentFixture; + let debugElement; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [SortComponent, MapValuesPipe] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SortComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement.nativeElement; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should change order when click on order ', () => { + expect(component.sort.sortDirection).toBe(Direction.ASC); + debugElement.querySelector('#sort-by-direction-desc').click(); + expect(component.sort.sortDirection).toBe(Direction.DESC); + }); + + it('should change sort by when click on sort by ', () => { + expect(component.sort.sortBy).toBe('key'); + debugElement.querySelector('#sort-by-name').click(); + expect(component.sort.sortBy).toBe('name'); + }); +}); diff --git a/admin/src/app/shared/sort/sort.component.ts b/web/src/app/shared/sort/sort.component.ts similarity index 75% rename from admin/src/app/shared/sort/sort.component.ts rename to web/src/app/shared/sort/sort.component.ts index 0335f3226..df682455a 100644 --- a/admin/src/app/shared/sort/sort.component.ts +++ b/web/src/app/shared/sort/sort.component.ts @@ -1,19 +1,5 @@ import { Component, OnInit, Output, EventEmitter } from '@angular/core'; - -export enum Direction { - ASC = 'asc', - DESC = 'desc' -}; - - -export class SortingModel { - sortBy: string; - sortDirection: string; - constructor(sortBy: string = 'key', sortDirection: Direction = Direction.ASC) { - this.sortBy = sortBy; - this.sortDirection = sortDirection; - } -} +import { SortingModel, Direction } from 'app/models/sorting'; @Component({ selector: 'taskana-sort', diff --git a/admin/src/app/shared/spinner/spinner.component.html b/web/src/app/shared/spinner/spinner.component.html similarity index 100% rename from admin/src/app/shared/spinner/spinner.component.html rename to web/src/app/shared/spinner/spinner.component.html diff --git a/admin/src/app/shared/spinner/spinner.component.scss b/web/src/app/shared/spinner/spinner.component.scss similarity index 100% rename from admin/src/app/shared/spinner/spinner.component.scss rename to web/src/app/shared/spinner/spinner.component.scss diff --git a/admin/src/app/shared/spinner/spinner.component.spec.ts b/web/src/app/shared/spinner/spinner.component.spec.ts similarity index 100% rename from admin/src/app/shared/spinner/spinner.component.spec.ts rename to web/src/app/shared/spinner/spinner.component.spec.ts diff --git a/admin/src/app/shared/spinner/spinner.component.ts b/web/src/app/shared/spinner/spinner.component.ts similarity index 100% rename from admin/src/app/shared/spinner/spinner.component.ts rename to web/src/app/shared/spinner/spinner.component.ts diff --git a/admin/src/app/shared/type-icon/icon-type.component.html b/web/src/app/shared/type-icon/icon-type.component.html similarity index 100% rename from admin/src/app/shared/type-icon/icon-type.component.html rename to web/src/app/shared/type-icon/icon-type.component.html diff --git a/admin/src/app/shared/type-icon/icon-type.component.scss b/web/src/app/shared/type-icon/icon-type.component.scss similarity index 100% rename from admin/src/app/shared/type-icon/icon-type.component.scss rename to web/src/app/shared/type-icon/icon-type.component.scss diff --git a/admin/src/app/shared/type-icon/icon-type.component.spec.ts b/web/src/app/shared/type-icon/icon-type.component.spec.ts similarity index 100% rename from admin/src/app/shared/type-icon/icon-type.component.spec.ts rename to web/src/app/shared/type-icon/icon-type.component.spec.ts diff --git a/admin/src/app/shared/type-icon/icon-type.component.ts b/web/src/app/shared/type-icon/icon-type.component.ts similarity index 92% rename from admin/src/app/shared/type-icon/icon-type.component.ts rename to web/src/app/shared/type-icon/icon-type.component.ts index 55e8dc1fe..80a63cb6f 100644 --- a/admin/src/app/shared/type-icon/icon-type.component.ts +++ b/web/src/app/shared/type-icon/icon-type.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input } from '@angular/core'; -import { ICONTYPES } from '../../model/type'; +import { ICONTYPES } from 'app/models/type'; @Component({ selector: 'taskana-icon-type', diff --git a/admin/src/assets/.gitkeep b/web/src/assets/.gitkeep similarity index 100% rename from admin/src/assets/.gitkeep rename to web/src/assets/.gitkeep diff --git a/admin/src/assets/_forms.scss b/web/src/assets/_forms.scss similarity index 100% rename from admin/src/assets/_forms.scss rename to web/src/assets/_forms.scss diff --git a/admin/src/assets/_site.scss b/web/src/assets/_site.scss similarity index 97% rename from admin/src/assets/_site.scss rename to web/src/assets/_site.scss index f3ce5dd8c..2c07838c1 100644 --- a/admin/src/assets/_site.scss +++ b/web/src/assets/_site.scss @@ -236,9 +236,9 @@ taskana-workbasket-information, taskana-workbasket-access-items, taskana-workbas box-shadow: none; margin-bottom: 0px; &> .panel-body { - height: 84vh; - max-height: 84vh; - overflow-y: scroll; + height: 80vh; + max-height: 80vh; + overflow-y: auto; } } } diff --git a/admin/src/assets/icons/clearance.svg b/web/src/assets/icons/clearance.svg similarity index 100% rename from admin/src/assets/icons/clearance.svg rename to web/src/assets/icons/clearance.svg diff --git a/admin/src/app/icons/logo.svg b/web/src/assets/icons/logo.svg similarity index 100% rename from admin/src/app/icons/logo.svg rename to web/src/assets/icons/logo.svg diff --git a/admin/src/assets/icons/noaccess.svg b/web/src/assets/icons/noaccess.svg similarity index 100% rename from admin/src/assets/icons/noaccess.svg rename to web/src/assets/icons/noaccess.svg diff --git a/admin/src/assets/icons/topic.svg b/web/src/assets/icons/topic.svg similarity index 100% rename from admin/src/assets/icons/topic.svg rename to web/src/assets/icons/topic.svg diff --git a/admin/src/assets/icons/user.svg b/web/src/assets/icons/user.svg similarity index 100% rename from admin/src/assets/icons/user.svg rename to web/src/assets/icons/user.svg diff --git a/admin/src/assets/icons/users.svg b/web/src/assets/icons/users.svg similarity index 100% rename from admin/src/assets/icons/users.svg rename to web/src/assets/icons/users.svg diff --git a/admin/src/assets/icons/wb-add.svg b/web/src/assets/icons/wb-add.svg similarity index 100% rename from admin/src/assets/icons/wb-add.svg rename to web/src/assets/icons/wb-add.svg diff --git a/admin/src/assets/icons/wb-empty.svg b/web/src/assets/icons/wb-empty.svg similarity index 100% rename from admin/src/assets/icons/wb-empty.svg rename to web/src/assets/icons/wb-empty.svg diff --git a/admin/src/assets/icons/wb-full.svg b/web/src/assets/icons/wb-full.svg similarity index 100% rename from admin/src/assets/icons/wb-full.svg rename to web/src/assets/icons/wb-full.svg diff --git a/admin/src/environments/environment.prod.ts b/web/src/environments/environment.prod.ts similarity index 100% rename from admin/src/environments/environment.prod.ts rename to web/src/environments/environment.prod.ts diff --git a/admin/src/environments/environment.ts b/web/src/environments/environment.ts similarity index 100% rename from admin/src/environments/environment.ts rename to web/src/environments/environment.ts diff --git a/admin/src/index.html b/web/src/index.html similarity index 100% rename from admin/src/index.html rename to web/src/index.html diff --git a/admin/src/main.ts b/web/src/main.ts similarity index 100% rename from admin/src/main.ts rename to web/src/main.ts diff --git a/admin/src/polyfills.ts b/web/src/polyfills.ts similarity index 100% rename from admin/src/polyfills.ts rename to web/src/polyfills.ts diff --git a/admin/src/taskana.ico b/web/src/taskana.ico similarity index 100% rename from admin/src/taskana.ico rename to web/src/taskana.ico diff --git a/admin/src/test.ts b/web/src/test.ts similarity index 100% rename from admin/src/test.ts rename to web/src/test.ts diff --git a/admin/src/tsconfig.app.json b/web/src/tsconfig.app.json similarity index 100% rename from admin/src/tsconfig.app.json rename to web/src/tsconfig.app.json diff --git a/admin/src/tsconfig.spec.json b/web/src/tsconfig.spec.json similarity index 100% rename from admin/src/tsconfig.spec.json rename to web/src/tsconfig.spec.json diff --git a/admin/src/typings.d.ts b/web/src/typings.d.ts similarity index 100% rename from admin/src/typings.d.ts rename to web/src/typings.d.ts diff --git a/admin/tsconfig.json b/web/tsconfig.json similarity index 100% rename from admin/tsconfig.json rename to web/tsconfig.json diff --git a/admin/tslint.json b/web/tslint.json similarity index 100% rename from admin/tslint.json rename to web/tslint.json