moved files from classification to components folder

web/src/app/administration/administration-routing.module.ts

@@ -4,10 +4,10 @@ import { Routes, RouterModule } from '@angular/router';
 import { WorkbasketListComponent } from 'app/administration/workbasket/master/workbasket-list.component';
 import { WorkbasketDetailsComponent } from 'app/administration/workbasket/details/workbasket-details.component';
 import { MasterAndDetailComponent } from 'app/shared/master-and-detail/master-and-detail.component';
-import { ClassificationListComponent } from 'app/administration/classification/master/list/classification-list.component';
-import { ClassificationDetailsComponent } from 'app/administration/classification/details/classification-details.component';
+import { ClassificationListComponent } from 'app/administration/components/classification-list/classification-list.component';
+import { ClassificationDetailsComponent } from 'app/administration/components/classification-details/classification-details.component';
 import { DomainGuard } from 'app/guards/domain.guard';
-import { AccessItemsManagementComponent } from './access-items-management/access-items-management.component';
+import { AccessItemsManagementComponent } from './components/access-items-management/access-items-management.component';
 
 const routes: Routes = [
   {

web/src/app/administration/administration.module.ts

@@ -7,7 +7,7 @@ import { SharedModule } from 'app/shared/shared.module';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { ClassificationTypesSelectorComponent } from 'app/shared/classification-types-selector/classification-types-selector.component';
 import { ClassificationCategoriesService } from 'app/shared/services/classifications/classification-categories.service';
-import { AccessItemsManagementComponent } from 'app/administration/access-items-management/access-items-management.component';
+import { AccessItemsManagementComponent } from 'app/administration/components/access-items-management/access-items-management.component';
 import { AdministrationRoutingModule } from './administration-routing.module';
 /**
  * Components
@@ -19,8 +19,8 @@ import { WorkbasketInformationComponent } from './workbasket/details/information
 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 { ClassificationListComponent } from './classification/master/list/classification-list.component';
-import { ClassificationDetailsComponent } from './classification/details/classification-details.component';
+import { ClassificationListComponent } from './components/classification-list/classification-list.component';
+import { ClassificationDetailsComponent } from './components/classification-details/classification-details.component';
 import { ImportExportComponent } from './components/import-export/import-export.component';
 /**
  * Services

web/src/app/administration/components/access-items-management/access-items-management.component.scss

@@ -1,4 +1,4 @@
-@import './src/assets/_colors';
+@import '../../../../assets/colors';
 
 .margin {
     margin-top: 10px;

web/src/app/administration/components/access-items-management/access-items-management.component.ts

@@ -13,13 +13,13 @@ import { RemoveConfirmationService } from 'app/services/remove-confirmation/remo
 import { AlertModel, AlertType } from 'app/models/alert';
 import { AlertService } from 'app/services/alert/alert.service';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
-import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service';
-import { AccessIdsService } from '../../shared/services/access-ids/access-ids.service';
-import { AccessIdDefinition } from '../../models/access-id';
-import { ErrorsService } from '../../services/errors/errors.service';
-import { ERROR_TYPES } from '../../models/errors';
-import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../models/customisation';
-import { customFieldCount } from '../../models/workbasket-access-items';
+import { RequestInProgressService } from '../../../services/requestInProgress/request-in-progress.service';
+import { AccessIdsService } from '../../../shared/services/access-ids/access-ids.service';
+import { AccessIdDefinition } from '../../../models/access-id';
+import { ErrorsService } from '../../../services/errors/errors.service';
+import { ERROR_TYPES } from '../../../models/errors';
+import { AccessItemsCustomisation, CustomField, getCustomFields } from '../../../models/customisation';
+import { customFieldCount } from '../../../models/workbasket-access-items';
 
 @Component({
   selector: 'taskana-access-items-management',

web/src/app/administration/components/classification-list/classification-list.component.ts

@@ -13,12 +13,12 @@ import { Pair } from 'app/models/pair';
 import { ImportExportService } from 'app/administration/services/import-export.service';
 import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';
 import { ClassificationSelectors } from 'app/store/classification-store/classification.selectors';
-import { ClassificationDefinition } from '../../../../models/classification-definition';
-import { AlertModel, AlertType } from '../../../../models/alert';
-import { AlertService } from '../../../../services/alert/alert.service';
-import { ERROR_TYPES } from '../../../../models/errors';
+import { ClassificationDefinition } from '../../../models/classification-definition';
+import { AlertModel, AlertType } from '../../../models/alert';
+import { AlertService } from '../../../services/alert/alert.service';
+import { ERROR_TYPES } from '../../../models/errors';
 
-import { ClassificationCategoryImages } from '../../../../models/customisation';
+import { ClassificationCategoryImages } from '../../../models/customisation';
 
 @Component({
   selector: 'taskana-classification-list',

web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts

@@ -80,7 +80,7 @@ describe('DistributionTargetsComponent', () => {
     expect(component.distributionTargetsRight).toBeDefined();
   });
 
-  it('should have two list with differents elements onInit', () => {
+  it('should have two classification-list with differents elements onInit', () => {
     let repeteadElemens = false;
     expect(component.distributionTargetsLeft.length).toBe(2);
     expect(component.distributionTargetsRight.length).toBe(1);
@@ -92,7 +92,7 @@ describe('DistributionTargetsComponent', () => {
     expect(repeteadElemens).toBeFalsy();
   });
 
-  it('should filter left list and keep selected elements as selected', () => {
+  it('should filter left classification-list and keep selected elements as selected', () => {
     component.performFilter({
       filterBy: new FilterModel({
         name: 'someName', owner: 'someOwner', description: 'someDescription', key: 'someKey'

web/src/app/administration/workbasket/master/workbasket-list.component.spec.ts

@@ -122,34 +122,34 @@ describe('WorkbasketListComponent', () => {
     });
   });
 
-  it('should have wb-action-toolbar, wb-search-bar, wb-list-container, wb-pagination,'
+  it('should have wb-action-toolbar, wb-search-bar, wb-classification-list-container, wb-pagination,'
         + ' collapsedMenufilterWb and taskana-filter created in the html', () => {
     expect(debugElement.querySelector('#wb-action-toolbar')).toBeDefined();
     expect(debugElement.querySelector('#wb-search-bar')).toBeDefined();
     expect(debugElement.querySelector('#wb-pagination')).toBeDefined();
-    expect(debugElement.querySelector('#wb-list-container')).toBeDefined();
+    expect(debugElement.querySelector('#wb-classification-list-container')).toBeDefined();
     expect(debugElement.querySelector('#collapsedMenufilterWb')).toBeDefined();
     expect(debugElement.querySelector('taskana-filter')).toBeDefined();
-    expect(debugElement.querySelectorAll('#wb-list-container > li').length).toBe(3);
+    expect(debugElement.querySelectorAll('#wb-classification-list-container > li').length).toBe(3);
   });
 
   // it('should have two workbasketsummary rows created with the second one selected.', fakeAsync(() => {
   //   tick(0);
   //   fixture.detectChanges();
   //   fixture.whenStable().then(() => {
-  //     expect(debugElement.querySelectorAll('#wb-list-container > li').length).toBe(3);
-  //     expect(debugElement.querySelectorAll('#wb-list-container > li')[1].getAttribute('class'))
-  //       .toBe('list-group-item ng-star-inserted');
-  //     expect(debugElement.querySelectorAll('#wb-list-container > li')[2].getAttribute('class'))
-  //       .toBe('list-group-item ng-star-inserted active');
+  //     expect(debugElement.querySelectorAll('#wb-classification-list-container > li').length).toBe(3);
+  //     expect(debugElement.querySelectorAll('#wb-classification-list-container > li')[1].getAttribute('class'))
+  //       .toBe('classification-list-group-item ng-star-inserted');
+  //     expect(debugElement.querySelectorAll('#wb-classification-list-container > li')[2].getAttribute('class'))
+  //       .toBe('classification-list-group-item ng-star-inserted active');
   //   })
   //
   // }));
 
   it('should have two workbasketsummary rows created with two different icons: user and users', () => {
-    expect(debugElement.querySelectorAll('#wb-list-container > li')[1]
+    expect(debugElement.querySelectorAll('#wb-classification-list-container > li')[1]
       .querySelector('svg-icon').getAttribute('ng-reflect-src')).toBe('./assets/icons/user.svg');
-    expect(debugElement.querySelectorAll('#wb-list-container > li')[2]
+    expect(debugElement.querySelectorAll('#wb-classification-list-container > li')[2]
       .querySelector('svg-icon').getAttribute('ng-reflect-src')).toBe('./assets/icons/users.svg');
   });
 

web/src/app/models/errors.ts

@@ -72,22 +72,22 @@ export const errors = new Map<ERROR_TYPES, Pair>([
     'You can\'t delete a group',
     '',
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.CREATE_ERR, new Pair(
     'There was an error creating a classification',
     '',
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.REMOVE_ERR, new Pair(
     'There was error while removing your classification',
     ''
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.SAVE_ERR, new Pair(
     'There was error while saving your classification',
     ''
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.SELECT_ERR, new Pair(
     'There is no classification selected',
     'Please check if you are creating a classification'
@@ -128,7 +128,7 @@ export const errors = new Map<ERROR_TYPES, Pair>([
     '',
     'An error occurred while fetching the task'
   )],
-  // workbasket-details.component
+  // workbasket-classification-details.component
   [ERROR_TYPES.FETCH_ERR_4, new Pair(
     'An error occurred while fetching the workbasket',
     ''
@@ -208,17 +208,17 @@ export const errors = new Map<ERROR_TYPES, Pair>([
     '',
     '{this.accessIdSelected} was removed successfully'
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.SUCCESS_ALERT_2, new Pair(
     '',
     'Classification {classification.key} was saved successfully'
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.SUCCESS_ALERT_3, new Pair(
     'Classification {this.classification.key} was saved successfully',
     ''
   )],
-  // classification-details.component
+  // classification-classification-details.component
   // access-items.component
   // workbasket.distribution-targets.component
   // workbasket-information.component
@@ -226,12 +226,12 @@ export const errors = new Map<ERROR_TYPES, Pair>([
     'Reset edited fields',
     ''
   )],
-  // classification-details.component
+  // classification-classification-details.component
   [ERROR_TYPES.SUCCESS_ALERT_4, new Pair(
     'Classification {key} was removed successfully',
     ''
   )],
-  // classification-list.component
+  // classification-classification-list.component
   [ERROR_TYPES.SUCCESS_ALERT_5, new Pair(
     'Classification {key} was saved successfully',
     ''

web/src/environments/environment.ts

@@ -1,7 +1,7 @@
 // The file contents for the current environment will overwrite these during build.
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
 // `ng build --configuration=production` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// The classification-list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
   production: false,