Commit 1853f63c authored by Matthieu BENOIST's avatar Matthieu BENOIST
Browse files

Merge branch 'maj' into 'master'

Angular update

See merge request !127
parents 9dfb1661 0daac416
Pipeline #12712 passed with stage
in 8 minutes and 49 seconds
......@@ -50,16 +50,17 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
"fileReplacements": [{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}]
"fileReplacements": [
{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}
]
},
"aot-en": {
"budgets": [
......@@ -74,7 +75,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
......@@ -94,7 +94,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
......@@ -116,16 +115,17 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
"fileReplacements": [{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}],
"fileReplacements": [
{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}
],
"outputPath": "dist"
},
"production-en": {
......@@ -141,16 +141,17 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
}],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
}
],
"outputPath": "dist"
},
"production-fr": {
......@@ -166,13 +167,13 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [{
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
},
......
This diff is collapsed.
{
"name": "webapp",
"version": "2.7.2",
"version": "2.7.3",
"license": "GNU Affero General Public License v3.0",
"scripts": {
"ng": "ng",
......@@ -16,21 +16,21 @@
"test:ci": "ng test --browsers=ChromeHeadlessCI --code-coverage=true --watch=false",
"lint": "ng lint",
"e2e": "ng e2e",
"postinstall": "node patch.js",
"postinstall": "node patch.js && ngcc --properties es2015",
"bundle-report": "webpack-bundle-analyzer dist/stats.json"
},
"private": true,
"dependencies": {
"@angular/animations": "9.1.12",
"@angular/animations": "11.2.5",
"@angular/cdk": "^9.0.0",
"@angular/common": "9.1.12",
"@angular/compiler": "9.1.12",
"@angular/core": "9.1.12",
"@angular/forms": "9.1.12",
"@angular/localize": "~9.1.12",
"@angular/platform-browser": "9.1.12",
"@angular/platform-browser-dynamic": "9.1.12",
"@angular/router": "9.1.12",
"@angular/common": "11.2.5",
"@angular/compiler": "11.2.5",
"@angular/core": "11.2.5",
"@angular/forms": "11.2.5",
"@angular/localize": "~11.2.5",
"@angular/platform-browser": "11.2.5",
"@angular/platform-browser-dynamic": "11.2.5",
"@angular/router": "11.2.5",
"@babel/compat-data": "^7.8.0",
"@turf/centroid": "^5.1.5",
"@turf/helpers": "^6.1.4",
......@@ -49,44 +49,43 @@
"jwt-decode": "^2.2.0",
"lodash.clonedeep": "^4.5.0",
"mapbox-gl": "^1.11.1",
"ng-inline-svg": "^8.2.1",
"ng-lazyload-image": "^5.1.2",
"ngx-cookie-service": "^2.2.0",
"ngx-infinite-scroll": "^10.0.0",
"node-rsa": "^1.0.3",
"rxjs": "^6.5.4",
"tslib": "^1.10.0",
"tslib": "^2.0.0",
"xml2js": "^0.4.19",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.12",
"@angular/cli": "^9.1.12",
"@angular/compiler-cli": "9.1.12",
"@angular/language-service": "9.1.12",
"@types/jasmine": "^2.8.12",
"@angular-devkit/build-angular": "~0.1102.4",
"@angular/cli": "^11.2.4",
"@angular/compiler-cli": "11.2.5",
"@angular/language-service": "11.2.5",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "^2.0.6",
"@types/jwt-decode": "^2.2.1",
"@types/lodash.clonedeep": "^4.5.6",
"@types/mapbox-gl": "^1.7.0",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~2.8.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^5.2.3",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^1.4.3",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~6.2.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-htmlfile-reporter": "^0.3.7",
"karma-jasmine": "^1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng2-mock-component": "0.0.6",
"protractor": "^7.0.0",
"protractor": "~7.0.0",
"rxjs-tslint": "^0.1.8",
"sass-recursive-map-merge": "^1.0.1",
"ts-node": "~4.1.0",
"tslint": "^5.12.1",
"tslint": "~6.1.0",
"tslint-config-airbnb": "^5.11.1",
"typescript": "3.8.3",
"typescript": "4.0.7",
"webpack-bundle-analyzer": "^3.1.0"
}
}
const fs = require('fs');
const f = 'node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/browser.js';
const f = 'node_modules/@angular-devkit/build-angular/src/webpack/configs/browser.js';
fs.readFile(f, 'utf8', function (err,data) {
if (err) {
......@@ -10,4 +10,4 @@ fs.readFile(f, 'utf8', function (err,data) {
fs.writeFile(f, result, 'utf8', function (err) {
if (err) return console.log(err);
});
});
\ No newline at end of file
});
......@@ -14,7 +14,8 @@ export const routes: Routes = [
scrollPositionRestoration: 'enabled',
preloadingStrategy: PreloadAllModules,
anchorScrolling: 'enabled',
})],
relativeLinkResolution: 'legacy'
})],
exports: [RouterModule],
})
export class AppRoutingModule { }
import { TestBed, async } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { MockComponent } from 'ng2-mock-component';
import { RouterTestingModule } from '../../node_modules/@angular/router/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { Angulartics2Module } from 'angulartics2';
import { Angulartics2Piwik } from 'angulartics2/piwik';
import { NavigationHistoryService } from './core/services';
describe('AppComponent', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
AppComponent,
......@@ -25,7 +25,7 @@ describe('AppComponent', () => {
],
}).compileComponents();
}));
it('should create the app', async(() => {
it('should create the app', waitForAsync(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
......
......@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { Angulartics2Piwik } from 'angulartics2/piwik';
import { filter, map } from 'rxjs/operators';
import { ActivatedRoute, NavigationEnd, Router } from '../../node_modules/@angular/router';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { environment } from '../environments/environment';
import { NavigationHistoryService } from './core/services';
import { AppRoutes } from './routes';
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ContactComponent } from './contact.component';
import { ReactiveFormsModule, AbstractControl } from '@angular/forms';
......@@ -50,7 +50,7 @@ describe('ContactComponent', () => {
let text: AbstractControl;
describe('Template', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
ReactiveFormsModule,
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FeedbackComponent } from './feedback.component';
......@@ -6,7 +6,7 @@ describe('FeedbackComponent', () => {
let component: FeedbackComponent;
let fixture: ComponentFixture<FeedbackComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [FeedbackComponent],
})
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { DebugElement } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
......@@ -12,7 +12,7 @@ describe('FooterComponent', () => {
let fixture: ComponentFixture<FooterComponent>;
let de: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
FooterComponent,
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { DebugElement } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
import { HeaderComponent } from './header.component';
......@@ -21,7 +21,7 @@ describe('HeaderComponent', () => {
let fixture: ComponentFixture<HeaderComponent>;
let debugElement: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
HeaderComponent,
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { MainComponent } from './main.component';
......@@ -9,7 +9,7 @@ describe('MainComponent', () => {
let component: MainComponent;
let fixture: ComponentFixture<MainComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
MainComponent,
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { SideMenuComponent } from './side-menu.component';
import { MockComponent } from 'ng2-mock-component';
......@@ -23,7 +23,7 @@ describe('SideMenuComponent', () => {
let component: SideMenuComponent;
let fixture: ComponentFixture<SideMenuComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule.withRoutes([]),
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { NotificationsComponent } from './notifications.component';
import { NotificationService } from '../../services';
......@@ -30,7 +30,7 @@ describe('NotificationsComponent', () => {
let fixture: ComponentFixture<NotificationsComponent>;
let debugElement: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
providers: [
{
......
import { Injectable } from '../../../../node_modules/@angular/core';
import { Injectable } from '@angular/core';
import { Injectable as Injectable_1 } from "@angular/core";
@Injectable_1()
......
......@@ -3,7 +3,7 @@ import { Meta } from '@angular/platform-browser';
import { ActivatedRoute, Router, Scroll } from '@angular/router';
import { Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { ViewportScroller } from '../../../../../node_modules/@angular/common';
import { ViewportScroller } from '@angular/common';
import { environment } from '../../../../environments/environment';
import { datatsetDataRepresentationType, geosource, reusesTypes } from '../../../../i18n/traductions';
import { NavigationHistoryService } from '../../../core/services';
......
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { InlineSVGModule } from 'ng-inline-svg';
//import { InlineSVGModule } from 'ng-inline-svg';
import { InfiniteScrollModule } from 'ngx-infinite-scroll';
import { ElasticsearchModule } from '../elasticsearch/elasticsearch.module';
import { MapModule } from '../map/map.module';
......@@ -21,7 +21,7 @@ import { DatasetDetailServices } from './services';
ReactiveFormsModule,
MapModule,
SharedModule,
InlineSVGModule.forRoot(),
// InlineSVGModule.forRoot(),
InfiniteScrollModule,
],
providers: [...DatasetDetailServices, ...DatasetDetailResolvers],
......
......@@ -17,7 +17,7 @@
<div class="column is-9 filter-title"
*ngIf="aggregation.subAggregations.length < 2 || aggregation.label === 'ATMO Auvergne-Rhône-Alpes'">
<div class="field no-sub">
<input type="checkbox" [(ngModel)]="aggregation.isActive" (click)="changeFilter(aggregation, filter.field)"
<input type="checkbox" [(ngModel)]="aggregation.isActive" (click)="changeFilter(aggregation)"
[disabled]="isLoading || aggregation.count_per_metadata === 0 && aggregation.isActive !== true"
[name]="aggregation.label + '_' + filter.field" class="is-checkradio is-small" [id]="aggregation.key +
'_' + filter.field">
......
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FilterDetailComponent } from './filter-detail.component';
import { DatasetResearchService, ElasticsearchService } from '../../../services';
......@@ -12,7 +12,7 @@ describe('FilterDetailComponent', () => {
let component: FilterDetailComponent;
let fixture: ComponentFixture<FilterDetailComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
FilterDetailComponent,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment