Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/enhance UI #59

Merged
merged 25 commits into from
Mar 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# EbadFront

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.0.
Angular version : 10.1.2
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.2.
Angular version : 11.2.3

## User documentation
[User Guide - English Version](https://github.com/informatique-cdc/ebad-front/wiki/User-Guide---English)

[User Guide - French Version](https://github.com/informatique-cdc/ebad-front/wiki/)

## Development server
Expand Down
2 changes: 0 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -59,7 +58,6 @@
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}

]
}
}
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/ebad/explore-files.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ context('Folders', () => {
// cy.server();
// cy.route({
// method: 'GET',
// url: '/ebad/applications/gestion?page=0&size=10&sort=name,asc&name=ApplicationTest',
// url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name=ApplicationTest',
// }).as('searchApplicationTest');
//
// cy.login({login: this.login.admin.login, password: this.login.admin.password});
Expand Down
14 changes: 7 additions & 7 deletions cypress/integration/ebad/manage-application.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ context('Applications', () => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications/gestion?page=0&size=10&sort=name,asc&name=ApplicationTest',
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name=ApplicationTest',
}).as('searchApplicationTest');

cy.login({login: this.login.admin.login, password: this.login.admin.password});
Expand All @@ -48,16 +48,16 @@ context('Applications', () => {
cy.get('@lines').should('have.length', 2);

cy.get('@lines').eq(0).children('td').as('line1');
cy.get('@line1').eq(0).should('contain.text', 'AT1');
cy.get('@line1').eq(1).should('contain.text', 'ApplicationTest1');
cy.get('@line1').eq(2).should('contain.text', 'yyyyMMdd');
cy.get('@line1').eq(1).should('contain.text', 'AT1');
cy.get('@line1').eq(2).should('contain.text', 'ApplicationTest1');
cy.get('@line1').eq(3).should('contain.text', 'yyyyMMdd');
cy.get('@line1').eq(4).should('contain.text', 'yyyyMMdd');

cy.get('@lines').eq(1).children('td').as('line2');
cy.get('@line2').eq(0).should('contain.text', 'AT2');
cy.get('@line2').eq(1).should('contain.text', 'ApplicationTest2');
cy.get('@line2').eq(2).should('contain.text', 'ddMMyyyy');
cy.get('@line2').eq(1).should('contain.text', 'AT2');
cy.get('@line2').eq(2).should('contain.text', 'ApplicationTest2');
cy.get('@line2').eq(3).should('contain.text', 'ddMMyyyy');
cy.get('@line2').eq(4).should('contain.text', 'ddMMyyyy');


cy.deleteApplication({codeAppli: 'AT1', name: 'ApplicationTest1'});
Expand Down
11 changes: 6 additions & 5 deletions cypress/integration/ebad/manage-environnement.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ context('Gestion Environnement', () => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=10&sort=id,asc&name=',
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
}).as('searchEnvironments');

cy.login({login: this.login.admin.login, password: this.login.admin.password})
.addEnvironnement({applicationName: 'ApplicationCyEnv1', name: 'ProductionCy', host: 'myhost.com', login: 'batch', homePath: '/home/batch', prefix: 'P', norme: 'Linux'})
.addEnvironnement({applicationName: 'ApplicationCyEnv1', name: 'QACy', host: 'myhost-qa.com', login: 'batch', homePath: '/home/batch', prefix: 'Q', norme: 'Linux'});
.addEnvironnement({applicationName: 'ApplicationCyEnv1', name: 'ProductionCy', host: 'myhost.com', login: 'batch', homePath: '/home/batch', prefix: 'P', norme: 'LinuxEnvCy'})
.addEnvironnement({applicationName: 'ApplicationCyEnv1', name: 'QACy', host: 'myhost-qa.com', login: 'batch', homePath: '/home/batch', prefix: 'Q', norme: 'LinuxEnvCy'});


cy.visit('http://localhost:4200');
Expand All @@ -81,18 +81,19 @@ context('Gestion Environnement', () => {

cy.deleteEnvironnement({applicationName: 'ApplicationCyEnv1', environnementName: 'ProductionCy'});
cy.deleteEnvironnement({applicationName: 'ApplicationCyEnv1', environnementName: 'QACy'});
cy.de
});


it('Modifier un environnement', function () {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=10&sort=id,asc&name=',
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
}).as('getEnvironments');

cy.login({login: this.login.admin.login, password: this.login.admin.password})
.addEnvironnement({applicationName: 'ApplicationCyEnv1', name: 'Production', host: 'myhost.com', login: 'batch', homePath: '/home/batch', prefix: 'P', norme: 'Linux'});
.addEnvironnement({applicationName: 'ApplicationCyEnv1', name: 'Production', host: 'myhost.com', login: 'batch', homePath: '/home/batch', prefix: 'P', norme: 'LinuxEnvCy'});

cy.updateEnvironnement({
applicationName: 'ApplicationCyEnv1',
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/ebad/manage-norme.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ context('Norms', () => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/norms?page=0&size=10&sort=name,asc&name=TestCy',
url: '/ebad/norms?page=0&size=*&sort=name,asc&name=TestCy',
}).as('searchNormeTest');

cy.login({login: this.login.admin.login, password: this.login.admin.password})
Expand Down Expand Up @@ -59,7 +59,7 @@ context('Norms', () => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/norms?page=0&size=10&sort=name,asc&name=TestUpCyLinuxNew',
url: '/ebad/norms?page=0&size=*&sort=name,asc&name=TestUpCyLinuxNew',
}).as('searchNormeTest');

cy.login({login: this.login.admin.login, password: this.login.admin.password})
Expand Down
8 changes: 4 additions & 4 deletions cypress/support/application.commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Cypress.Commands.add("deleteApplication", ({codeAppli, name}) => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications/gestion?page=0&size=10&sort=name,asc&name='+name,
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+name,
}).as('searchApplication');
cy.route({
method: 'DELETE',
Expand Down Expand Up @@ -79,7 +79,7 @@ Cypress.Commands.add("addUserToApplication", ({codeAppli, nameAppli,firstname, l
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications/gestion?page=0&size=10&sort=name,asc&name='+nameAppli,
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameAppli,
}).as('searchApplication');

cy.route({
Expand All @@ -105,12 +105,12 @@ Cypress.Commands.add("addManagerToApplication", ({codeAppli, nameAppli, firstnam
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications/gestion?page=0&size=10&sort=name,asc&name='+nameAppli,
url: '/ebad/applications/gestion?page=0&size=*&sort=name,asc&name='+nameAppli,
}).as('searchApplication');

cy.route({
method: 'GET',
url: '/ebad/users?page=0&size=20&login='+firstname,
url: '/ebad/users?page=0&size=*&login='+firstname,
}).as('searchUser');

cy.get('#administrationMenu').click();
Expand Down
8 changes: 4 additions & 4 deletions cypress/support/environnement.commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Cypress.Commands.add("deleteEnvironnement", ({applicationName, environnementName
cy.server();
cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=10&sort=id,asc&name=',
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
}).as('getEnvironments');

cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=10&sort=id,asc&name='+environnementName,
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name='+environnementName,
}).as('searchEnvironment');

cy.route({
Expand Down Expand Up @@ -62,12 +62,12 @@ Cypress.Commands.add("updateEnvironnement", ({
cy.server();
cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=10&sort=id,asc&name=',
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name=',
}).as('getEnvironments');

cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=10&sort=id,asc&name='+environnementNameToUpdate,
url: '/ebad/environments?applicationId=**&page=0&size=*&sort=id,asc&name='+environnementNameToUpdate,
}).as('searchEnvironment');

cy.route({
Expand Down
14 changes: 7 additions & 7 deletions cypress/support/files.commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Cypress.Commands.add("selectFolder", ({appliName, envName, directoryName}) => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications?page=0&size=100',
url: '/ebad/applications?page=0&size=*0',
}).as('getApplications');

cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=100&sort=name,asc',
url: '/ebad/environments?applicationId=**&page=0&size=*0&sort=name,asc',
}).as('getEnvironments');

cy.route({
Expand All @@ -34,12 +34,12 @@ Cypress.Commands.add("addFolder", ({appliName, envName, directoryName, path}) =>
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications/write?page=0&size=100',
url: '/ebad/applications/write?page=0&size=*0',
}).as('getApplications');

cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=100&sort=name,asc',
url: '/ebad/environments?applicationId=**&page=0&size=*0&sort=name,asc',
}).as('getEnvironments');

cy.route({
Expand Down Expand Up @@ -68,12 +68,12 @@ Cypress.Commands.add("deleteFolder", ({appliName, envName, directoryName}) => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/applications/write?page=0&size=100',
url: '/ebad/applications/write?page=0&size=*0',
}).as('getApplications');

cy.route({
method: 'GET',
url: '/ebad/environments?applicationId=**&page=0&size=100&sort=name,asc',
url: '/ebad/environments?applicationId=**&page=0&size=*0&sort=name,asc',
}).as('getEnvironments');

cy.route({
Expand All @@ -88,7 +88,7 @@ Cypress.Commands.add("deleteFolder", ({appliName, envName, directoryName}) => {

cy.route({
method: 'GET',
url: '/ebad/directories/env/**?page=0&size=10&sort=id,asc&name='+directoryName,
url: '/ebad/directories/env/**?page=0&size=*&sort=id,asc&name='+directoryName,
}).as('searchFolder');

cy.get('#managementMenu').click();
Expand Down
4 changes: 2 additions & 2 deletions cypress/support/norme.commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Cypress.Commands.add("deleteNorme", ({name}) => {
cy.server();
cy.route({
method: 'GET',
url: '/ebad/norms?page=0&size=10&sort=name,asc&name='+name,
url: '/ebad/norms?page=0&size=*&sort=name,asc&name='+name,
}).as('searchNorme');

cy.get('#administrationMenu').click();
Expand All @@ -31,7 +31,7 @@ Cypress.Commands.add("updateNorme", ({nameToUpdate, name, interpreteur, shellFol
cy.server();
cy.route({
method: 'GET',
url: '/ebad/norms?page=0&size=10&sort=name,asc&name='+nameToUpdate,
url: '/ebad/norms?page=0&size=*&sort=name,asc&name='+nameToUpdate,
}).as('searchNorme');
cy.route({
method: 'PATCH',
Expand Down
Loading