From f83c8531297cfcc6cc2eb6b247794957398f99dd Mon Sep 17 00:00:00 2001 From: t8g Date: Tue, 29 Aug 2017 10:25:12 +0200 Subject: [PATCH] [front] upgrade to 4.2.4 --- client/angular-cli.json | 2 +- client/package.json | 57 ++++++++++--------- client/src/app/app.module.ts | 2 + client/src/app/cv/cv.component.spec.ts | 28 --------- .../data-editor/data-editor.component.spec.ts | 13 ----- .../app/data-table/data-table.component.html | 2 +- .../data-table/data-table.component.spec.ts | 13 ----- .../src/app/fields/disabled.directive.spec.ts | 11 ---- client/src/app/fields/disabled.directive.ts | 3 +- client/src/app/fields/field.component.spec.ts | 11 ---- .../isari-checkbox.component.spec.ts | 28 --------- .../isari-date/isari-date.component.spec.ts | 11 ---- .../isari-input/isari-input.component.spec.ts | 11 ---- .../isari-multi-input.component.spec.ts | 28 --------- .../isari-multi-select.component.html | 2 +- .../isari-multi-select.component.spec.ts | 28 --------- .../isari-select/isari-select.component.html | 2 +- .../isari-select.component.spec.ts | 11 ---- .../isari-textarea.component.spec.ts | 28 --------- client/src/app/home/home.component.spec.ts | 28 --------- .../isari-chart/isari-chart.component.spec.ts | 28 --------- .../isari-creation-modal.component.html | 4 +- .../isari-editor/isari-editor.component.html | 12 +--- .../isari-editor.component.spec.ts | 13 ----- .../isari-editor/isari-editor.component.ts | 10 ++-- .../isari-header/isari-header.component.html | 6 +- .../isari-header.component.spec.ts | 28 --------- .../isari-layout.component.spec.ts | 28 --------- .../app/isari-list/isari-list.component.html | 4 +- .../isari-list/isari-list.component.spec.ts | 13 ----- client/src/app/login/login.component.spec.ts | 28 --------- .../src/app/spinner/spinner.component.spec.ts | 28 --------- 32 files changed, 53 insertions(+), 468 deletions(-) delete mode 100644 client/src/app/cv/cv.component.spec.ts delete mode 100644 client/src/app/data-editor/data-editor.component.spec.ts delete mode 100644 client/src/app/data-table/data-table.component.spec.ts delete mode 100644 client/src/app/fields/disabled.directive.spec.ts delete mode 100644 client/src/app/fields/field.component.spec.ts delete mode 100644 client/src/app/fields/isari-checkbox/isari-checkbox.component.spec.ts delete mode 100644 client/src/app/fields/isari-date/isari-date.component.spec.ts delete mode 100644 client/src/app/fields/isari-input/isari-input.component.spec.ts delete mode 100644 client/src/app/fields/isari-multi-input/isari-multi-input.component.spec.ts delete mode 100644 client/src/app/fields/isari-multi-select/isari-multi-select.component.spec.ts delete mode 100644 client/src/app/fields/isari-select/isari-select.component.spec.ts delete mode 100644 client/src/app/fields/isari-textarea/isari-textarea.component.spec.ts delete mode 100644 client/src/app/home/home.component.spec.ts delete mode 100644 client/src/app/isari-chart/isari-chart.component.spec.ts delete mode 100644 client/src/app/isari-editor/isari-editor.component.spec.ts delete mode 100644 client/src/app/isari-header/isari-header.component.spec.ts delete mode 100644 client/src/app/isari-layout/isari-layout.component.spec.ts delete mode 100644 client/src/app/isari-list/isari-list.component.spec.ts delete mode 100644 client/src/app/login/login.component.spec.ts delete mode 100644 client/src/app/spinner/spinner.component.spec.ts diff --git a/client/angular-cli.json b/client/angular-cli.json index 934d4612..37fdc8de 100644 --- a/client/angular-cli.json +++ b/client/angular-cli.json @@ -23,8 +23,8 @@ "../node_modules/angular2-toaster/lib/toaster.css" ], "scripts": [], + "environmentSource": "environments/environment.ts", "environments": { - "source": "environments/environment.ts", "dev": "environments/environment.ts", "prod": "environments/environment.prod.ts" } diff --git a/client/package.json b/client/package.json index 235c4b7b..bae6ba80 100644 --- a/client/package.json +++ b/client/package.json @@ -11,15 +11,16 @@ "build": "ng build --prod" }, "dependencies": { - "@angular/common": "^2.3.1", - "@angular/compiler": "^2.3.1", - "@angular/core": "^2.3.1", - "@angular/forms": "^2.3.1", - "@angular/http": "^2.3.1", + "@angular/animations": "^4.2.4", + "@angular/common": "^4.2.4", + "@angular/compiler": "^4.2.4", + "@angular/core": "^4.2.4", + "@angular/forms": "^4.2.4", + "@angular/http": "^4.2.4", "@angular/material": "2.0.0-beta.1", - "@angular/platform-browser": "^2.3.1", - "@angular/platform-browser-dynamic": "^2.3.1", - "@angular/router": "^3.3.1", + "@angular/platform-browser": "^4.2.4", + "@angular/platform-browser-dynamic": "^4.2.4", + "@angular/router": "^4.2.4", "angular2-text-mask": "^4.1.0", "angular2-toaster": "~1.0.2", "core-js": "^2.4.1", @@ -29,28 +30,32 @@ "ng2-translate": "^4.0.0", "node-sass": "^4.5.3", "papaparse": "^4.1.2", - "rxjs": "^5.0.1", + "rxjs": "^5.4.2", "talisman": "^0.16.0", "ts-helpers": "^1.1.1", - "zone.js": "^0.7.2" + "webpack-sources": "^1.0.1", + "zone.js": "^0.8.14" }, "devDependencies": { - "@angular/compiler-cli": "^2.3.1", - "@types/jasmine": "2.5.38", - "@types/node": "^6.0.42", - "angular-cli": "1.0.0-beta.24", - "codelyzer": "~2.0.0-beta.1", - "jasmine-core": "2.5.2", - "jasmine-spec-reporter": "2.5.0", - "karma": "1.2.0", - "karma-chrome-launcher": "^2.0.0", - "karma-cli": "^1.0.1", - "karma-jasmine": "^1.0.2", - "karma-remap-istanbul": "^0.2.1", - "protractor": "~4.0.13", - "ts-node": "1.2.1", - "tslint": "^4.0.2", - "typescript": "~2.0.3" + "@angular/cli": "1.4.0-beta.2", + "@angular/compiler-cli": "^4.2.4", + "@angular/language-service": "^4.2.4", + "@types/jasmine": "~2.5.53", + "@types/jasminewd2": "~2.0.2", + "@types/node": "~6.0.60", + "codelyzer": "~3.1.1", + "jasmine-core": "~2.6.2", + "jasmine-spec-reporter": "~4.1.0", + "karma": "~1.7.0", + "karma-chrome-launcher": "~2.1.1", + "karma-cli": "~1.0.1", + "karma-coverage-istanbul-reporter": "^1.2.1", + "karma-jasmine": "~1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", + "protractor": "~5.1.2", + "ts-node": "~3.2.0", + "tslint": "~5.3.2", + "typescript": "~2.3.3" }, "private": true, "license": "AGPL-3", diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 9f77eacf..80b57681 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -47,6 +47,7 @@ import { FocusMeDirective } from './fields/focus-me.directive'; import { ConfirmDialog } from './fields/confirm.component'; import { IsariCreationModal } from './isari-creation-modal/isari-creation-modal.component'; import { StorageService } from './storage.service'; +import { LogTableComponent } from './log-table/log-table.component'; export function createTranslateLoader(http: Http) { return new TranslateStaticLoader(http, './assets/i18n', '.json'); @@ -83,6 +84,7 @@ export function createTranslateLoader(http: Http) { FocusMeDirective, ConfirmDialog, IsariCreationModal, + LogTableComponent ], imports: [ BrowserModule, diff --git a/client/src/app/cv/cv.component.spec.ts b/client/src/app/cv/cv.component.spec.ts deleted file mode 100644 index 4a4dfd7a..00000000 --- a/client/src/app/cv/cv.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { CVComponent } from './cv.component'; - -describe('CVComponent', () => { - let component: CVComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CVComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CVComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/data-editor/data-editor.component.spec.ts b/client/src/app/data-editor/data-editor.component.spec.ts deleted file mode 100644 index 3205ea2d..00000000 --- a/client/src/app/data-editor/data-editor.component.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; -import { addProviders, async, inject } from '@angular/core/testing'; -import { DataEditorComponent } from './data-editor.component'; - -describe('Component: DataEditor', () => { - it('should create an instance', () => { - let component = new DataEditorComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/data-table/data-table.component.html b/client/src/app/data-table/data-table.component.html index 10c01755..e477a1c2 100644 --- a/client/src/app/data-table/data-table.component.html +++ b/client/src/app/data-table/data-table.component.html @@ -10,7 +10,7 @@ - + {{ cellContent(row[col.key]) }} diff --git a/client/src/app/data-table/data-table.component.spec.ts b/client/src/app/data-table/data-table.component.spec.ts deleted file mode 100644 index 1d0538e1..00000000 --- a/client/src/app/data-table/data-table.component.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; -import { addProviders, async, inject } from '@angular/core/testing'; -import { DataTableComponent } from './data-table.component'; - -describe('Component: DataTable', () => { - it('should create an instance', () => { - let component = new DataTableComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/disabled.directive.spec.ts b/client/src/app/fields/disabled.directive.spec.ts deleted file mode 100644 index 2e59e72d..00000000 --- a/client/src/app/fields/disabled.directive.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { TestBed, async } from '@angular/core/testing'; -import { DisabledDirective } from './disabled.directive'; - -describe('Directive: Disabled', () => { - it('should create an instance', () => { - let directive = new DisabledDirective(); - expect(directive).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/disabled.directive.ts b/client/src/app/fields/disabled.directive.ts index ce8768e4..2043690c 100644 --- a/client/src/app/fields/disabled.directive.ts +++ b/client/src/app/fields/disabled.directive.ts @@ -16,7 +16,8 @@ export class DisabledDirective implements OnInit { constructor(private view: ViewContainerRef) {} ngOnInit() { - const component = (this.view)._element.component; + //const component = (this.view)._element.component; + const component = (this.view)._data.componentView.component; if (component) { component.disabled = this.isariDisabled; } diff --git a/client/src/app/fields/field.component.spec.ts b/client/src/app/fields/field.component.spec.ts deleted file mode 100644 index be07c16f..00000000 --- a/client/src/app/fields/field.component.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { TestBed, async } from '@angular/core/testing'; -import { FieldComponent } from './field.component'; - -describe('Component: Field', () => { - it('should create an instance', () => { - let component = new FieldComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-checkbox/isari-checkbox.component.spec.ts b/client/src/app/fields/isari-checkbox/isari-checkbox.component.spec.ts deleted file mode 100644 index 133cbbe4..00000000 --- a/client/src/app/fields/isari-checkbox/isari-checkbox.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { IsariCheckboxComponent } from './isari-checkbox.component'; - -describe('IsariCheckboxComponent', () => { - let component: IsariCheckboxComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IsariCheckboxComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IsariCheckboxComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-date/isari-date.component.spec.ts b/client/src/app/fields/isari-date/isari-date.component.spec.ts deleted file mode 100644 index 74711e1c..00000000 --- a/client/src/app/fields/isari-date/isari-date.component.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { TestBed, async } from '@angular/core/testing'; -import { IsariDateComponent } from './isari-date.component'; - -describe('Component: IsariDate', () => { - it('should create an instance', () => { - let component = new IsariDateComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-input/isari-input.component.spec.ts b/client/src/app/fields/isari-input/isari-input.component.spec.ts deleted file mode 100644 index 7f4025a2..00000000 --- a/client/src/app/fields/isari-input/isari-input.component.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { TestBed, async } from '@angular/core/testing'; -import { IsariInputComponent } from './isari-input.component'; - -describe('Component: IsariInput', () => { - it('should create an instance', () => { - let component = new IsariInputComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-multi-input/isari-multi-input.component.spec.ts b/client/src/app/fields/isari-multi-input/isari-multi-input.component.spec.ts deleted file mode 100644 index 3b03ca10..00000000 --- a/client/src/app/fields/isari-multi-input/isari-multi-input.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { IsariMultiInputComponent } from './isari-multi-input.component'; - -describe('IsariMultiInputComponent', () => { - let component: IsariMultiInputComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IsariMultiInputComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IsariMultiInputComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-multi-select/isari-multi-select.component.html b/client/src/app/fields/isari-multi-select/isari-multi-select.component.html index e940493c..76ff8460 100644 --- a/client/src/app/fields/isari-multi-select/isari-multi-select.component.html +++ b/client/src/app/fields/isari-multi-select/isari-multi-select.component.html @@ -34,7 +34,7 @@
{{ item.label }} - open_in_new + open_in_new delete
diff --git a/client/src/app/fields/isari-multi-select/isari-multi-select.component.spec.ts b/client/src/app/fields/isari-multi-select/isari-multi-select.component.spec.ts deleted file mode 100644 index 34089c13..00000000 --- a/client/src/app/fields/isari-multi-select/isari-multi-select.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { IsariMultiSelectComponent } from './isari-multi-select.component'; - -describe('IsariMultiSelectComponent', () => { - let component: IsariMultiSelectComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IsariMultiSelectComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IsariMultiSelectComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-select/isari-select.component.html b/client/src/app/fields/isari-select/isari-select.component.html index 8428d711..364ecba2 100644 --- a/client/src/app/fields/isari-select/isari-select.component.html +++ b/client/src/app/fields/isari-select/isari-select.component.html @@ -20,7 +20,7 @@
{{ 'recommended' | translate }}
info_outline - + open_in_new diff --git a/client/src/app/fields/isari-select/isari-select.component.spec.ts b/client/src/app/fields/isari-select/isari-select.component.spec.ts deleted file mode 100644 index 3daa8d5e..00000000 --- a/client/src/app/fields/isari-select/isari-select.component.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { TestBed, async } from '@angular/core/testing'; -import { IsariSelectComponent } from './isari-select.component'; - -describe('Component: IsariSelect', () => { - it('should create an instance', () => { - let component = new IsariSelectComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/fields/isari-textarea/isari-textarea.component.spec.ts b/client/src/app/fields/isari-textarea/isari-textarea.component.spec.ts deleted file mode 100644 index 07db99c7..00000000 --- a/client/src/app/fields/isari-textarea/isari-textarea.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { IsariTextareaComponent } from './isari-textarea.component'; - -describe('IsariTextareaComponent', () => { - let component: IsariTextareaComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IsariTextareaComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IsariTextareaComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/home/home.component.spec.ts b/client/src/app/home/home.component.spec.ts deleted file mode 100644 index f77d7390..00000000 --- a/client/src/app/home/home.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { HomeComponent } from './home.component'; - -describe('HomeComponent', () => { - let component: HomeComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ HomeComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(HomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/isari-chart/isari-chart.component.spec.ts b/client/src/app/isari-chart/isari-chart.component.spec.ts deleted file mode 100644 index 563889d5..00000000 --- a/client/src/app/isari-chart/isari-chart.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { IsariChartComponent } from './isari-chart.component'; - -describe('IsariChartComponent', () => { - let component: IsariChartComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IsariChartComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IsariChartComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/isari-creation-modal/isari-creation-modal.component.html b/client/src/app/isari-creation-modal/isari-creation-modal.component.html index 9677b7db..28e32e62 100644 --- a/client/src/app/isari-creation-modal/isari-creation-modal.component.html +++ b/client/src/app/isari-creation-modal/isari-creation-modal.component.html @@ -7,7 +7,7 @@ {{ item.value }} - + open_in_new @@ -17,5 +17,5 @@

{{ 'no matching' | translate }} - {{ 'Continuer' | translate }} + {{ 'Continuer' | translate }}

diff --git a/client/src/app/isari-editor/isari-editor.component.html b/client/src/app/isari-editor/isari-editor.component.html index f63e0b07..3d557de1 100644 --- a/client/src/app/isari-editor/isari-editor.component.html +++ b/client/src/app/isari-editor/isari-editor.component.html @@ -13,7 +13,7 @@ - +
@@ -41,10 +41,4 @@ - - - - - -
diff --git a/client/src/app/isari-editor/isari-editor.component.spec.ts b/client/src/app/isari-editor/isari-editor.component.spec.ts deleted file mode 100644 index 3b5a9dee..00000000 --- a/client/src/app/isari-editor/isari-editor.component.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; -import { addProviders, async, inject } from '@angular/core/testing'; -import { DetailPageComponent } from './detail-page.component'; - -describe('Component: DetailPage', () => { - it('should create an instance', () => { - let component = new DetailPageComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/isari-editor/isari-editor.component.ts b/client/src/app/isari-editor/isari-editor.component.ts index 27dbfd67..cd7b10b2 100644 --- a/client/src/app/isari-editor/isari-editor.component.ts +++ b/client/src/app/isari-editor/isari-editor.component.ts @@ -1,4 +1,3 @@ -import { Http } from '@angular/http'; import { Component, OnInit, ViewContainerRef, Input, HostListener, Inject } from '@angular/core'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; @@ -36,6 +35,7 @@ export class IsariEditorComponent implements OnInit { deletable = false; relations: { label: string, value: Array, show: boolean, feature: string }[]; exist = false; + logs: any[]; private errors: any; private pressedSaveShortcut: Function; @@ -51,18 +51,16 @@ export class IsariEditorComponent implements OnInit { private toasterService: ToasterService, private viewContainerRef: ViewContainerRef, private titleService: Title, - private dialog: MdDialog, - private http: Http) { + private dialog: MdDialog) { PageScrollConfig.defaultScrollOffset = 50; PageScrollConfig.defaultDuration = 500; } history() { - console.log('history') - // this.http.get('') + this.isariDataService.getHistory(this.feature, { id: this.id }) + .subscribe(logs => this.logs = logs); } - ngOnInit() { this.lang = this.translate.currentLang; this.translate.onLangChange.subscribe((event: LangChangeEvent) => { diff --git a/client/src/app/isari-header/isari-header.component.html b/client/src/app/isari-header/isari-header.component.html index fd3d653b..efd3fc0d 100644 --- a/client/src/app/isari-header/isari-header.component.html +++ b/client/src/app/isari-header/isari-header.component.html @@ -16,7 +16,7 @@
{{ organizationName }}
file_download
Export HCERES
- @@ -24,11 +24,11 @@
{{ organizationName }}
account_balance
{{ 'organizations' | translate }}
- - diff --git a/client/src/app/isari-header/isari-header.component.spec.ts b/client/src/app/isari-header/isari-header.component.spec.ts deleted file mode 100644 index ce8e8511..00000000 --- a/client/src/app/isari-header/isari-header.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { IsariHeaderComponent } from './isari-header.component'; - -describe('IsariHeaderComponent', () => { - let component: IsariHeaderComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ IsariHeaderComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(IsariHeaderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/isari-layout/isari-layout.component.spec.ts b/client/src/app/isari-layout/isari-layout.component.spec.ts deleted file mode 100644 index 02d164c7..00000000 --- a/client/src/app/isari-layout/isari-layout.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { ListLayoutComponent } from './list-layout.component'; - -describe('ListLayoutComponent', () => { - let component: ListLayoutComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ListLayoutComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(ListLayoutComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/isari-list/isari-list.component.html b/client/src/app/isari-list/isari-list.component.html index a547ea4f..2319d2fc 100644 --- a/client/src/app/isari-list/isari-list.component.html +++ b/client/src/app/isari-list/isari-list.component.html @@ -10,8 +10,8 @@ - {{ 'all_activities' | translate }} - {{ type.label.fr }} + {{ 'all_activities' | translate }} + {{ type.label.fr }} { - it('should create an instance', () => { - let component = new ListPageComponent(); - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/login/login.component.spec.ts b/client/src/app/login/login.component.spec.ts deleted file mode 100644 index 556444c8..00000000 --- a/client/src/app/login/login.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { LoginComponent } from './login.component'; - -describe('LoginComponent', () => { - let component: LoginComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ LoginComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LoginComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/client/src/app/spinner/spinner.component.spec.ts b/client/src/app/spinner/spinner.component.spec.ts deleted file mode 100644 index 72aa4064..00000000 --- a/client/src/app/spinner/spinner.component.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* tslint:disable:no-unused-variable */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { By } from '@angular/platform-browser'; -import { DebugElement } from '@angular/core'; - -import { SpinnerComponent } from './spinner.component'; - -describe('SpinnerComponent', () => { - let component: SpinnerComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SpinnerComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SpinnerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -});