f62c77d5f294c2b6b235e3363246aab5f26970ea to 8d1ff5f445aa0a9e95d1d5b8f8f9df74348d3a56 · web-et-numerique / Factory / Resin / Client

Some changes are not shown.

For a faster browsing experience, only 100 of 151 files are shown. Download one of the files below to see all changes.

.eslintignore

0 → 100644

+8 −0

Original line number	Original line	Diff line number	Diff line
			.angular/
			.git/
			.idea/
			.vscode/
			build/
			coverage/
			dist/
			node_modules/
			No newline at end of file

.eslintrc.json

0 → 100644

+37 −0

Original line number	Original line	Diff line number	Diff line
			{
			"root": true,
			"ignorePatterns": ["projects/*/"],
			"overrides": [
			{
			"files": ["*.ts"],
			"parserOptions": {
			"project": ["tsconfig.json"],
			"createDefaultProgram": true
			},
			"extends": ["plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates"],
			"rules": {
			"@angular-eslint/directive-selector": [
			"error",
			{
			"type": "attribute",
			"prefix": "app",
			"style": "camelCase"
			}
			],
			"@angular-eslint/component-selector": [
			"error",
			{
			"type": "element",
			"prefix": "app",
			"style": "kebab-case"
			}
			]
			}
			},
			{
			"files": ["*.html"],
			"extends": ["plugin:@angular-eslint/template/recommended"],
			"rules": {}
			}
			]
			}

.gitignore

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,5 @@ api/db.json
	# Documentation generated with compodoc		# Documentation generated with compodoc
	documentation		documentation

	CHANGELOG.md		# External libs
			/projects
	package-lock.json

.gitlab/merge_request_templates/default.md

+14 −11

Original line number	Original line	Diff line number	Diff line
			\| :triangular_flag_on_post: Give your MR the same name that the desired squash commit. In doubt, check the conventional commit [doc](https://www.conventionalcommits.org/en/v1.0.0/).\|
			\| --- \|

	## What does this MR do and why?		## What does this MR do and why?

	_Describe in detail what your merge request does and why._		_Describe in detail what your merge request does and why._

	\| :warning: Keep an up to date checklist based on your icescrum tasks during all the draft phase to help any other developer who would take the job after you to finish it. \|		\| :warning: Keep an up to date checklist based on your icescrum tasks during all the draft phase of the MR to help any other developer who would take the job after you to finish it.\|
	\| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- \|		\| --- \|


	## Screenshots or screen recordings		## Screenshots or screen recordings

	_These are strongly recommended to assist reviewers and reduce the time to merge your change._		_These are strongly recommended to assist reviewers and reduce the time to merge your change._


	## How to set up and validate locally (or on alpha)		## How to set up and validate locally (or on alpha)

	_List all steps to set up and validate the changes on local environment._		_List all steps to set up and validate the changes on local environment._

	## MR acceptance checklist		## MR acceptance checklist

	_To be completed by the chosen reviewer._		_To be completed by the chosen reviewer._

	<!---		<!---
	@@ -25,9 +27,10 @@ More reading on checklists can be found in the "Checklist Manifesto": http://atu
	"It is common to misconceive how checklists function in complex lines of work. They are not comprehensive how-to guides, whether for building a skyscraper or getting a plane out of trouble. They are quick and simple tools aimed to buttress the skills of expert professionals." - Gawande, Atul. The Checklist Manifesto		"It is common to misconceive how checklists function in complex lines of work. They are not comprehensive how-to guides, whether for building a skyscraper or getting a plane out of trouble. They are quick and simple tools aimed to buttress the skills of expert professionals." - Gawande, Atul. The Checklist Manifesto
	--->		--->


	### Quality		### Quality

	- [ ] Confirmed		* [ ] Confirmed

	1. For the code that this change impacts, I believe that the automated tests validate functionality that is highly important to users. If the existing automated tests do not cover this functionality, I have added the necessary additional tests or I have added an issue to describe the automation testing gap and linked it to this MR.		1. For the code that this change impacts, I believe that the automated tests validate functionality that is highly important to users. If the existing automated tests do not cover this functionality, I have added the necessary additional tests or I have added an issue to describe the automation testing gap and linked it to this MR.
	1. I have made sure that the sonar quality coverage is up to standards.		1. I have made sure that the sonar quality coverage is up to standards.
	@@ -37,26 +40,26 @@ More reading on checklists can be found in the "Checklist Manifesto": http://atu

	### Performance, reliability and availability		### Performance, reliability and availability

	- [ ] Confirmed		* [ ] Confirmed

	1. I am confident that this MR does not harm performance, or I have asked a reviewer to help assess the performance impact.		1. I am confident that this MR does not harm performance, or I have asked a reviewer to help assess the performance impact.
	1. I have considered the scalability risk based on future predicted growth.		1. I have considered the scalability risk based on future predicted growth.

	### Documentation		### Documentation

	- [ ] Confirmed		* [ ] Confirmed

	1. I have prepared a squash commit to feed the changelog linked to the current milestone.		1. The MR is named after the desired squash commit to feed the changelog linked to the current milestone.
	1. I have added/updated documentation (also updated if the changes feature a deprecation) or I have decided that documentation changes are not needed for this MR.		1. I have added/updated documentation (also updated if the changes feature a deprecation) or I have decided that documentation changes are not needed for this MR.

	### Security		### Security

	- [ ] Confirmed		* [ ] Confirmed

	1. I have confirmed that if this MR does not contains any sensitive informations hidden in the changes.		1. I have confirmed that if this MR does not contains any sensitive informations hidden in the changes.

	### Deployment		### Deployment

	- [ ] Confirmed		* [ ] Confirmed

	1. When featured on a self-data project release, i have made sure my app version in the manifest and package.json is incremented and any relative changes to the permissions are clearly written and transmitted to Cozy.		1. When featured on a self-data project release, i have made sure my app version in the manifest and package.json is incremented and any relative changes to the permissions are clearly written and transmitted to Cozy.

Dockerfile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@ RUN npm install --silent
	COPY angular.json .		COPY angular.json .
	COPY tsconfig.json .		COPY tsconfig.json .
	COPY tsconfig.app.json .		COPY tsconfig.app.json .
			COPY tsconfig.base.json .
	COPY ngsw-config.json .		COPY ngsw-config.json .
	COPY /nginx/nginx.conf .		COPY /nginx/nginx.conf .
	COPY /src ./src		COPY /src ./src

angular.json

+198 −158

Original line number	Original line	Diff line number	Diff line
	@@ -152,6 +152,46 @@
	}		}
	}		}
	}		}
			},
			"@gouvfr-anct/mediation-numerique": {
			"projectType": "library",
			"root": "projects/gouvfr-anct/mediation-numerique",
			"sourceRoot": "projects/gouvfr-anct/mediation-numerique/src",
			"prefix": "lib",
			"architect": {
			"build": {
			"builder": "@angular-devkit/build-angular:ng-packagr",
			"options": {
			"project": "projects/gouvfr-anct/mediation-numerique/ng-package.json"
			},
			"configurations": {
			"production": {
			"tsConfig": "projects/gouvfr-anct/mediation-numerique/tsconfig.lib.prod.json"
			},
			"development": {
			"tsConfig": "projects/gouvfr-anct/mediation-numerique/tsconfig.lib.json"
			}
			},
			"defaultConfiguration": "production"
			},
			"test": {
			"builder": "@angular-builders/jest:run",
			"options": {
			"configPath": "jest.config.js",
			"tsConfig": "tsconfig.spec.json",
			"scripts": []
			}
			},
			"lint": {
			"builder": "@angular-eslint/builder:lint",
			"options": {
			"lintFilePatterns": [
			"projects/gouvfr-anct/mediation-numerique/src/*/.ts",
			"projects/gouvfr-anct/mediation-numerique/src/*/.html"
			]
			}
			}
			}
	}		}
	},		},
	"defaultProject": "pamn"		"defaultProject": "pamn"

jest.config.js

0 → 100644

+7 −0

Original line number	Original line	Diff line number	Diff line
			module.exports = {
			preset: 'jest-preset-angular',
			setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
			moduleNameMapper: {
			'@gouvfr-anct/(.*)': '<rootDir>/dist/@gouvfr-anct/$1',
			},
			};

jest.setup.ts

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			import 'jest-preset-angular/jest-preset';

package-lock.json

+10267 −5073

File changed.

Preview size limit exceeded, changes collapsed.

package.json

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,13 +22,14 @@
	"@angular/common": "~13.1.1",		"@angular/common": "~13.1.1",
	"@angular/compiler": "~13.1.1",		"@angular/compiler": "~13.1.1",
	"@angular/core": "~13.1.1",		"@angular/core": "~13.1.1",
	"@angular/flex-layout": "^10.0.0-beta.32",		"@angular/flex-layout": "^13.0.0-beta.38",
	"@angular/forms": "~13.1.1",		"@angular/forms": "~13.1.1",
	"@angular/platform-browser": "~13.1.1",		"@angular/platform-browser": "~13.1.1",
	"@angular/platform-browser-dynamic": "~13.1.1",		"@angular/platform-browser-dynamic": "~13.1.1",
	"@angular/router": "~13.1.1",		"@angular/router": "~13.1.1",
	"@angular/service-worker": "~13.1.1",		"@angular/service-worker": "~13.1.1",
	"@asymmetrik/ngx-leaflet": "^8.1.0",		"@asymmetrik/ngx-leaflet": "^8.1.0",
			"@gouvfr-anct/mediation-numerique": "^0.0.17",
	"@ngx-translate/core": "^13.0.0",		"@ngx-translate/core": "^13.0.0",
	"ag-grid-angular": "^26.2.0",		"ag-grid-angular": "^26.2.0",
	"ag-grid-community": "^26.2.1",		"ag-grid-community": "^26.2.1",
	@@ -43,29 +44,44 @@
	"zone.js": "~0.11.4"		"zone.js": "~0.11.4"
	},		},
	"devDependencies": {		"devDependencies": {
			"@angular-builders/jest": "^13.0.3",
	"@angular-devkit/build-angular": "^13.2.1",		"@angular-devkit/build-angular": "^13.2.1",
			"@angular-eslint/builder": "^13.2.1",
			"@angular-eslint/eslint-plugin": "^13.2.1",
			"@angular-eslint/eslint-plugin-template": "^13.2.1",
			"@angular-eslint/schematics": "^13.2.1",
			"@angular-eslint/template-parser": "^13.2.1",
	"@angular/cli": "^13.1.2",		"@angular/cli": "^13.1.2",
	"@angular/compiler-cli": "~13.1.1",		"@angular/compiler-cli": "~13.1.1",
	"@angular/localize": "^13.1.1",		"@angular/localize": "^13.1.1",
	"@compodoc/compodoc": "^1.1.16",		"@compodoc/compodoc": "^1.1.16",
	"@types/jasmine": "~4.0.0",		"@types/jasmine": "~4.0.0",
	"@types/jasminewd2": "~2.0.3",		"@types/jasminewd2": "~2.0.3",
			"@types/jest": "^27.5.0",
	"@types/leaflet": "^1.5.17",		"@types/leaflet": "^1.5.17",
	"@types/leaflet.locatecontrol": "^0.60.7",		"@types/leaflet.locatecontrol": "^0.60.7",
	"@types/node": "^16.0.0",		"@types/node": "^16.0.0",
			"@typescript-eslint/eslint-plugin": "^5.24.0",
			"@typescript-eslint/parser": "^5.24.0",
	"codelyzer": "^6.0.0",		"codelyzer": "^6.0.0",
			"eslint": "^8.15.0",
			"eslint-plugin-jest": "^26.2.2",
	"http-server": "^14.1.0",		"http-server": "^14.1.0",
	"jasmine-core": "~4.1.0",		"jasmine-core": "~4.1.0",
	"jasmine-spec-reporter": "~5.0.0",		"jasmine-spec-reporter": "~5.0.0",
			"jest": "^27.5.1",
			"jest-preset-angular": "^11.1.2",
	"karma": "^6.3.9",		"karma": "^6.3.9",
	"karma-browserify": "^7.0.0",		"karma-browserify": "^7.0.0",
	"karma-chrome-launcher": "~3.1.0",		"karma-chrome-launcher": "~3.1.0",
	"karma-coverage-istanbul-reporter": "~3.0.2",		"karma-coverage-istanbul-reporter": "~3.0.2",
	"karma-jasmine": "~4.0.0",		"karma-jasmine": "~4.0.0",
	"karma-jasmine-html-reporter": "^1.5.0",		"karma-jasmine-html-reporter": "^1.5.0",
			"ng-packagr": "^13.0.0",
	"prettier": "^2.1.2",		"prettier": "^2.1.2",
	"protractor": "~7.0.0",		"protractor": "~7.0.0",
	"standard-version": "^9.3.2",		"standard-version": "^9.3.2",
			"ts-jest": "^27.1.4",
	"ts-node": "~8.3.0",		"ts-node": "~8.3.0",
	"tslint": "~6.1.0",		"tslint": "~6.1.0",
	"typescript": "~4.5.4"		"typescript": "~4.5.4"

src/app/app-routing.module.ts

+5 −17

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,6 @@ import { OrientationFormComponent } from './form/orientation-form/orientation-fo
	import { AdminGuard } from './guards/admin.guard';		import { AdminGuard } from './guards/admin.guard';
	import { AuthGuard } from './guards/auth.guard';		import { AuthGuard } from './guards/auth.guard';
	import { LoginGuard } from './guards/login.guard';		import { LoginGuard } from './guards/login.guard';
	import { DeactivateGuard } from './guards/deactivate.guard';
	import { LegalNoticeComponent } from './legal-notice/legal-notice.component';		import { LegalNoticeComponent } from './legal-notice/legal-notice.component';
	import { LoginComponent } from './login/login.component';		import { LoginComponent } from './login/login.component';
	import { NewsletterSubscriptionComponent } from './newsletter-subscription/newsletter-subscription.component';		import { NewsletterSubscriptionComponent } from './newsletter-subscription/newsletter-subscription.component';
	@@ -18,10 +17,9 @@ import { ResetEmailComponent } from './reset-email/reset-email.component';
	import { ResetPasswordComponent } from './reset-password/reset-password.component';		import { ResetPasswordComponent } from './reset-password/reset-password.component';
	import { StructureResolver } from './resolvers/structure.resolver';		import { StructureResolver } from './resolvers/structure.resolver';
	import { PasswordFormComponent } from './shared/components';		import { PasswordFormComponent } from './shared/components';
	import { StructureJoinComponent } from './structure/structure-join/structure-join.component';		import { StructureDetailsWrapperComponent } from './structure/components/structure-details-wrapper/structure-details-wrapper.component';
	import { StructureDetailsComponent } from './structure-list/components/structure-details/structure-details.component';
	import { StructureListComponent } from './structure-list/structure-list.component';
	import { StructureExcludeComponent } from './structure/structure-exclude/structure-exclude.component';		import { StructureExcludeComponent } from './structure/structure-exclude/structure-exclude.component';
			import { StructureJoinComponent } from './structure/structure-join/structure-join.component';

	const footerOutletRoute: Route = {		const footerOutletRoute: Route = {
	path: '',		path: '',
	@@ -33,7 +31,7 @@ const routes: Routes = [
	{		{
	path: 'print',		path: 'print',
	outlet: 'print',		outlet: 'print',
	children: [{ path: 'structure', component: StructureDetailsComponent }, footerOutletRoute],		children: [{ path: 'structure', component: StructureDetailsWrapperComponent }, footerOutletRoute],
	},		},
	{		{
	path: 'print',		path: 'print',
	@@ -60,7 +58,7 @@ const routes: Routes = [
	{		{
	path: '',		path: '',
	outlet: 'left-pane',		outlet: 'left-pane',
	component: StructureDetailsComponent,		component: StructureDetailsWrapperComponent,
	},		},
	],		],
	},		},
	@@ -74,16 +72,6 @@ const routes: Routes = [
	footerOutletRoute,		footerOutletRoute,
	],		],
	},		},
	{
	path: 'structures',
	children: [
	{
	path: '',
	component: StructureListComponent,
	},
	footerOutletRoute,
	],
	},
	{		{
	path: 'legal-notice',		path: 'legal-notice',
	children: [		children: [
	@@ -152,7 +140,7 @@ const routes: Routes = [
	path: '',		path: '',
	outlet: 'left-pane',		outlet: 'left-pane',
	data: { fullScreen: true },		data: { fullScreen: true },
	component: StructureDetailsComponent,		component: StructureDetailsWrapperComponent,
	},		},
	],		],
	},		},

src/app/app.component.ts

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,6 @@ import { ProfileService } from './profile/services/profile.service';
	import { AuthService } from './services/auth.service';		import { AuthService } from './services/auth.service';
	import { RouterListenerService } from './services/routerListener.service';		import { RouterListenerService } from './services/routerListener.service';
	import { UpdateService } from './services/update.service';		import { UpdateService } from './services/update.service';
	import { PrintService } from './shared/service/print.service';

	@Component({		@Component({
	selector: 'app-root',		selector: 'app-root',
	@@ -16,7 +15,6 @@ export class AppComponent implements OnInit {
	public loading = true;		public loading = true;

	constructor(		constructor(
	public printService: PrintService,
	private authService: AuthService,		private authService: AuthService,
	private profilService: ProfileService,		private profilService: ProfileService,
	private routerListener: RouterListenerService,		private routerListener: RouterListenerService,

Compare revisions

Source

Target

Commits on Source 3

Files

Some changes are not shown.

.eslintignore

.eslintrc.json

.gitignore

.gitlab/merge_request_templates/default.md

Dockerfile

angular.json

jest.config.js

jest.setup.ts

package-lock.json

package.json

src/app/app-routing.module.ts

src/app/app.component.ts