From 5d8da748924efc50a689a7acd6c621ad717eb8e7 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 28 Sep 2020 15:44:01 +0200 Subject: [PATCH 01/76] Remove pull request template --- PULL_REQUEST_TEMPLATE.adoc | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 PULL_REQUEST_TEMPLATE.adoc diff --git a/PULL_REQUEST_TEMPLATE.adoc b/PULL_REQUEST_TEMPLATE.adoc deleted file mode 100644 index 75ab641fa5..0000000000 --- a/PULL_REQUEST_TEMPLATE.adoc +++ /dev/null @@ -1,28 +0,0 @@ -Please read through the checklist below to make sure that you haven't forgotten anything before submitting your PR. -Then, remove the text and replace it with the information and comments that should go into the release notes. - -// tag::review_checklist[] -* The PR comment contains a brief explanation of the impact of these developments, and a pointer -to the relevant documentation if need be. Otherwise, it should why this development doesn't need -to be on the release notes. -* Check that Travis build is passing (for both branch and PR) -* Check that the base branch (i.e. the branch into which we want to merge changes) is correct: for feature branches -pull requests, this branch should be `develop`. -* Look through changed files to make sure everything is relevant to the PR (no mistakenly added changes, -no secret information, no malicious changes) and to see if you have remarks on the way things are implemented -* Check that the commit(s) message(s) is(are) relevant and follow conventions ([OC-XXX] ... ) -* If there is more than one commit, is it meaningful or do we need to squash ? -* Meaningful and sufficient unit tests for the backend (80% coverage is the threshold) -* Meaningful unit tests for the frontend (Angular tests can be complex to implement, we should focus on testing complex -logic and not the framework itself) -* Check Sonar analysis on SonarCloud to see if Sonar reports any bugs or code smells on the new code -* API testing via Karate has been updated -* Cypress UI tests have been updated -* Documentation has been updated (especially if configuration is needed) -* Configuration examples have been updated (both for dev and docker) -* Build and run OpFab locally to see the new feature or bug fix at work. In the case of a new feature, it's also a way -of making sure that the configuration documentation is correct and easily understandable. -* Depending on the scope of the PR , build docker images and test in docker mode -* Check that the copyright header has been updated on the changed files if need be, and in the case of a first-time - contributor, make sure they're added to the AUTHORS.txt file. -// end::review_checklist[] From 52726a30db5507b44b06e4a3a631f9b632caf4dd Mon Sep 17 00:00:00 2001 From: techrain Date: Mon, 28 Sep 2020 16:30:06 +0200 Subject: [PATCH 02/76] [OC-411] Remove unused property deletionDate Signed-off-by: techrain --- .../consultation/model/ArchivedCardConsultationData.java | 3 --- .../cards/consultation/model/CardConsultationData.java | 2 -- .../cards/publication/model/ArchivedCardPublicationData.java | 2 -- .../cards/publication/model/CardPublicationData.java | 2 -- .../core/cards-publication/src/main/modeling/swagger.yaml | 5 ----- .../cards/publication/services/CardProcessServiceShould.java | 4 ++-- src/docs/asciidoc/reference_doc/card_structure.adoc | 4 ---- src/test/utils/karate/Action/createCardActionLttd.feature | 4 ---- src/test/utils/karate/cards/push_action_card.feature | 5 ----- 9 files changed, 2 insertions(+), 29 deletions(-) diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/ArchivedCardConsultationData.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/ArchivedCardConsultationData.java index 0219a6a2e6..47b6421182 100644 --- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/ArchivedCardConsultationData.java +++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/ArchivedCardConsultationData.java @@ -53,9 +53,6 @@ public class ArchivedCardConsultationData implements Card { private I18n summary; @CreatedDate private Instant publishDate; - @Transient - @JsonInclude(JsonInclude.Include.NON_NULL) - private Instant deletionDate; private Instant lttd; @Indexed private Instant startDate; diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/CardConsultationData.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/CardConsultationData.java index 5589c9e039..592247d717 100644 --- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/CardConsultationData.java +++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/model/CardConsultationData.java @@ -53,8 +53,6 @@ public class CardConsultationData implements Card { private I18n summary; @CreatedDate private Instant publishDate; - @JsonInclude(JsonInclude.Include.NON_NULL) - private Instant deletionDate; private Instant lttd; @Indexed private Instant startDate; diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java index a922c6bebd..3968fea719 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/ArchivedCardPublicationData.java @@ -52,8 +52,6 @@ public class ArchivedCardPublicationData implements Card { private I18n summary; @CreatedDate private Instant publishDate; - @Transient - private Instant deletionDate; private Instant lttd; @Indexed diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java index bb66de4723..0d482cf6c3 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/model/CardPublicationData.java @@ -67,8 +67,6 @@ public class CardPublicationData implements Card { private I18n summary; @CreatedDate private Instant publishDate; - @JsonInclude(JsonInclude.Include.NON_NULL) - private Instant deletionDate; private Instant lttd; @Indexed diff --git a/services/core/cards-publication/src/main/modeling/swagger.yaml b/services/core/cards-publication/src/main/modeling/swagger.yaml index f76c7a2840..9ab7545d02 100755 --- a/services/core/cards-publication/src/main/modeling/swagger.yaml +++ b/services/core/cards-publication/src/main/modeling/swagger.yaml @@ -311,10 +311,6 @@ definitions: $ref: '#/definitions/EpochDate' description: The date the card was published (meaning created by the card service) readOnly: true - deletionDate: - $ref: '#/definitions/EpochDate' - description: The date the card was deleted - readOnly: true lttd: $ref: '#/definitions/EpochDate' description: >- @@ -413,7 +409,6 @@ definitions: processInstanceId: MyProcess_001 state: started publishDate: 1546300800000 - deletionDate: 1546388200000 lttd: 1546387230000 startDate: 1546387200000 endDate: 1546387250000 diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java index 1caa8bccf6..2b820e711a 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java @@ -337,7 +337,7 @@ void preserveData() { .summary(I18nPublicationData.builder().key("summary").parameter("arg1", "value1") .build()) .endDate(start.plusSeconds(60)).lttd(start.minusSeconds(600)) - .deletionDate(start.plusSeconds(3600)).tag("tag1").tag("tag2").data(data) + .tag("tag1").tag("tag2").data(data) .recipient(RecipientPublicationData.builder().type(RecipientEnum.UNION) .recipient(RecipientPublicationData.builder().type(RecipientEnum.USER) .identity("graham").build()) @@ -356,7 +356,7 @@ void preserveData() { ArchivedCardPublicationData archivedPersistedCard = archiveRepository.findById(newCard.getUid()) .block(); - assertThat(archivedPersistedCard).isEqualToIgnoringGivenFields(newCard, "parentCardUid", "uid", "id", "deletionDate", + assertThat(archivedPersistedCard).isEqualToIgnoringGivenFields(newCard, "parentCardUid", "uid", "id", "actions", "timeSpans"); assertThat(archivedPersistedCard.getId()).isEqualTo(newCard.getUid()); assertThat(testCardReceiver.getCardQueue().size()).isEqualTo(1); diff --git a/src/docs/asciidoc/reference_doc/card_structure.adoc b/src/docs/asciidoc/reference_doc/card_structure.adoc index f628ebd0f8..2657d6a32c 100644 --- a/src/docs/asciidoc/reference_doc/card_structure.adoc +++ b/src/docs/asciidoc/reference_doc/card_structure.adoc @@ -123,10 +123,6 @@ State id of the associated process, determined by `OperatorFabric` can be set ar Indicates when the card has been registered in `OperatorFabric` system. This is a technical information exclusively managed by `OperatorFabric`. -==== Deletion Date (`deletionDate°) - -Indicates when the card has been removes from `OperatorFabric` system. Technical information manage by `OperatorFabric`. - == User destined Information of the card There are two kind of User destined information in a card. Some are restricted to the card format, others are defined by the publisher as long as there are encoded in `json` format. diff --git a/src/test/utils/karate/Action/createCardActionLttd.feature b/src/test/utils/karate/Action/createCardActionLttd.feature index 9d6e92884f..8965cee305 100644 --- a/src/test/utils/karate/Action/createCardActionLttd.feature +++ b/src/test/utils/karate/Action/createCardActionLttd.feature @@ -39,7 +39,6 @@ Scenario: Create a card with a valid lttd conditions "processInstanceId": "processInstanceId1", "state": "response_full", "publishDate": startDate, - "deletionDate": null, "lttd": lttd, "startDate": startDate, "endDate": endDate, @@ -134,7 +133,6 @@ Scenario: Create a card - entity of enitiesAllowedToRepond in the card not matc "processInstanceId": "processInstanceId2", "state": "response_full", "publishDate": startDate, - "deletionDate": null, "lttd": lttd, "startDate": startDate, "endDate": endDate, @@ -226,7 +224,6 @@ Scenario: Create a card - with expired lttd "processInstanceId": "processInstanceId3", "state": "response_full", "publishDate": startDate, - "deletionDate": null, "lttd": lttd, "startDate": startDate, "endDate": endDate, @@ -319,7 +316,6 @@ Scenario: Create a card - with expired lttd "processInstanceId": "processInstanceId4", "state": "response_full", "publishDate": startDate, - "deletionDate": null, "startDate": startDate, "endDate": endDate, "severity": "ACTION", diff --git a/src/test/utils/karate/cards/push_action_card.feature b/src/test/utils/karate/cards/push_action_card.feature index 5c2c5eeb2b..a158f55f0a 100644 --- a/src/test/utils/karate/cards/push_action_card.feature +++ b/src/test/utils/karate/cards/push_action_card.feature @@ -20,7 +20,6 @@ Feature: Cards "processInstanceId": "processInstanceId1", "state": "response_full", "publishDate": 1589376144000, - "deletionDate": null, "lttd": 1596042927, "startDate": 1589580000000, "endDate": 1590184800000, @@ -85,7 +84,6 @@ Feature: Cards "processInstanceId": "processInstanceId2", "state": "btnColor_missing", "publishDate": 1589376144000, - "deletionDate": null, "lttd": 1583733121994, "startDate": 1589580000000, "endDate": 1590184800000, @@ -150,7 +148,6 @@ Feature: Cards "processInstanceId": "processInstanceId3", "state": "btnText_missing", "publishDate": 1589376144000, - "deletionDate": null, "lttd": 1583733121997, "startDate": 1589580000000, "endDate": 1590184800000, @@ -215,7 +212,6 @@ Feature: Cards "processInstanceId": "processInstanceId4", "state": "btnColor_btnText_missings", "publishDate": 1589376144000, - "deletionDate": null, "lttd": 1583733121998, "startDate": 1589580000000, "endDate": 1590184800000, @@ -279,7 +275,6 @@ Feature: Cards "processInstanceId": "processInstanceId1", "state": "response_full", "publishDate": 1589376144000, - "deletionDate": null, "lttd": 1583733121999, "startDate": 1589580000000, "endDate": 1590184800000, From 99d6cc652ac5ab9a0aa3701ea9e6f1f240d85bc2 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 17 Sep 2020 16:20:46 +0200 Subject: [PATCH 03/76] [OC-1100] New version of new card feature Template mechanism for specific form field Card detail in preview Examples in DefaultBundle Create a new process definition (bundle) for examples Error management --- .../model/ProcessStatesData.java | 1 + .../src/main/modeling/swagger.yaml | 3 + .../postBundleUserCardExamples.feature | 25 ++ .../bundle_defaultProcess/config.json | 6 +- .../template/en/usercard_message.handlebars | 28 ++ .../template/en/usercard_process.handlebars | 48 +++ .../template/fr/usercard_message.handlebars | 25 ++ .../template/fr/usercard_process.handlebars | 47 +++ .../bundle_userCardExamples/config.json | 34 ++ .../bundle_userCardExamples/i18n/en.json | 7 + .../bundle_userCardExamples/i18n/fr.json | 7 + .../template/en/message.handlebars | 11 + .../template/en/usercard_message.handlebars | 29 ++ .../template/fr/message.handlebars | 11 + .../template/fr/usercard_message.handlebars | 26 ++ .../businessconfig/resources/packageBundle.sh | 3 + .../cards/setPerimeterFor6Cards.feature | 4 + .../setPerimeterForUserCardExamples.feature | 44 +++ src/test/utils/karate/loadBundle.sh | 3 + src/test/utils/karate/setPerimeterForTest.sh | 1 + .../datetime-filter.component.ts | 10 +- .../single-filter/single-filter.component.ts | 17 +- ui/main/src/app/model/processes.model.ts | 3 +- .../card-preview/card-preview.component.html | 13 + .../card-preview/card-preview.component.ts | 152 ++++++++ .../usercard/newcard-template.services.ts | 44 +++ .../modules/usercard/usercard.component.html | 127 +++--- .../modules/usercard/usercard.component.scss | 7 + .../modules/usercard/usercard.component.ts | 360 ++++++++++++------ .../app/modules/usercard/usercard.module.ts | 13 +- ui/main/src/assets/i18n/en.json | 16 +- ui/main/src/assets/i18n/fr.json | 18 +- 32 files changed, 929 insertions(+), 214 deletions(-) create mode 100644 src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_message.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_process.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_message.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_process.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars create mode 100644 src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature create mode 100644 ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.html create mode 100644 ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts create mode 100644 ui/main/src/app/modules/usercard/newcard-template.services.ts diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java index 8c01476601..5366373e0a 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessStatesData.java @@ -26,6 +26,7 @@ public class ProcessStatesData implements ProcessStates { private Boolean acknowledgementAllowed; private String color; private String name; + private String userCardTemplate; @Override public void setDetails(List details) { diff --git a/services/core/businessconfig/src/main/modeling/swagger.yaml b/services/core/businessconfig/src/main/modeling/swagger.yaml index a980c586b4..0efc9133fc 100755 --- a/services/core/businessconfig/src/main/modeling/swagger.yaml +++ b/services/core/businessconfig/src/main/modeling/swagger.yaml @@ -408,6 +408,9 @@ definitions: color: type: string description: use as a display cue in the UI + userCardTemplate: + type: string + description : Name of the template to use when creating a new card uiVisibility: type: object properties: diff --git a/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature b/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature new file mode 100644 index 0000000000..bdf095b5ab --- /dev/null +++ b/src/test/utils/karate/businessconfig/postBundleUserCardExamples.feature @@ -0,0 +1,25 @@ +Feature: Bundle + + Background: + # Get admin token + * def signIn = call read('../common/getToken.feature') { username: 'admin'} + * def authToken = signIn.authToken + + + Scenario: Post Bundle + + + # Push bundle + Given url opfabUrl + 'businessconfig/processes' + And header Authorization = 'Bearer ' + authToken + And multipart field file = read('resources/bundle_userCardExamples.tar.gz') + When method post + Then status 201 + + # Check bundle + Given url opfabUrl + 'businessconfig/processes/userCardExamples' + And header Authorization = 'Bearer ' + authToken + When method GET + Then status 200 + And match response.id == 'userCardExamples' + diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json index 9bcf49a869..6d0a174525 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json @@ -14,7 +14,9 @@ "process", "question", "contingencies", - "response" + "response", + "usercard_message", + "usercard_process" ], "csses": [ "style", @@ -38,6 +40,7 @@ "messageState": { "name": "message.title", "color": "#FAF0AF", + "userCardTemplate": "usercard_message", "details": [ { "title": { @@ -86,6 +89,7 @@ "processState": { "name": "process.label", "color": "#8bcdcd", + "userCardTemplate": "usercard_process", "details": [ { "title": { diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_message.handlebars new file mode 100644 index 0000000000..bb2e0129ba --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_message.handlebars @@ -0,0 +1,28 @@ + + +
+ +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_process.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_process.handlebars new file mode 100644 index 0000000000..03ec8862e1 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/en/usercard_process.handlebars @@ -0,0 +1,48 @@ +
+
+Define the state of the process +
+ +
+Status of the state +
+
+
+
+ + +
+ +
+ + +
+
+ + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_message.handlebars new file mode 100644 index 0000000000..3ca3bc3d6e --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_message.handlebars @@ -0,0 +1,25 @@ + + +
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_process.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_process.handlebars new file mode 100644 index 0000000000..1a37dbcae5 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/template/fr/usercard_process.handlebars @@ -0,0 +1,47 @@ +
+
+Define the state of the process +
+ +
+Status of the state +
+
+
+
+ + +
+ +
+ + +
+
+ + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json new file mode 100644 index 0000000000..335e843467 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json @@ -0,0 +1,34 @@ +{ + "id": "userCardExamples", + "name": "userCardExamples.label", + "version": "1", + "uiVisibility": { + "monitoring": true, + "logging": true, + "calendar": true + }, + "templates": [ + "message", + "usercard_message" + ], + "csses": [ + ], + "states": { + "messageState": { + "name": "message.title", + "color": "#FAF0AF", + "userCardTemplate": "usercard_message", + "details": [ + { + "title": { + "key": "message.title" + }, + "templateName": "message", + "styles": [ + ] + } + ], + "acknowledgementAllowed": true + } + } +} diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json new file mode 100644 index 0000000000..4b1bf4666d --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json @@ -0,0 +1,7 @@ +{ + "userCardExamples": {"label": "Examples for new cards "}, + "message":{ + "title":"Message", + "summary":"Message received" + } +} diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json new file mode 100644 index 0000000000..9a6d8adb05 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json @@ -0,0 +1,7 @@ +{ + "userCardExamples": {"label": "Exemples de nouvelles cartes "}, + "message":{ + "title":"Message", + "summary":"Message reçu" + } +} diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars new file mode 100644 index 0000000000..ec19b3fff4 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars @@ -0,0 +1,11 @@ + + +

You received the following message :

+
+
+ +

+ +{{card.data.message}} + +

\ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars new file mode 100644 index 0000000000..170844aa0a --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars @@ -0,0 +1,29 @@ + + +
+ +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars new file mode 100644 index 0000000000..4c295b9e5c --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars @@ -0,0 +1,11 @@ + + +

Vous avez reçu le message suivant

+
+
+ +

+ +{{card.data.message}} + +

\ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars new file mode 100644 index 0000000000..91be6035f0 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars @@ -0,0 +1,26 @@ + + +
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/packageBundle.sh b/src/test/utils/karate/businessconfig/resources/packageBundle.sh index 2044c74f4d..0a0f33ef92 100755 --- a/src/test/utils/karate/businessconfig/resources/packageBundle.sh +++ b/src/test/utils/karate/businessconfig/resources/packageBundle.sh @@ -6,3 +6,6 @@ cd bundle_defaultProcess_V0.1 tar -czvf bundle_defaultProcess_V0.1.tar.gz config.json template/ i18n/ mv bundle_defaultProcess_V0.1.tar.gz ../ cd .. +cd bundle_userCardExamples +tar -czvf bundle_userCardExamples.tar.gz config.json template/ i18n/ +mv bundle_userCardExamples.tar.gz ../ diff --git a/src/test/utils/karate/cards/setPerimeterFor6Cards.feature b/src/test/utils/karate/cards/setPerimeterFor6Cards.feature index 0b31a758ee..c3a22c10e8 100644 --- a/src/test/utils/karate/cards/setPerimeterFor6Cards.feature +++ b/src/test/utils/karate/cards/setPerimeterFor6Cards.feature @@ -25,6 +25,10 @@ Feature: Add perimeters/group for action test "state" : "messageState", "right" : "ReceiveAndWrite" } + { + "state" : "processState", + "right" : "ReceiveAndWrite" + } ] } """ diff --git a/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature b/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature new file mode 100644 index 0000000000..9c896aecf5 --- /dev/null +++ b/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature @@ -0,0 +1,44 @@ +Feature: Add perimeters/group for action test + + Background: + #Getting token for admin and tso1-operator user calling getToken.feature + * def signIn = call read('../common/getToken.feature') { username: 'admin'} + * def authToken = signIn.authToken + + + + * def perimeterUserCardExamples = +""" +{ + "id" : "perimeterUserCardExamples", + "process" : "userCardExamples", + "stateRights" : [ + { + "state" : "messageState", + "right" : "ReceiveAndWrite" + } + ] +} +""" + + Scenario: Create perimeterUserCardExamples + Given url opfabUrl + 'users/perimeters' + And header Authorization = 'Bearer ' + authToken + And request perimeterUserCardExamples + When method post + Then status 201 + + + Scenario: Add perimeterQuestion for groups TSO1 + Given url opfabUrl + 'users/groups/TSO1/perimeters' + And header Authorization = 'Bearer ' + authToken + And request ["perimeterUserCardExamples"] + When method patch + Then status 200 + + Scenario: Add perimeterQuestion for groups TSO2 + Given url opfabUrl + 'users/groups/TSO2/perimeters' + And header Authorization = 'Bearer ' + authToken + And request ["perimeterUserCardExamples"] + When method patch + Then status 200 diff --git a/src/test/utils/karate/loadBundle.sh b/src/test/utils/karate/loadBundle.sh index 056d76c797..d97a8c4faf 100755 --- a/src/test/utils/karate/loadBundle.sh +++ b/src/test/utils/karate/loadBundle.sh @@ -9,4 +9,7 @@ cd businessconfig/resources echo "Launch Karate test" java -jar karate.jar \ businessconfig/postBundleDefaultProcess.feature \ + businessconfig/postBundleUserCardExamples.feature \ + + diff --git a/src/test/utils/karate/setPerimeterForTest.sh b/src/test/utils/karate/setPerimeterForTest.sh index 6a84a0fbc7..731c68946a 100755 --- a/src/test/utils/karate/setPerimeterForTest.sh +++ b/src/test/utils/karate/setPerimeterForTest.sh @@ -2,4 +2,5 @@ java -jar karate.jar \ cards/setPerimeterFor6Cards.feature \ + cards/setPerimeterForUserCardExamples.feature \ diff --git a/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.ts b/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.ts index 76a30e6e87..5c795739b6 100644 --- a/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.ts +++ b/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.ts @@ -59,6 +59,7 @@ export class DatetimeFilterComponent implements ControlValueAccessor, OnInit, On this.defaultTime = converted.time; this.disabled = false; this.dateInput.setValue(this.defaultDate); + this.timeInput.setValue(this.defaultTime); this.dateInput.updateValueAndValidity({onlySelf: false, emitEvent: false}); this.datetimeForm.updateValueAndValidity({onlySelf: false, emitEvent: true}); @@ -75,16 +76,13 @@ export class DatetimeFilterComponent implements ControlValueAccessor, OnInit, On public onTouched: () => void = () => { } - // Method call when archive-filter.component.ts set value to 0 + // Method call when archive-filter.component.ts set value to null writeValue(val: any): void { if (!this.offset) { this.disabled = true; } - this.resetDateAndTime(); - - if (val) { - this.datetimeForm.setValue(val, {emitEvent: false}); - } + if (!!val) this.datetimeForm.setValue(val, {emitEvent: false}); + else this.resetDateAndTime(); } registerOnChange(fn: any): void { diff --git a/ui/main/src/app/components/share/single-filter/single-filter.component.ts b/ui/main/src/app/components/share/single-filter/single-filter.component.ts index 87eb0e6958..84f09bc09a 100644 --- a/ui/main/src/app/components/share/single-filter/single-filter.component.ts +++ b/ui/main/src/app/components/share/single-filter/single-filter.component.ts @@ -8,7 +8,7 @@ */ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, Input, OnInit, OnChanges} from '@angular/core'; import {Observable, of} from 'rxjs'; import {I18n} from '@ofModel/i18n.model'; import {FormControl, FormGroup} from '@angular/forms'; @@ -19,7 +19,7 @@ import {map} from 'rxjs/operators'; selector: 'of-single-filter', templateUrl: './single-filter.component.html' }) -export class SingleFilterComponent implements OnInit { +export class SingleFilterComponent implements OnInit, OnChanges { preparedList: { value: string, label: Observable }[]; @Input() public i18nRootLabelKey: string; @@ -37,7 +37,7 @@ export class SingleFilterComponent implements OnInit { ngOnInit() { this.preparedList = []; - if (!this.valuesInObservable && this.values) { + if (!this.valuesInObservable && !!this.values) { for (const v of this.values) { this.preparedList.push(this.computeValueAndLabel(v)); } @@ -56,6 +56,17 @@ export class SingleFilterComponent implements OnInit { } } + + ngOnChanges() { + if (!this.valuesInObservable && this.values) { + this.preparedList = []; + for (const v of this.values) { + this.preparedList.push(this.computeValueAndLabel(v)); + } + + } + } + computeI18nLabelKey(): string { return this.i18nRootLabelKey + this.filterPath; } diff --git a/ui/main/src/app/model/processes.model.ts b/ui/main/src/app/model/processes.model.ts index 7f5e03bccf..7fa1cc021b 100644 --- a/ui/main/src/app/model/processes.model.ts +++ b/ui/main/src/app/model/processes.model.ts @@ -87,7 +87,8 @@ export class State { readonly response?: Response, readonly acknowledgementAllowed?: boolean, readonly name?: string, - readonly color?: string + readonly color?: string, + readonly userCardTemplate?: string ) { } } diff --git a/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.html b/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.html new file mode 100644 index 0000000000..ad4b0b3db4 --- /dev/null +++ b/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.html @@ -0,0 +1,13 @@ + + + + + + + + + + + + +
\ No newline at end of file diff --git a/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts b/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts new file mode 100644 index 0000000000..a5b9e96b7a --- /dev/null +++ b/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts @@ -0,0 +1,152 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +import { Component, ElementRef, Input, OnDestroy, OnInit } from '@angular/core'; +import { Card, Detail } from '@ofModel/card.model'; +import { ProcessesService } from '@ofServices/processes.service'; +import { HandlebarsService } from '../../../cards/services/handlebars.service'; +import { DomSanitizer, SafeHtml, SafeResourceUrl } from '@angular/platform-browser'; +import { DetailContext } from '@ofModel/detail-context.model'; +import { Store } from '@ngrx/store'; +import { AppState } from '@ofStore/index'; +import { selectAuthenticationState } from '@ofSelectors/authentication.selectors'; +import { selectGlobalStyleState } from '@ofSelectors/global-style.selectors'; +import { UserContext } from '@ofModel/user-context.model'; +import {skip, switchMap, take, takeUntil } from 'rxjs/operators'; +import { Subject} from 'rxjs'; + +import { User } from '@ofModel/user.model'; + + + + +@Component({ + selector: 'of-card-preview', + templateUrl: './card-preview.component.html' +}) +export class CardPreviewComponent implements OnInit, OnDestroy { + + @Input() card: Card; + @Input() user: User; + @Input() currentPath: string; + + public active = false; + unsubscribe$: Subject = new Subject(); + readonly hrefsOfCssLink = new Array(); + private _htmlContent: SafeHtml; + private _userContext: UserContext; + private detail: Detail; + + + constructor(private element: ElementRef, private businessconfigService: ProcessesService, + private handlebars: HandlebarsService, private sanitizer: DomSanitizer, + private store: Store) { + + this.store.select(selectAuthenticationState).subscribe(authState => { + this._userContext = new UserContext( + authState.identifier, + authState.token, + authState.firstName, + authState.lastName + ); + }); + this.reloadTemplateWhenGlobalStyleChange(); + } + + + ngOnInit() { + this.getTemplateAndStyle(); + + } + + private getTemplateAndStyle() { + this.businessconfigService.queryProcess(this.card.process, this.card.processVersion) + .pipe(takeUntil(this.unsubscribe$)) + .subscribe(businessconfig => { + if (!!businessconfig) { + const state = businessconfig.extractState(this.card); + if (!!state) { + this.detail = state.details[0]; // Take the first detail , new card preview non compatible with more than one detail + } + this.initializeHrefsOfCssLink(); + this.initializeHandlebarsTemplates(); + } + }, + error => console.log(`something went wrong while trying to fetch process for ${this.card.process} + with ${this.card.processVersion} version.`) + ); + } + + + + // for certain types of template , we need to reload it to take into account + // the new css style (for example with chart done with chart.js) + private reloadTemplateWhenGlobalStyleChange() { + this.store.select(selectGlobalStyleState) + .pipe(takeUntil(this.unsubscribe$), skip(1)) + .subscribe(style => this.initializeHandlebarsTemplates()); + } + + + private initializeHrefsOfCssLink() { + if (!!this.detail && !!this.detail.styles) { + const process = this.card.process; + const processVersion = this.card.processVersion; + this.detail.styles.forEach(style => { + const cssUrl = this.businessconfigService.computeBusinessconfigCssUrl(process, style, processVersion); + // needed to instantiate href of link for css in component rendering + const safeCssUrl = this.sanitizer.bypassSecurityTrustResourceUrl(cssUrl); + this.hrefsOfCssLink.push(safeCssUrl); + }); + } + } + + private initializeHandlebarsTemplates() { + + this.businessconfigService.queryProcessFromCard(this.card).pipe( + takeUntil(this.unsubscribe$), + switchMap(process => { + return this.handlebars.executeTemplate(this.detail.templateName, + new DetailContext(this.card, this._userContext, null)); + }) + ) + .subscribe( + html => { + this._htmlContent = this.sanitizer.bypassSecurityTrustHtml(html); + setTimeout(() => { // wait for DOM rendering + this.reinsertScripts(); + }, 10); + } + ); + } + + get htmlContent() { + return this._htmlContent; + } + + reinsertScripts(): void { + const scripts = this.element.nativeElement.getElementsByTagName('script'); + Array.prototype.forEach.call(scripts, script => { //scripts.foreach does not work ... + const scriptCopy = document.createElement('script'); + scriptCopy.type = script.type ? script.type : 'text/javascript'; + if (!!script.innerHTML) { + scriptCopy.innerHTML = script.innerHTML; + } + scriptCopy.async = false; + script.parentNode.replaceChild(scriptCopy, script); + + }); + } + + ngOnDestroy() { + this.unsubscribe$.next(); + this.unsubscribe$.complete(); + } +} diff --git a/ui/main/src/app/modules/usercard/newcard-template.services.ts b/ui/main/src/app/modules/usercard/newcard-template.services.ts new file mode 100644 index 0000000000..987bbcb990 --- /dev/null +++ b/ui/main/src/app/modules/usercard/newcard-template.services.ts @@ -0,0 +1,44 @@ +import {Injectable} from '@angular/core'; + + +import {Map} from '@ofModel/map'; +import {ProcessesService} from '@ofServices/processes.service'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {buildSettingsOrConfigSelector} from '@ofSelectors/settings.x.config.selectors'; +import {Observable, of} from 'rxjs'; + + +@Injectable() +export class NewCardTemplateService { + + private templateCache: Map = new Map(); + private _locale: string; + + + constructor(private businessconfig: ProcessesService, private store: Store) { + this.store.select(buildSettingsOrConfigSelector('locale')).subscribe(locale => this.changeLocale(locale)); + } + + + public changeLocale(locale: string){ + if (!!locale) { + this._locale = locale; + } else { + this._locale = 'en'; + } + } + + public getTemplate(process: string, version: string, name: string ): Observable { + const locale = this._locale; + const key = `${process}.${version}.${name}.${locale}`; + const template = this.templateCache[key]; + if (!!template) { + return of(template); + } + + const response = this.businessconfig.fetchHbsTemplate(process, version, name, locale); + response.subscribe((newTemplate) => this.templateCache[key] = newTemplate); + return response; + } +} diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html index e84e485547..72814f5d09 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.html +++ b/ui/main/src/app/modules/usercard/usercard.component.html @@ -6,108 +6,99 @@ -
usercard.title
- -
-
+

userCard.title

+
+
+
+
- +
- +
- +
- +
- -
-
-
-
- +
+ +
-
- +
+ +
+
+ + +
+
+
-
+
- - -
- {{message}}{{error}} - +

- +

{{messageAfterSendingCard}}

+

+ +
+
+
+
+ +
+
+{{errorMessage.text}} + +
- +

userCard.confirmSending

-

usercard.confirmSending

+
-

Free Message

- -

Complementary data

-
-
usercard.filters.process
-
{{card.process}}
-
usercard.filters.startDate
-
{{card.startDate}}
-
usercard.state
-
{{card.state}}
-
usercard.processInstanceId
-
{{card.processInstanceId}}
-
usercard.filters.entities
-
{{card.entityRecipients}}
-
UID
-
{{card.uid}}
-
+ + + + + +
- - + +
- + \ No newline at end of file diff --git a/ui/main/src/app/modules/usercard/usercard.component.scss b/ui/main/src/app/modules/usercard/usercard.component.scss index d6d03c4861..350a7411c3 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.scss +++ b/ui/main/src/app/modules/usercard/usercard.component.scss @@ -2,6 +2,13 @@ background-color: var(--opfab-lightcard-detail-bgcolor); color: var(--opfab-lightcard-detail-textcolor); } + + +.modal-header{ + background-color: var(--opfab-lightcard-detail-bgcolor); + color: var(--opfab-lightcard-detail-textcolor); +} + .btn{ color: var(--opfab-lightcard-detail-textcolor); } diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index fd573f970a..ab8cbeee64 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -7,58 +7,76 @@ * This file is part of the OperatorFabric project. */ -import { Component, OnDestroy, TemplateRef } from '@angular/core'; -import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; +import { Component, OnDestroy, TemplateRef, ElementRef, OnInit } from '@angular/core'; +import { FormControl, FormGroup } from '@angular/forms'; import { Store } from '@ngrx/store'; import { AppState } from '@ofStore/index'; import { CardService } from '@ofServices/card.service'; import { UserService } from '@ofServices/user.service'; -import { selectIdentifier } from '@ofSelectors/authentication.selectors'; -import { map, switchMap, takeUntil, withLatestFrom } from 'rxjs/operators'; -import { Card, fromCardToLightCard } from '@ofModel/card.model'; +import { map, takeUntil, tap } from 'rxjs/operators'; +import { Card} from '@ofModel/card.model'; import { I18n } from '@ofModel/i18n.model'; import { Observable, Subject } from 'rxjs'; import { selectProcesses } from '@ofSelectors/process.selector'; import { Process, State } from '@ofModel/processes.model'; -import { transformToTimestamp } from '../archives/components/archive-filters/archive-filters.component'; import { TimeService } from '@ofServices/time.service'; -import { selectAllEntities } from '@ofSelectors/user.selector'; -import { Entity, User } from '@ofModel/user.model'; import { Severity } from '@ofModel/light-card.model'; import { Guid } from 'guid-typescript'; -import { ModalDismissReasons, NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbModal, NgbModalOptions } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; +import { NewCardTemplateService } from './newcard-template.services'; +import { SafeHtml, DomSanitizer } from '@angular/platform-browser'; +import { UserWithPerimeters, RightsEnum, ComputedPerimeter } from '@ofModel/userWithPerimeters.model'; +import { EntitiesService } from '@ofServices/entities.service'; +import { transformToTimestamp } from '../archives/components/archive-filters/archive-filters.component'; + +declare const templateGateway: any; + +class Message { + text: string; + display: boolean; +} @Component({ selector: 'of-usercard', templateUrl: './usercard.component.html', styleUrls: ['./usercard.component.scss'] }) -export class UserCardComponent implements OnDestroy { +export class UserCardComponent implements OnDestroy, OnInit { messageForm: FormGroup; - message: string; - error: any; + messageAfterSendingCard: string; + - fetchedProcesses: Process[]; - currentUser: User; + processesDefinition: Process[]; + currentUserWithPerimeters: UserWithPerimeters; severityOptions = Object.keys(Severity).map(severity => { return { value: severity, - label: new I18n('usercard.options.severity.' + severity) + label: new I18n('userCard.options.severity.' + severity) }; }); processOptions$: Observable; - stateOptions$: Observable; - entityOptions$: Observable; + stateOptions: any[]; + entityOptions = new Array(); + dropdownSettings = {}; - card: Card; + selectedProcess: Process; + selectedState: string; + statesPerProcesses = new Map(); + userCardTemplate: SafeHtml; + + public card: Card; + + readonly defaultStartDate = new Date().valueOf() + 60000; + readonly defaultEndDate = new Date().valueOf() + 60000 * 60; unsubscribe$: Subject = new Subject(); - readonly msg = 'Card will be resumed here soon!'; + public displaySendResult = false; + errorMessage: Message = { display: false, text: undefined }; modalRef: NgbModalRef; @@ -67,12 +85,23 @@ export class UserCardComponent implements OnDestroy { } constructor(private store: Store, - private formBuilder: FormBuilder, private cardService: CardService, private userService: UserService, private timeService: TimeService, - private modalService: NgbModal + private entitiesService: EntitiesService, + private modalService: NgbModal, + private newCardTemplateService: NewCardTemplateService, + private sanitizer: DomSanitizer, + private element: ElementRef ) { + } + + ngOnInit() { + + this.currentUserWithPerimeters = this.userService.getCurrentUserWithPerimeters(); + this.loadAllEntities(); + this.loadAllProcessAndStateInUserPerimeter(); + this.messageForm = new FormGroup({ severity: new FormControl(''), @@ -81,114 +110,222 @@ export class UserCardComponent implements OnDestroy { startDate: new FormControl(''), endDate: new FormControl(''), comment: new FormControl(''), - entities: new FormControl('') - } - ); + entities: new FormControl([]) + }); + + this.changeSeverityToDefaultValue(); + this.changeStatesWhenSelectProcess(); + this.loadTemplateWhenStateChange(); + this.dropdownSettings = { + text: 'Select a recipîent', + selectAllText: 'Select All', + unSelectAllText: 'UnSelect All', + enableSearchFilter: true, + classes: 'custom-class-example' + }; + + } + + loadAllEntities(): void { + this.entitiesService.getEntities().forEach(entity => + this.entityOptions.push({ id: entity.id, itemName: entity.name })); + } + + + loadAllProcessAndStateInUserPerimeter(): void { this.processOptions$ = this.store.select(selectProcesses).pipe( takeUntil(this.unsubscribe$), + tap((allProcesses: Process[]) => this.processesDefinition = allProcesses), map((allProcesses: Process[]) => { - return allProcesses.map((proc: Process) => { - const _i18nPrefix = proc.id + '.' + proc.version + '.'; - const label = proc.name ? (_i18nPrefix + proc.name) : proc.id; - return { - value: proc.id, - label: label - }; + const processesToShow: any[] = new Array(); + const processesInPerimeter: Set = new Set(); + this.currentUserWithPerimeters.computedPerimeters.forEach(perimeter => { + if (this.userCanSendCard(perimeter)) processesInPerimeter.add(perimeter.process); + }); + allProcesses.forEach(process => { + if (processesInPerimeter.has(process.id)) { + const _i18nPrefix = process.id + '.' + process.version + '.'; + const label = process.name ? (_i18nPrefix + process.name) : process.id; + const processToShow = { value: process.id, label: label }; + processesToShow.push(processToShow); + this.loadStatesForProcess(process); + } }); + return processesToShow; }) ); + } - this.stateOptions$ = this.messageForm.get('process').valueChanges.pipe( - withLatestFrom(this.store.select(selectProcesses)), - map(([selectedProcessId, allProcesses]: [string, Process[]]) => { - // TODO What if selectedProcessId is null ? == vs === - const selectedProcess = allProcesses.find(process => process.id === selectedProcessId); - if (selectedProcess) { - return Object.entries(selectedProcess.states).map(([id, state]: [string, State]) => { - const label = state.name ? (new I18n(this.getI18nPrefixFromProcess(selectedProcess) - + state.name)) : id; - return { - value: id, - label: label - }; - }); - } else { - return []; - } - }) - ); - this.entityOptions$ = this.store.select(selectAllEntities).pipe( - takeUntil(this.unsubscribe$), - map((allEntities: Entity[]) => allEntities.map((entity: Entity) => { - return { value: entity.id, label: entity.name }; - }) - ) - ); + private userCanSendCard(perimeter: ComputedPerimeter): boolean { + return ((perimeter.rights === RightsEnum.ReceiveAndWrite) + || (perimeter.rights === RightsEnum.Write)); + } + + loadStatesForProcess(process: Process): void { + const statesList = []; + this.currentUserWithPerimeters.computedPerimeters.forEach( + perimeter => { + if ((perimeter.process === process.id) && this.userCanSendCard(perimeter)) { + const state = process.states[perimeter.state]; + const label = !!state.name ? (new I18n(this.getI18nPrefixFromProcess(process) + + state.name)) : perimeter.state; + const stateEntry = { value: perimeter.state, label: label }; + statesList.push(stateEntry); - this.store.select(selectProcesses) - .pipe(takeUntil(this.unsubscribe$)). - subscribe((allProcesses: Process[]) => { - this.fetchedProcesses = allProcesses; + } }); + this.statesPerProcesses.set(process.id, statesList); + } + + + changeSeverityToDefaultValue(): void { + this.messageForm.get('severity').valueChanges.subscribe((severity) => { + if (!severity) this.messageForm.get('severity').setValue(this.severityOptions[0].value); + }); + this.messageForm.get('severity').setValue(this.severityOptions[0].value); - const userWithPerimeters = this.userService.getCurrentUserWithPerimeters(); - if (userWithPerimeters) { - this.currentUser = userWithPerimeters.userData; - } } + + changeStatesWhenSelectProcess(): void { + this.messageForm.get('process').valueChanges.subscribe((process) => { + if (!!process) { + this.stateOptions = this.statesPerProcesses.get(process); + this.selectedState = this.stateOptions[0].value; + this.selectedProcess = this.processesDefinition.find(processDefinition => { + return processDefinition.id === process; + }); + this.messageForm.get('state').setValue(this.selectedState); + this.loadTemplate(); + } + }); + } + + loadTemplateWhenStateChange(): void { + this.messageForm.get('state').valueChanges.subscribe((state) => { + if (!!state) { + this.selectedState = state; + this.loadTemplate(); + } + }); + } + + loadTemplate() { + this.errorMessage.display = false; + const templateName = this.selectedProcess.states[this.selectedState].userCardTemplate; + if (!!templateName) { + this.newCardTemplateService.getTemplate(this.selectedProcess.id, this.selectedProcess.version, templateName) + .subscribe((template) => { + this.userCardTemplate = this.sanitizer.bypassSecurityTrustHtml(template); + setTimeout(() => { // wait for DOM rendering + this.reinsertScripts(); + }, 10); + } + ); + } else this.userCardTemplate = this.sanitizer.bypassSecurityTrustHtml(''); + + } + + reinsertScripts(): void { + const scripts = this.element.nativeElement.getElementsByTagName('script'); + Array.prototype.forEach.call(scripts, script => { //scripts.foreach does not work ... + const scriptCopy = document.createElement('script'); + scriptCopy.type = script.type ? script.type : 'text/javascript'; + if (!!script.innerHTML) { + scriptCopy.innerHTML = script.innerHTML; + } + scriptCopy.async = false; + script.parentNode.replaceChild(scriptCopy, script); + + }); + } + + onSubmitForm(template: TemplateRef) { const formValue = this.messageForm.value; - const processFormVal = formValue['process']; - const selectedProcess = this.fetchedProcesses.find(process => { + const selectedProcess = this.processesDefinition.find(process => { return process.id === processFormVal; }); const processVersion = selectedProcess.version; - const formValueElement = formValue['state']; - const selectedState = selectedProcess.states[formValueElement]; - const titleKey = (new I18n((selectedState.name) ? selectedProcess.name : formValueElement)); - const now = new Date().getTime(); + const state = formValue['state']; + + if (!templateGateway.getSpecificCardInformation) { + console.log('No getSpecificCardInformationMethod() in template can not send card'); + this.errorMessage.display = true; + this.errorMessage.text = 'userCard.error.templateError'; + return; + } + + const specificInformation = templateGateway.getSpecificCardInformation(); + if (!specificInformation) { + console.log('getSpecificCardInformationMethod() in template return no information'); + this.errorMessage.display = true; + this.errorMessage.text = 'userCard.error.templateError'; + return; + } + + if (!specificInformation.valid) { + this.errorMessage.display = true; + this.errorMessage.text = specificInformation.errorMsg; + return; + } + + const entities = new Array(); + if (formValue['entities'].length < 1) { + this.errorMessage.display = true; + this.errorMessage.text = 'userCard.error.noRecipientSelected'; + return; + } else { + formValue['entities'].forEach(entity => entities.push(entity.id)); + } + + let startDate = this.messageForm.get('startDate').value; + if (!startDate) startDate = this.defaultStartDate; + else startDate = this.createTimestampFromValue(startDate); + + let endDate = this.messageForm.get('endDate').value; + if (!endDate) endDate = this.defaultEndDate; + else endDate = this.createTimestampFromValue(endDate); + + const title = (!!specificInformation.card.title) ? specificInformation.card.title : 'UNDEFINED'; + const summary = (!!specificInformation.card.summary) ? specificInformation.card.summary : 'UNDEFINED'; + const generatedId = Guid.create().toString(); - let tempCard = { - uid: generatedId, + this.card = { id: generatedId, publishDate: null, - publisher: this.currentUser.entities[0], + publisher: this.currentUserWithPerimeters.userData.entities[0], processVersion: processVersion, process: processFormVal, processInstanceId: generatedId, - state: formValueElement, - startDate: formValue['startDate'] ? this.createTimestampFromValue(formValue['startDate']) : now, + state: state, + startDate: startDate, + endDate: endDate, severity: formValue['severity'], hasBeenAcknowledged: false, hasBeenRead: false, - entityRecipients: [formValue['entities']], + entityRecipients: entities, + entitiesAllowedToRespond: [], externalRecipients: null, - title: titleKey, - summary: new I18n('SUMMARY CONTENT TO BE DEFINED'), // TODO - data: { - comment: formValue['comment'] - }, - recipient: null + title: title, + summary: summary, + data: specificInformation.card.data, } as Card; - const endDate = formValue['endDate']; - if (!!endDate) { - tempCard = { - ...tempCard, - endDate: this.createTimestampFromValue(endDate) - }; - } - this.card = tempCard; - this.modalRef = this.modalService.open(template); + const options: NgbModalOptions = { + size: 'lg' + }; + this.errorMessage.display = false; + this.modalRef = this.modalService.open(template, options); } + createTimestampFromValue = (value: any): number => { const { date, time } = value; if (date) { @@ -199,6 +336,7 @@ export class UserCardComponent implements OnDestroy { } } + getI18nPrefixFromProcess = (process: Process): string => { return process.id + '.' + process.version + '.'; } @@ -212,22 +350,22 @@ export class UserCardComponent implements OnDestroy { this.cardService.postResponseCard(this.card) .subscribe( resp => { - this.message = ''; + this.messageAfterSendingCard = ''; const msg = resp.message; // TODO better way to handle perimeter errors if (!!msg && msg.includes('unable')) { - this.error = msg; + console.log('Impossible to send card , error message from service : ', msg); + this.messageAfterSendingCard = 'userCard.error.impossibleToSendCard'; } else { - this.message = msg; + this.messageAfterSendingCard = 'userCard.cardSendWithNoError'; } - this.modalRef.close(this.message); + this.modalRef.close(); this.displaySendResult = true; this.messageForm.reset(); }, err => { - console.error(err); - this.error = err; - this.modalRef.close(this.error); + console.error('Error when sending card :', err); + this.modalRef.close(); this.displaySendResult = true; this.messageForm.reset(); } @@ -235,33 +373,13 @@ export class UserCardComponent implements OnDestroy { } decline(): void { - this.message = 'Declined!'; - this.modalRef.dismiss(this.message); - } - - formatTime(time) { - return this.timeService.formatDateTime(time); - } - - reset() { - this.messageForm.reset(); + this.modalRef.dismiss(this.messageAfterSendingCard); } sendAnotherUserCard() { + this.userCardTemplate = ''; this.card = null; this.displaySendResult = false; - this.reset(); } - existsError(): boolean { - return !!this.error; - } - - noError(): boolean { - return !this.existsError(); - } - - getLightCard() { - return fromCardToLightCard(this.card); - } } diff --git a/ui/main/src/app/modules/usercard/usercard.module.ts b/ui/main/src/app/modules/usercard/usercard.module.ts index b6428f1801..302aec977c 100644 --- a/ui/main/src/app/modules/usercard/usercard.module.ts +++ b/ui/main/src/app/modules/usercard/usercard.module.ts @@ -11,18 +11,22 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {UserCardComponent} from './usercard.component'; +import {CardPreviewComponent} from './components/card-preview/card-preview.component'; import {UserCardRoutingModule} from './usercard-routing.module'; import {TranslateModule} from '@ngx-translate/core'; import {FlatpickrModule} from 'angularx-flatpickr'; import {ArchivesModule} from '../archives/archives.module'; import {SingleFilterModule} from '../../components/share/single-filter/single-filter.module'; +import {MultiFilterModule} from '../../components/share/multi-filter/multi-filter.module'; import {DatetimeFilterModule} from '../../components/share/datetime-filter/datetime-filter.module'; import {TextAreaModule} from '../../components/share/text-area/text-area.module'; import {CardsModule} from '../cards/cards.module'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; +import { NewCardTemplateService } from './newcard-template.services'; +import {MultiFilter2Module} from '../../components/share/multi-filter-2/multi-filter-2.module'; @NgModule({ - declarations: [UserCardComponent], + declarations: [UserCardComponent, CardPreviewComponent], imports: [ CommonModule, FormsModule, @@ -32,11 +36,14 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; FlatpickrModule.forRoot(), ArchivesModule, SingleFilterModule, + MultiFilterModule, DatetimeFilterModule, TextAreaModule, CardsModule, - NgbModule - ] + NgbModule, + MultiFilter2Module + ], + providers: [NewCardTemplateService], }) export class UserCardModule { } diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index fa3a88de9b..c265d2dc40 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -140,14 +140,19 @@ "reset" : "Reset" }, - "usercard": { - "title": "Edit Free Message Notification", + "userCard": { + "title": "New Card Edition", + "error": { + "noRecipientSelected" : "You must at least choose one recipient", + "templateError" : "Technical error : invalid template", + "impossibleToSendCard" : "Impossible to send card for technical reasons" + }, "filters": { "severity": "Severity", "process": "Process", "state": "State", - "startDate": "Start Date", - "endDate": "End Date", + "startDate": "Validity Start Date", + "endDate": "Validity End Date", "comment": "Comment", "entities": "Recipient" }, @@ -165,7 +170,8 @@ "refuse": "Cancel", "processInstanceId": "Id", "state": "State", - "send-another-one": "Send another Card" + "send-another-one": "Send another Card", + "cardSendWithNoError": "Card send" }, "response": { "btnTitle": "VALIDATE ANSWERS", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index 3d62435aa6..f1804e52c8 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -143,16 +143,21 @@ "cancel": "Annuler", "reset": "Effacer" }, - "usercard": { - "title": "Éditer la notification par Free Message", + "userCard": { + "title": "Édition d'une nouvelle carte", + "error": { + "noRecipientSelected" : "Vous devez au moins choisir un destinataire", + "templateError" : "Erreur technique : template non conforme", + "impossibleToSendCard" : "Impossible d'envoyer la carte pour des raisons techniques" + }, "filters": { "severity": "Sévérité", "process": "Processus", "state": "État", - "startDate": "Date de début", - "endDate": "Date de fin", + "startDate": "Date de début de validité", + "endDate": "Date de fin de validité", "comment": "Commentaire", - "entities": "Recipiendaire" + "entities": "Destinataire" }, "options": { "severity": { @@ -168,7 +173,8 @@ "refuse": "Annuler", "processInstanceId": "Identifiant", "state": "État", - "send-another-one": "Envoyer une autre carte" + "send-another-one": "Envoyer une autre carte", + "cardSendWithNoError": "Carte envoyée" }, "response": { "btnTitle": "VALIDER REPONSES", From 0089c420e2801d7ea65b5bad281484cd57c68e3b Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 29 Sep 2020 13:43:42 +0200 Subject: [PATCH 04/76] Add foreach guideline in documentation --- src/docs/asciidoc/community/index.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/community/index.adoc b/src/docs/asciidoc/community/index.adoc index f23fc6d5b9..3c61d81713 100644 --- a/src/docs/asciidoc/community/index.adoc +++ b/src/docs/asciidoc/community/index.adoc @@ -70,9 +70,10 @@ include::workflow.adoc[leveloffset=+2] to have to maintain these mentions (since this information is tracked by git anyway). * For ui code, you must use a linter with rules provided in ui/main/tslint.json -==== Angular development caution and tooltips +==== Angular/TypeScript development caution and guidelines -* Use !!myVariable to test if a variable is undefined or null +* Use `!!myVariable` to test if a variable is undefined or null +* Use `foreach` to iterate over an array (instead of `for(let i = ..`) . In some cases, foreach do not work and you can use it this way `Array.prototype.forEach.call(myArray, element => .... )` (see https://stackoverflow.com/questions/43743560/foreach-vs-array-prototype-foreach-call) * Do not use ngFor / ngIf with methods with computing as angular will call these methods very regularly (around ten times per seconds), use instead variables and compute them only when necessary. * ngInit() : ngInit is called when component is created, the creation is made by the parent component : be careful to check when initialization is done when calling method inside ngInit. When the context of the parent component change, it can lead to a new initialization or not. From 6738c6876aca8bf21f98af350c9e3116c270d525 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 29 Sep 2020 11:53:25 +0200 Subject: [PATCH 05/76] [OC-1137] Improve UI initialization Wait for entities, processes and user perimeters loading before starting main screens Processes are not loaded anymore via ngrx Remove useless unit test for monitoring.component --- ui/main/src/app/app.component.ts | 45 ++++++++------ .../app/components/navbar/navbar.component.ts | 2 - .../logging-filters.component.html | 2 +- .../logging-filters.component.ts | 13 ++-- .../app/modules/logging/logging.component.ts | 36 ++++------- .../monitoring-filters.component.ts | 16 ++--- .../monitoring/monitoring.component.spec.ts | 59 ------------------- .../monitoring/monitoring.component.ts | 41 +++++-------- .../modules/usercard/usercard.component.html | 7 ++- .../modules/usercard/usercard.component.ts | 33 +++++------ ui/main/src/app/services/entities.service.ts | 20 ++++--- ui/main/src/app/services/processes.service.ts | 18 ++++++ ui/main/src/app/services/user.service.ts | 18 +++--- .../src/app/store/actions/process.action.ts | 30 ---------- .../app/store/actions/translate.actions.ts | 7 ++- .../src/app/store/effects/process.effects.ts | 31 ---------- .../app/store/effects/translate.effects.ts | 14 ++--- ui/main/src/app/store/index.ts | 10 +--- .../src/app/store/reducers/process.reducer.ts | 26 -------- .../app/store/selectors/config.selectors.ts | 23 -------- .../app/store/selectors/process.selector.ts | 21 ------- ui/main/src/app/store/states/process.state.ts | 16 ----- ui/main/src/tests/helpers.ts | 1 - 23 files changed, 140 insertions(+), 349 deletions(-) delete mode 100644 ui/main/src/app/modules/monitoring/monitoring.component.spec.ts delete mode 100644 ui/main/src/app/store/actions/process.action.ts delete mode 100644 ui/main/src/app/store/effects/process.effects.ts delete mode 100644 ui/main/src/app/store/reducers/process.reducer.ts delete mode 100644 ui/main/src/app/store/selectors/config.selectors.ts delete mode 100644 ui/main/src/app/store/selectors/process.selector.ts delete mode 100644 ui/main/src/app/store/states/process.state.ts diff --git a/ui/main/src/app/app.component.ts b/ui/main/src/app/app.component.ts index 493655b510..38da4ecc83 100644 --- a/ui/main/src/app/app.component.ts +++ b/ui/main/src/app/app.component.ts @@ -15,14 +15,17 @@ import { Store } from '@ngrx/store'; import { AppState } from '@ofStore/index'; import { AuthenticationService } from '@ofServices/authentication/authentication.service'; import { LoadConfigSuccess } from '@ofActions/config.actions'; +import { LoadProcessesTranslation } from '@ofActions/translate.actions'; import { selectIdentifier } from '@ofSelectors/authentication.selectors'; -import { ConfigService} from "@ofServices/config.service"; +import { ConfigService} from '@ofServices/config.service'; import {TranslateService} from '@ngx-translate/core'; -import { catchError } from 'rxjs/operators'; +import { catchError, skip} from 'rxjs/operators'; +import {merge} from 'rxjs'; import { I18nService } from '@ofServices/i18n.service'; import { CardService } from '@ofServices/card.service'; import { UserService } from '@ofServices/user.service'; import { EntitiesService } from '@ofServices/entities.service'; +import { ProcessesService } from '@ofServices/processes.service'; @Component({ @@ -43,58 +46,66 @@ export class AppComponent implements OnInit { private titleService: Title , private authenticationService: AuthenticationService ,private configService: ConfigService - , private translate: TranslateService + , private translateService: TranslateService , private i18nService: I18nService , private cardService: CardService , private userService: UserService - ,private entitiesService: EntitiesService) { + , private entitiesService: EntitiesService + , private processesService: ProcessesService) { } ngOnInit() { this.loadConfiguration(); - this.initCardSubsriptionWhenUserAuthenticated(); + this.initApplicationWhenUserAuthenticated(); } private loadConfiguration() { this.configService.fetchConfiguration().subscribe(config => { - console.log(new Date().toISOString(),`Configuration loaded (web-ui.json)`); - if (config.i18n.supported.locales) this.translate.addLangs(config.i18n.supported.locales); + console.log(new Date().toISOString(), `Configuration loaded (web-ui.json)`); + if (config.i18n.supported.locales) this.translateService.addLangs(config.i18n.supported.locales); this.setTitle(); this.store.dispatch(new LoadConfigSuccess({config: config})); this.launchAuthenticationProcess(); }) - catchError((err,caught) => { - console.error("Impossible to load configuration file web-ui.json",err); + catchError((err, caught) => { + console.error('Impossible to load configuration file web-ui.json', err); return caught; }); } - private setTitle() - { + private setTitle() { const title = this.configService.getConfigValue('title'); if (!!title) this.titleService.setTitle(title); } private launchAuthenticationProcess() { - console.log(new Date().toISOString(),`Launch authentification process`); + console.log(new Date().toISOString(), `Launch authentication process`); this.authenticationService.initializeAuthentication(); this.useCodeOrImplicitFlow = this.authenticationService.isAuthModeCodeOrImplicitFlow(); } - private initCardSubsriptionWhenUserAuthenticated() { + private initApplicationWhenUserAuthenticated() { this.store .select(selectIdentifier) .subscribe(identifier => { if (identifier) { - console.log(new Date().toISOString(),`User ${identifier} logged`); + console.log(new Date().toISOString(), `User ${identifier} logged`); this.isAuthenticated = true; - this.userService.loadUserWithPerimetersData(); - this.entitiesService.loadAllEntitiesData(); this.cardService.initCardSubscription(); - this.cardService.initSubscription.subscribe( ()=> this.loaded = true); + merge( + this.userService.loadUserWithPerimetersData(), + this.entitiesService.loadAllEntitiesData(), + this.processesService.loadAllProcesses(), + this.cardService.initSubscription) + .pipe(skip(3)) + .subscribe( () => { + this.store.dispatch(new LoadProcessesTranslation()); + this.loaded = true; + }); } }); } + } diff --git a/ui/main/src/app/components/navbar/navbar.component.ts b/ui/main/src/app/components/navbar/navbar.component.ts index 6b25726229..56b706b34a 100644 --- a/ui/main/src/app/components/navbar/navbar.component.ts +++ b/ui/main/src/app/components/navbar/navbar.component.ts @@ -23,7 +23,6 @@ import * as _ from 'lodash'; import {GlobalStyleService} from '@ofServices/global-style.service'; import {Route} from '@angular/router'; import {ConfigService} from '@ofServices/config.service'; -import {QueryAllProcesses} from '@ofActions/process.action'; import {QueryAllEntities} from "@ofActions/user.actions"; @Component({ @@ -63,7 +62,6 @@ export class NavbarComponent implements OnInit { _.fill(this.expandedMenu, false); })); this.store.dispatch(new LoadMenu()); - this.store.dispatch(new QueryAllProcesses()); this.store.dispatch(new QueryAllEntities()); diff --git a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html index bf51576a8b..3405c54130 100644 --- a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html +++ b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html @@ -14,7 +14,7 @@ + [values]="processData">
diff --git a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts index d1e2396e2d..711cb30f94 100644 --- a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts +++ b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts @@ -7,11 +7,10 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {Component, Input, OnInit} from '@angular/core'; import {AppState} from '@ofStore/index'; import {Store} from '@ngrx/store'; import {FormControl, FormGroup} from '@angular/forms'; -import {Observable, Subject} from 'rxjs'; import { checkElement, FilterDateTypes, @@ -26,15 +25,14 @@ import {TimeService} from '@ofServices/time.service'; templateUrl: './logging-filters.component.html', styleUrls: ['./logging-filters.component.scss'] }) -export class LoggingFiltersComponent implements OnInit, OnDestroy { +export class LoggingFiltersComponent implements OnInit { size = 10; loggingForm: FormGroup; - unsubscribe$: Subject = new Subject(); public submittedOnce = false; @Input() - public processData: Observable; + public processData: []; constructor(private store: Store, private timeService: TimeService, private configService: ConfigService) { this.loggingForm = new FormGroup( @@ -89,9 +87,6 @@ export class LoggingFiltersComponent implements OnInit, OnDestroy { return params; } - ngOnDestroy() { - this.unsubscribe$.next(); - this.unsubscribe$.complete(); - } + } diff --git a/ui/main/src/app/modules/logging/logging.component.ts b/ui/main/src/app/modules/logging/logging.component.ts index 38880e0dfa..45f3ee10a8 100644 --- a/ui/main/src/app/modules/logging/logging.component.ts +++ b/ui/main/src/app/modules/logging/logging.component.ts @@ -7,17 +7,16 @@ * This file is part of the OperatorFabric project. */ -import {AfterViewInit, Component, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import {AfterViewInit, Component, OnDestroy, ViewChild} from '@angular/core'; import {Store} from '@ngrx/store'; import {AppState} from '@ofStore/index'; -import {FlushLoggingResult} from '@ofActions/logging.actions'; import {Observable, Subject} from 'rxjs'; import {LineOfLoggingResult} from '@ofModel/line-of-logging-result.model'; import {selectLinesOfLoggingResult} from '@ofSelectors/logging.selectors'; import {map, takeUntil} from 'rxjs/operators'; import {LoggingFiltersComponent} from './components/logging-filters/logging-filters.component'; -import {selectProcesses} from '@ofSelectors/process.selector'; -import {Process} from '@ofModel/processes.model'; +import { ProcessesService } from '@ofServices/processes.service'; +import { I18n } from '@ofModel/i18n.model'; @Component({ selector: 'of-logging', @@ -33,28 +32,15 @@ export class LoggingComponent implements AfterViewInit, OnDestroy { canDisplayNoResultMessage = false; unsubscribe$: Subject = new Subject(); - processValueForFilter: Observable; + processValueForFilter = new Array(); - constructor(private store: Store) { - this.store.dispatch(new FlushLoggingResult()); - this.processValueForFilter = this.store.select(selectProcesses).pipe( - takeUntil(this.unsubscribe$), - map((allProcesses: Array) => { - /** - * work around because allProcesses.forEach(…) - * 'is not a function', for some reason. - */ - const filterValue = []; - Array.prototype.forEach.call(allProcesses, (proc: Process) => { - const id = proc.id; - - if (proc.uiVisibility && !! proc.uiVisibility.logging) { - filterValue.push({value: id, label: proc.name}); - } - }); - return filterValue; - }) - ); + constructor(private store: Store, private processesService: ProcessesService) { + processesService.getAllProcesses().forEach( (process) => { + const id = process.id; + if (process.uiVisibility && !!process.uiVisibility.logging) { + this.processValueForFilter.push({value: id, label: new I18n(process.name), i18nPrefix: `${process.id}.${process.version}` }); + } + }); } ngAfterViewInit() { diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts index e65ce9a302..08e551c4c6 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts @@ -7,33 +7,31 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnDestroy, OnInit} from '@angular/core'; -import {Observable, Subject} from 'rxjs'; +import {Component, Input,OnInit} from '@angular/core'; import {AbstractControl, FormControl, FormGroup} from '@angular/forms'; import {Store} from '@ngrx/store'; import {AppState} from '@ofStore/index'; import {FilterType} from '@ofServices/filter.service'; import {ApplyFilter, ResetFilter} from '@ofActions/feed.actions'; -import {DateTimeNgb, getDateTimeNgbFromMoment, offSetCurrentTime} from '@ofModel/datetime-ngb.model'; +import {DateTimeNgb, offSetCurrentTime} from '@ofModel/datetime-ngb.model'; import {ConfigService} from '@ofServices/config.service'; -import * as moment from 'moment'; + @Component({ selector: 'of-monitoring-filters', templateUrl: './monitoring-filters.component.html' }) -export class MonitoringFiltersComponent implements OnInit, OnDestroy { +export class MonitoringFiltersComponent implements OnInit{ size = 10; monitoringForm: FormGroup; - unsubscribe$: Subject = new Subject(); dropdownList = []; selectedItems = []; dropdownSettings = {}; @Input() - public processData: Observable; + public processData: []; public submittedOnce = false; @@ -52,7 +50,7 @@ export class MonitoringFiltersComponent implements OnInit, OnDestroy { activeTo: new FormControl('') } ); - this.processData.subscribe(items => this.dropdownList = items); + this.dropdownList = this.processData; this.dropdownSettings = { text: 'Select a Process', @@ -146,8 +144,6 @@ export class MonitoringFiltersComponent implements OnInit, OnDestroy { } ngOnDestroy() { - this.unsubscribe$.next(); - this.unsubscribe$.complete(); this.store.dispatch(new ResetFilter()); } diff --git a/ui/main/src/app/modules/monitoring/monitoring.component.spec.ts b/ui/main/src/app/modules/monitoring/monitoring.component.spec.ts deleted file mode 100644 index e6f9b0de53..0000000000 --- a/ui/main/src/app/modules/monitoring/monitoring.component.spec.ts +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - -import {async, ComponentFixture, TestBed} from '@angular/core/testing'; - -import {MonitoringComponent} from './monitoring.component'; -import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {DatetimeFilterModule} from '../../components/share/datetime-filter/datetime-filter.module'; -import {MultiFilterModule} from '../../components/share/multi-filter/multi-filter.module'; -import {Store, StoreModule} from '@ngrx/store'; -import {appReducer, AppState, storeConfig} from '@ofStore/index'; -import {ServicesModule} from '@ofServices/services.module'; -import {HttpClientModule} from '@angular/common/http'; -import {TranslateModule} from '@ngx-translate/core'; -import {NO_ERRORS_SCHEMA} from '@angular/core'; - -describe('MonitoringComponent', () => { - let component: MonitoringComponent; - let fixture: ComponentFixture; - - let store: Store; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [StoreModule.forRoot(appReducer, storeConfig), - ServicesModule, - HttpClientModule, - TranslateModule.forRoot(), - FormsModule, - ReactiveFormsModule, - DatetimeFilterModule, - MultiFilterModule], - declarations: [MonitoringComponent], - providers: [ - {provide: Store, useClass: Store} - ], - schemas: [ NO_ERRORS_SCHEMA ] - }) - .compileComponents(); - })); - - beforeEach(() => { - store = TestBed.get(Store); - spyOn(store, 'dispatch').and.callThrough(); - fixture = TestBed.createComponent(MonitoringComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ui/main/src/app/modules/monitoring/monitoring.component.ts b/ui/main/src/app/modules/monitoring/monitoring.component.ts index b07d4a39d1..e7357b7224 100644 --- a/ui/main/src/app/modules/monitoring/monitoring.component.ts +++ b/ui/main/src/app/modules/monitoring/monitoring.component.ts @@ -18,10 +18,10 @@ import {LightCard} from '@ofModel/light-card.model'; import * as moment from 'moment'; import {I18n} from '@ofModel/i18n.model'; import {MonitoringFiltersComponent} from './components/monitoring-filters/monitoring-filters.component'; -import {selectProcesses} from '@ofSelectors/process.selector'; import {Process} from '@ofModel/processes.model'; import {ApplyFilter} from '@ofActions/feed.actions'; import {BUSINESS_DATE_FILTER_INITIALISATION} from '@ofServices/filter.service'; +import { ProcessesService } from '@ofServices/processes.service'; @Component({ selector: 'of-monitoring', @@ -37,32 +37,21 @@ export class MonitoringComponent implements OnInit, OnDestroy, AfterViewInit { unsubscribe$: Subject = new Subject(); mapOfProcesses = new Map(); - processValueForFilter: Observable; + processValueForFilter = new Array(); + + constructor(private store: Store, private processesService: ProcessesService) { + processesService.getAllProcesses().forEach( (process) => { + const id = process.id; + this.mapOfProcesses.set(id, process); + if (!!process.uiVisibility && !!process.uiVisibility.monitoring) { + let itemName = process.name; + if (!itemName) { + itemName = id; + } + this.processValueForFilter.push({id: id, itemName: itemName, i18nPrefix: `${process.id}.${process.version}` }); + } + }); - constructor(private store: Store) { - this.processValueForFilter = this.store.select(selectProcesses).pipe( - takeUntil(this.unsubscribe$), - map((allProcesses: Array) => { - /** - * work around because allProcesses.forEach(…) - * 'is not a function', for some reason. - */ - const filterValue = []; - Array.prototype.forEach.call(allProcesses, (proc: Process) => { - const id = proc.id; - this.mapOfProcesses.set(id, proc); - - if (proc.uiVisibility && !!proc.uiVisibility.monitoring) { - let itemName = proc.name; - if (!itemName) { - itemName = id; - } - filterValue.push({id: id, itemName: itemName, i18nPrefix: `${proc.id}.${proc.version}` }); - } - }); - return filterValue; - }) - ); } ngOnInit() { diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html index 72814f5d09..321d83cba7 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.html +++ b/ui/main/src/app/modules/usercard/usercard.component.html @@ -13,12 +13,15 @@

userCard.title

- +
+
; + stateOptions: any[]; entityOptions = new Array(); dropdownSettings = {}; + processOptions = new Array(); selectedProcess: Process; selectedState: string; @@ -92,7 +93,8 @@ export class UserCardComponent implements OnDestroy, OnInit { private modalService: NgbModal, private newCardTemplateService: NewCardTemplateService, private sanitizer: DomSanitizer, - private element: ElementRef + private element: ElementRef, + private processesService: ProcessesService ) { } @@ -134,27 +136,21 @@ export class UserCardComponent implements OnDestroy, OnInit { loadAllProcessAndStateInUserPerimeter(): void { - this.processOptions$ = this.store.select(selectProcesses).pipe( - takeUntil(this.unsubscribe$), - tap((allProcesses: Process[]) => this.processesDefinition = allProcesses), - map((allProcesses: Process[]) => { - const processesToShow: any[] = new Array(); - const processesInPerimeter: Set = new Set(); - this.currentUserWithPerimeters.computedPerimeters.forEach(perimeter => { + this.processesDefinition = this.processesService.getAllProcesses(); + const processesInPerimeter: Set = new Set(); + this.currentUserWithPerimeters.computedPerimeters.forEach(perimeter => { if (this.userCanSendCard(perimeter)) processesInPerimeter.add(perimeter.process); }); - allProcesses.forEach(process => { + + this.processesDefinition.forEach(process => { if (processesInPerimeter.has(process.id)) { const _i18nPrefix = process.id + '.' + process.version + '.'; const label = process.name ? (_i18nPrefix + process.name) : process.id; const processToShow = { value: process.id, label: label }; - processesToShow.push(processToShow); + this.processOptions.push(processToShow); this.loadStatesForProcess(process); } }); - return processesToShow; - }) - ); } @@ -188,7 +184,6 @@ export class UserCardComponent implements OnDestroy, OnInit { } - changeStatesWhenSelectProcess(): void { this.messageForm.get('process').valueChanges.subscribe((process) => { if (!!process) { diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts index ef8140190f..b41bd5d63b 100644 --- a/ui/main/src/app/services/entities.service.ts +++ b/ui/main/src/app/services/entities.service.ts @@ -5,11 +5,12 @@ import { CrudService } from './crud-service'; import { Observable, Subject} from 'rxjs'; import { Entity } from '@ofModel/entity.model'; import { takeUntil } from 'rxjs/internal/operators/takeUntil'; +import { tap } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) -export class EntitiesService implements CrudService{ +export class EntitiesService implements CrudService { readonly entitiesUrl: string; private _entities: Entity[]; @@ -22,7 +23,7 @@ export class EntitiesService implements CrudService{ constructor(private httpClient: HttpClient) { this.entitiesUrl = `${environment.urls.entities}`; } - + getAllEntities(): Observable { return this.httpClient.get(`${this.entitiesUrl}`); } @@ -37,21 +38,22 @@ export class EntitiesService implements CrudService{ getAll(): Observable { return this.getAllEntities(); } - + update(data: any): Observable { return this.updateEntity(data); } - public loadAllEntitiesData(): void { - this.getAllEntities() - .pipe(takeUntil(this.ngUnsubscribe)) - .subscribe( + public loadAllEntitiesData(): Observable { + return this.getAllEntities() + .pipe(takeUntil(this.ngUnsubscribe) + , tap( (entities) => { - if (entities) { + if (!!entities) { this._entities = entities; + console.log(new Date().toISOString(), 'List of entities loaded'); } }, (error) => console.error(new Date().toISOString(), 'an error occurred', error) - ); + )); } public getEntities(): Entity[] { diff --git a/ui/main/src/app/services/processes.service.ts b/ui/main/src/app/services/processes.service.ts index 07fd241469..a9f8a2bde8 100644 --- a/ui/main/src/app/services/processes.service.ts +++ b/ui/main/src/app/services/processes.service.ts @@ -23,6 +23,7 @@ export class ProcessesService { readonly processesUrl: string; private urlCleaner: HttpUrlEncodingCodec; private processCache = new Map(); + private processes: Process[]; constructor(private httpClient: HttpClient, ) { @@ -30,6 +31,23 @@ export class ProcessesService { this.processesUrl = `${environment.urls.processes}`; } + public loadAllProcesses(): Observable { + return this.queryAllProcesses() + .pipe(tap( + (processesLoaded) => { + if (!!processesLoaded) { + this.processes = processesLoaded; + console.log(new Date().toISOString(), 'List of processes loaded'); + } + }, (error) => console.error(new Date().toISOString(), 'an error occurred', error) + )); + } + + public getAllProcesses(): Process[] { + return this.processes; + } + + queryProcessFromCard(card: Card): Observable { return this.queryProcess(card.process, card.processVersion); } diff --git a/ui/main/src/app/services/user.service.ts b/ui/main/src/app/services/user.service.ts index f88ae5c46f..5901779763 100644 --- a/ui/main/src/app/services/user.service.ts +++ b/ui/main/src/app/services/user.service.ts @@ -15,6 +15,7 @@ import { UserWithPerimeters } from "@ofModel/userWithPerimeters.model"; import { HttpClient } from "@angular/common/http"; import { CrudService } from "./crud-service"; import { takeUntil } from 'rxjs/internal/operators/takeUntil'; +import { tap } from 'rxjs/operators'; @Injectable() export class UserService implements CrudService { @@ -68,16 +69,19 @@ export class UserService implements CrudService { return this.httpClient.get(url); } - public loadUserWithPerimetersData(): void { - this.currentUserWithPerimeters() - .pipe(takeUntil(this.ngUnsubscribe)) - .subscribe( + + + public loadUserWithPerimetersData(): Observable { + return this.currentUserWithPerimeters() + .pipe(takeUntil(this.ngUnsubscribe) + , tap( (userWithPerimeters) => { - if (userWithPerimeters) { + if (!!userWithPerimeters) { this._userWithPerimeters = userWithPerimeters; + console.log(new Date().toISOString(), 'User perimeter loaded'); } - }, (error) => console.error(new Date().toISOString(), 'an error occurred', error) - ); + }, (error) => console.error(new Date().toISOString(), 'An error occurred when loading perimeter', error) + )); } public getCurrentUserWithPerimeters(): UserWithPerimeters { diff --git a/ui/main/src/app/store/actions/process.action.ts b/ui/main/src/app/store/actions/process.action.ts deleted file mode 100644 index 298cc5b55a..0000000000 --- a/ui/main/src/app/store/actions/process.action.ts +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - -import {Action} from '@ngrx/store'; -import {Process} from '@ofModel/processes.model'; - -export enum ProcessActionType { - QueryAllProcesses = '[Processes] Ask to fetch all processes', - LoadAllProcesses = '[Processes] Load all processes' -} - -export class QueryAllProcesses implements Action { - readonly type = ProcessActionType.QueryAllProcesses; -} - -export class LoadAllProcesses implements Action { - readonly type = ProcessActionType.LoadAllProcesses; - - constructor(public payload: { processes: Process[] }) { - } -} - -export type ProcessAction = QueryAllProcesses | LoadAllProcesses; diff --git a/ui/main/src/app/store/actions/translate.actions.ts b/ui/main/src/app/store/actions/translate.actions.ts index a770a4d148..77a4c7c0c4 100644 --- a/ui/main/src/app/store/actions/translate.actions.ts +++ b/ui/main/src/app/store/actions/translate.actions.ts @@ -12,6 +12,7 @@ import {Action} from '@ngrx/store'; export enum TranslateActionsTypes { TranslationUpdateDone = '[i18n] translation update Done ', + LoadProcessesTranslation = '[i18n] load processes translation ' } @@ -19,5 +20,9 @@ export class TranslationUpdateDone implements Action { readonly type = TranslateActionsTypes.TranslationUpdateDone; } +export class LoadProcessesTranslation implements Action { + readonly type = TranslateActionsTypes.LoadProcessesTranslation; +} + -export type TranslateActions = TranslationUpdateDone ; +export type TranslateActions = TranslationUpdateDone | LoadProcessesTranslation ; diff --git a/ui/main/src/app/store/effects/process.effects.ts b/ui/main/src/app/store/effects/process.effects.ts deleted file mode 100644 index c208f247d6..0000000000 --- a/ui/main/src/app/store/effects/process.effects.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - -import {Injectable} from '@angular/core'; -import {AppState} from '@ofStore/index'; -import {ProcessesService} from '@ofServices/processes.service'; -import {Actions, Effect, ofType} from '@ngrx/effects'; -import {Action, Store} from '@ngrx/store'; -import {Observable} from 'rxjs'; -import {LoadAllProcesses, ProcessActionType} from '@ofActions/process.action'; -import {map, switchMap} from 'rxjs/operators'; -import {Process} from '@ofModel/processes.model'; - -@Injectable() -export class ProcessEffects { - constructor(private store: Store, private action$: Actions, private service: ProcessesService) { - } - - @Effect() - loadAllProcesses: Observable = this.action$.pipe( - ofType(ProcessActionType.QueryAllProcesses), - switchMap(() => this.service.queryAllProcesses()), - map((allProcesses: Process[]) => new LoadAllProcesses({processes: allProcesses})) - ); -} diff --git a/ui/main/src/app/store/effects/translate.effects.ts b/ui/main/src/app/store/effects/translate.effects.ts index b5191bfb9f..6904c29694 100644 --- a/ui/main/src/app/store/effects/translate.effects.ts +++ b/ui/main/src/app/store/effects/translate.effects.ts @@ -12,9 +12,8 @@ import { Actions, Effect, ofType } from '@ngrx/effects'; import { TranslateService } from '@ngx-translate/core'; import { Observable, of} from 'rxjs'; import { LightCardActionTypes, LoadLightCardsSuccess } from '@ofActions/light-card.actions'; -import { LoadAllProcesses, ProcessActionType } from '@ofActions/process.action'; import { map } from 'rxjs/operators'; -import { TranslateActions, TranslationUpdateDone } from '@ofActions/translate.actions'; +import { TranslateActions, TranslationUpdateDone, TranslateActionsTypes } from '@ofActions/translate.actions'; import { LightCard } from '@ofModel/light-card.model'; import { ProcessesService } from '@ofServices/processes.service'; import { Process } from '@ofModel/processes.model'; @@ -51,11 +50,12 @@ export class TranslateEffects { @Effect() initProcessesTranslations: Observable = this.actions$ .pipe( - ofType(ProcessActionType.LoadAllProcesses) - , map((loadedProcesses: LoadAllProcesses) => loadedProcesses.payload.processes) - , map((processes: Process[]) => processes.forEach(process => this.loadTranslationsForProcess(process))) - , map(() => new TranslationUpdateDone()) - ); + ofType(TranslateActionsTypes.LoadProcessesTranslation) + , map(() => this.processesService.getAllProcesses().forEach(process => this.loadTranslationsForProcess(process))) + , map(() => { + console.log(new Date().toISOString(), 'Translation for processes loaded'); + return new TranslationUpdateDone(); + })); @Effect() loadTranslationifNeededAfterLoadingCards: Observable = this.actions$ diff --git a/ui/main/src/app/store/index.ts b/ui/main/src/app/store/index.ts index 190c24efda..d487f731c2 100644 --- a/ui/main/src/app/store/index.ts +++ b/ui/main/src/app/store/index.ts @@ -29,7 +29,6 @@ import {reducer as archiveReducer} from '@ofStore/reducers/archive.reducer'; import {reducer as globalStyleReducer} from '@ofStore/reducers/global-style.reducer'; import {reducer as loggingReducer} from '@ofStore/reducers/logging.reducer'; import {reducer as monitoringReducer} from '@ofStore/reducers/monitoring.reducer'; -import {reducer as processReducer} from '@ofStore/reducers/process.reducer'; import {AuthState} from '@ofStates/authentication.state'; import {CardState} from '@ofStates/card.state'; import {CustomRouterEffects} from '@ofEffects/custom-router.effects'; @@ -55,8 +54,7 @@ import {LoggingState} from '@ofStates/loggingState'; import {LoggingEffects} from '@ofEffects/logging.effects'; import {MonitoringState} from '@ofStates/monitoring.state'; import {MonitoringEffects} from '@ofEffects/monitoring.effects'; -import {ProcessState} from '@ofStates/process.state'; -import {ProcessEffects} from '@ofEffects/process.effects'; + export interface AppState { router: RouterReducerState; @@ -72,7 +70,6 @@ export interface AppState { globalStyle: GlobalStyleState; logging: LoggingState; monitoring: MonitoringState; - process: ProcessState; } export const appEffects = [ @@ -88,8 +85,7 @@ export const appEffects = [ UserEffects, TranslateEffects, LoggingEffects, - MonitoringEffects, - ProcessEffects + MonitoringEffects ]; export const appReducer: ActionReducerMap = { @@ -106,7 +102,7 @@ export const appReducer: ActionReducerMap = { globalStyle: globalStyleReducer, logging: loggingReducer, monitoring: monitoringReducer, - process: processReducer + }; export const appMetaReducers: MetaReducer[] = !environment.production diff --git a/ui/main/src/app/store/reducers/process.reducer.ts b/ui/main/src/app/store/reducers/process.reducer.ts deleted file mode 100644 index 33e72b5ea5..0000000000 --- a/ui/main/src/app/store/reducers/process.reducer.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - -import {processInitialState, ProcessState} from '@ofStates/process.state'; -import {ProcessAction, ProcessActionType} from '@ofActions/process.action'; - -export function reducer (state = processInitialState, action: ProcessAction): ProcessState { - switch (action.type ) { - case (ProcessActionType.LoadAllProcesses): { - return { - ...state, - processes: action.payload.processes, - loaded: true - }; - } - default: - return state; - } -} diff --git a/ui/main/src/app/store/selectors/config.selectors.ts b/ui/main/src/app/store/selectors/config.selectors.ts deleted file mode 100644 index bca7f3c13b..0000000000 --- a/ui/main/src/app/store/selectors/config.selectors.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - - -import {AppState} from "@ofStore/index"; -import {createSelector} from "@ngrx/store"; -import {CONFIG_LOAD_MAX_RETRIES, ConfigState} from "@ofStates/config.state"; -import * as _ from 'lodash'; - -export const selectConfig = (state:AppState) => state.config; -export const selectConfigLoaded = createSelector(selectConfig, (configState:ConfigState)=> configState.loaded) -export const selectConfigRetry = createSelector(selectConfig, (configState:ConfigState)=> configState.retry) -export const selectMaxedRetries = createSelector(selectConfigRetry, (retries:number)=> retries >= CONFIG_LOAD_MAX_RETRIES) - - - diff --git a/ui/main/src/app/store/selectors/process.selector.ts b/ui/main/src/app/store/selectors/process.selector.ts deleted file mode 100644 index d09e2b47f8..0000000000 --- a/ui/main/src/app/store/selectors/process.selector.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - -import {AppState} from '@ofStore/index'; -import {createSelector} from '@ngrx/store'; -import {ProcessState} from '@ofStates/process.state'; - -export const selectProcessSlice = (state: AppState) => state.process; - -export const selectProcesses = createSelector(selectProcessSlice, - (processState: ProcessState) => processState.processes); - -export const selectLoadStatusOfProcesses = createSelector(selectProcessSlice, - (processState: ProcessState) => processState.loaded); diff --git a/ui/main/src/app/store/states/process.state.ts b/ui/main/src/app/store/states/process.state.ts deleted file mode 100644 index 7f6709db09..0000000000 --- a/ui/main/src/app/store/states/process.state.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - -import {Process} from '@ofModel/processes.model'; - -export interface ProcessState { - processes: Process[]; - loaded: boolean; -} -export const processInitialState: ProcessState = {processes: [], loaded: false}; diff --git a/ui/main/src/tests/helpers.ts b/ui/main/src/tests/helpers.ts index 3ffe75f038..e1e942c0ca 100644 --- a/ui/main/src/tests/helpers.ts +++ b/ui/main/src/tests/helpers.ts @@ -34,7 +34,6 @@ export const emptyAppState4Test: AppState = { globalStyle: null, logging: null, monitoring: null, - process: null }; export const AuthenticationImportHelperForSpecs = [AuthenticationService, From 261e4fa02d449185d0aebd62030a865e544c239e Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Wed, 30 Sep 2020 17:50:12 +0200 Subject: [PATCH 06/76] Correct bug in monitoring screen --- ui/main/src/app/modules/monitoring/monitoring.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/main/src/app/modules/monitoring/monitoring.component.ts b/ui/main/src/app/modules/monitoring/monitoring.component.ts index b07d4a39d1..a3a4facf21 100644 --- a/ui/main/src/app/modules/monitoring/monitoring.component.ts +++ b/ui/main/src/app/modules/monitoring/monitoring.component.ts @@ -92,7 +92,7 @@ export class MonitoringComponent implements OnInit, OnDestroy, AfterViewInit { color = state.color; name = state.name; } - return ( + return ( { creationDateTime: moment(card.publishDate), beginningOfBusinessPeriod: moment(card.startDate), @@ -108,7 +108,7 @@ export class MonitoringComponent implements OnInit, OnDestroy, AfterViewInit { } } - ); + ).filter(elem => !!elem); } ), catchError(err => of([])) From f1eb6c435f258615a2ed20ff37cda84cfeb9569e Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 10:57:56 +0200 Subject: [PATCH 07/76] Documentation - Minor update Add information on external recipient configuration --- src/docs/asciidoc/reference_doc/response_cards.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index 8a0f09a0ad..c41cd376df 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -36,6 +36,9 @@ externalRecipients-url: "{\ }" .... +The name to use for the third-party is the publisherId of the parent card. + + [WARNING] ==== For the url, do not use localhost if you run OperatorFabric in a docker, as the publication-service will not be able to join your third party. From caa62761a5d9125d8b84b1c0c8ab0bb83c6da5c9 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 12:22:48 +0200 Subject: [PATCH 08/76] Add license information for gradle wrapper --- gradle/wrapper/LICENSE | 420 ++++++++++++++++++ gradle/wrapper/README.md | 1 + src/test/externalApp/gradle/wrapper/LICENSE | 420 ++++++++++++++++++ src/test/externalApp/gradle/wrapper/README.md | 1 + 4 files changed, 842 insertions(+) create mode 100644 gradle/wrapper/LICENSE create mode 100644 gradle/wrapper/README.md create mode 100644 src/test/externalApp/gradle/wrapper/LICENSE create mode 100644 src/test/externalApp/gradle/wrapper/README.md diff --git a/gradle/wrapper/LICENSE b/gradle/wrapper/LICENSE new file mode 100644 index 0000000000..f013fd5ddb --- /dev/null +++ b/gradle/wrapper/LICENSE @@ -0,0 +1,420 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + +============================================================================== +Licenses for included components: + +------------------------------------------------------------------------------ +Eclipse Public License 1.0 +https://opensource.org/licenses/EPL-1.0 + +junit:junit +org.sonatype.aether:aether-api +org.sonatype.aether:aether-connector-wagon +org.sonatype.aether:aether-impl +org.sonatype.aether:aether-spi +org.sonatype.aether:aether-util + +------------------------------------------------------------------------------ +3-Clause BSD +https://opensource.org/licenses/BSD-3-Clause + +com.google.code.findbugs:jsr305 + +org.hamcrest:hamcrest-core +BSD License + +Copyright (c) 2000-2015 www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +com.esotericsoftware.kryo:kryo +com.esotericsoftware.minlog:minlog +Copyright (c) 2008-2018, Nathan Sweet All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +org.ow2.asm:asm +org.ow2.asm:asm-analysis +org.ow2.asm:asm-commons +org.ow2.asm:asm-tree +org.ow2.asm:asm-util +ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2011 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +MIT + +com.googlecode.plist:dd-plist +dd-plist - An open source library to parse and generate property lists +Copyright (C) 2016 Daniel Dreibrodt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +org.bouncycastle:bcpg-jdk15on +org.bouncycastle:bcprov-jdk15on +Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +org.slf4j:jcl-over-slf4j +org.slf4j:jul-to-slf4j +org.slf4j:log4j-over-slf4j +org.slf4j:slf4j-api + Copyright (c) 2004-2017 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +------------------------------------------------------------------------------ +CDDL +https://opensource.org/licenses/CDDL-1.0 + +com.sun.xml.bind:jaxb-impl + +------------------------------------------------------------------------------ +LGPL 2.1 +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html + +org.samba.jcifs:jcifs + +org.jetbrains.intellij.deps:trove4j + +------------------------------------------------------------------------------ +License for the GNU Trove library included by the Kotlin embeddable compiler +------------------------------------------------------------------------------ +The source code for GNU Trove is licensed under the Lesser GNU Public License (LGPL). + + Copyright (c) 2001, Eric D. Friedman All Rights Reserved. This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +Two classes (HashFunctions and PrimeFinder) included in Trove are licensed under the following terms: + + Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the + suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. + +The source code of modified GNU Trove library is available at + https://github.com/JetBrains/intellij-deps-trove4j (with trove4j_changes.txt describing the changes) + +------------------------------------------------------------------------------ +Eclipse Distribution License 1.0 +https://www.eclipse.org/org/documents/edl-v10.php + +org.eclipse.jgit:org.eclipse.jgit + +------------------------------------------------------------------------------ +BSD-style + +com.jcraft:jsch +com.jcraft:jzlib + +Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +Eclipse Public License 2.0 +https://www.eclipse.org/legal/epl-2.0/ + +org.junit.platform:junit-platform-launcher + +------------------------------------------------------------------------------ +Mozilla Public License 2.0 +https://www.mozilla.org/en-US/MPL/2.0/ + +org.mozilla:rhino diff --git a/gradle/wrapper/README.md b/gradle/wrapper/README.md new file mode 100644 index 0000000000..bba8aca659 --- /dev/null +++ b/gradle/wrapper/README.md @@ -0,0 +1 @@ +The gradle wrapper is provided by https://github.com/gradle/ under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/src/test/externalApp/gradle/wrapper/LICENSE b/src/test/externalApp/gradle/wrapper/LICENSE new file mode 100644 index 0000000000..f013fd5ddb --- /dev/null +++ b/src/test/externalApp/gradle/wrapper/LICENSE @@ -0,0 +1,420 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + +============================================================================== +Licenses for included components: + +------------------------------------------------------------------------------ +Eclipse Public License 1.0 +https://opensource.org/licenses/EPL-1.0 + +junit:junit +org.sonatype.aether:aether-api +org.sonatype.aether:aether-connector-wagon +org.sonatype.aether:aether-impl +org.sonatype.aether:aether-spi +org.sonatype.aether:aether-util + +------------------------------------------------------------------------------ +3-Clause BSD +https://opensource.org/licenses/BSD-3-Clause + +com.google.code.findbugs:jsr305 + +org.hamcrest:hamcrest-core +BSD License + +Copyright (c) 2000-2015 www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +com.esotericsoftware.kryo:kryo +com.esotericsoftware.minlog:minlog +Copyright (c) 2008-2018, Nathan Sweet All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +org.ow2.asm:asm +org.ow2.asm:asm-analysis +org.ow2.asm:asm-commons +org.ow2.asm:asm-tree +org.ow2.asm:asm-util +ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2011 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +MIT + +com.googlecode.plist:dd-plist +dd-plist - An open source library to parse and generate property lists +Copyright (C) 2016 Daniel Dreibrodt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +org.bouncycastle:bcpg-jdk15on +org.bouncycastle:bcprov-jdk15on +Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +org.slf4j:jcl-over-slf4j +org.slf4j:jul-to-slf4j +org.slf4j:log4j-over-slf4j +org.slf4j:slf4j-api + Copyright (c) 2004-2017 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +------------------------------------------------------------------------------ +CDDL +https://opensource.org/licenses/CDDL-1.0 + +com.sun.xml.bind:jaxb-impl + +------------------------------------------------------------------------------ +LGPL 2.1 +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html + +org.samba.jcifs:jcifs + +org.jetbrains.intellij.deps:trove4j + +------------------------------------------------------------------------------ +License for the GNU Trove library included by the Kotlin embeddable compiler +------------------------------------------------------------------------------ +The source code for GNU Trove is licensed under the Lesser GNU Public License (LGPL). + + Copyright (c) 2001, Eric D. Friedman All Rights Reserved. This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +Two classes (HashFunctions and PrimeFinder) included in Trove are licensed under the following terms: + + Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the + suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. + +The source code of modified GNU Trove library is available at + https://github.com/JetBrains/intellij-deps-trove4j (with trove4j_changes.txt describing the changes) + +------------------------------------------------------------------------------ +Eclipse Distribution License 1.0 +https://www.eclipse.org/org/documents/edl-v10.php + +org.eclipse.jgit:org.eclipse.jgit + +------------------------------------------------------------------------------ +BSD-style + +com.jcraft:jsch +com.jcraft:jzlib + +Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +Eclipse Public License 2.0 +https://www.eclipse.org/legal/epl-2.0/ + +org.junit.platform:junit-platform-launcher + +------------------------------------------------------------------------------ +Mozilla Public License 2.0 +https://www.mozilla.org/en-US/MPL/2.0/ + +org.mozilla:rhino diff --git a/src/test/externalApp/gradle/wrapper/README.md b/src/test/externalApp/gradle/wrapper/README.md new file mode 100644 index 0000000000..bba8aca659 --- /dev/null +++ b/src/test/externalApp/gradle/wrapper/README.md @@ -0,0 +1 @@ +The gradle wrapper is provided by https://github.com/gradle/ under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ From ca3f76d8248ec8ba33b2fdb81ac7805c6977d434 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 12:54:59 +0200 Subject: [PATCH 09/76] Add license information for fonts use in UI --- ui/main/src/assets/fonts/LICENSE | 420 +++++++++++++++++++++++++++++ ui/main/src/assets/fonts/README.md | 3 + 2 files changed, 423 insertions(+) create mode 100644 ui/main/src/assets/fonts/LICENSE create mode 100644 ui/main/src/assets/fonts/README.md diff --git a/ui/main/src/assets/fonts/LICENSE b/ui/main/src/assets/fonts/LICENSE new file mode 100644 index 0000000000..f013fd5ddb --- /dev/null +++ b/ui/main/src/assets/fonts/LICENSE @@ -0,0 +1,420 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + +============================================================================== +Licenses for included components: + +------------------------------------------------------------------------------ +Eclipse Public License 1.0 +https://opensource.org/licenses/EPL-1.0 + +junit:junit +org.sonatype.aether:aether-api +org.sonatype.aether:aether-connector-wagon +org.sonatype.aether:aether-impl +org.sonatype.aether:aether-spi +org.sonatype.aether:aether-util + +------------------------------------------------------------------------------ +3-Clause BSD +https://opensource.org/licenses/BSD-3-Clause + +com.google.code.findbugs:jsr305 + +org.hamcrest:hamcrest-core +BSD License + +Copyright (c) 2000-2015 www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. + +com.esotericsoftware.kryo:kryo +com.esotericsoftware.minlog:minlog +Copyright (c) 2008-2018, Nathan Sweet All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +org.ow2.asm:asm +org.ow2.asm:asm-analysis +org.ow2.asm:asm-commons +org.ow2.asm:asm-tree +org.ow2.asm:asm-util +ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2011 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +MIT + +com.googlecode.plist:dd-plist +dd-plist - An open source library to parse and generate property lists +Copyright (C) 2016 Daniel Dreibrodt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +org.bouncycastle:bcpg-jdk15on +org.bouncycastle:bcprov-jdk15on +Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +org.slf4j:jcl-over-slf4j +org.slf4j:jul-to-slf4j +org.slf4j:log4j-over-slf4j +org.slf4j:slf4j-api + Copyright (c) 2004-2017 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +------------------------------------------------------------------------------ +CDDL +https://opensource.org/licenses/CDDL-1.0 + +com.sun.xml.bind:jaxb-impl + +------------------------------------------------------------------------------ +LGPL 2.1 +https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html + +org.samba.jcifs:jcifs + +org.jetbrains.intellij.deps:trove4j + +------------------------------------------------------------------------------ +License for the GNU Trove library included by the Kotlin embeddable compiler +------------------------------------------------------------------------------ +The source code for GNU Trove is licensed under the Lesser GNU Public License (LGPL). + + Copyright (c) 2001, Eric D. Friedman All Rights Reserved. This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without + even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +Two classes (HashFunctions and PrimeFinder) included in Trove are licensed under the following terms: + + Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software + and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and + that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the + suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. + +The source code of modified GNU Trove library is available at + https://github.com/JetBrains/intellij-deps-trove4j (with trove4j_changes.txt describing the changes) + +------------------------------------------------------------------------------ +Eclipse Distribution License 1.0 +https://www.eclipse.org/org/documents/edl-v10.php + +org.eclipse.jgit:org.eclipse.jgit + +------------------------------------------------------------------------------ +BSD-style + +com.jcraft:jsch +com.jcraft:jzlib + +Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + + 3. The names of the authors may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +Eclipse Public License 2.0 +https://www.eclipse.org/legal/epl-2.0/ + +org.junit.platform:junit-platform-launcher + +------------------------------------------------------------------------------ +Mozilla Public License 2.0 +https://www.mozilla.org/en-US/MPL/2.0/ + +org.mozilla:rhino diff --git a/ui/main/src/assets/fonts/README.md b/ui/main/src/assets/fonts/README.md new file mode 100644 index 0000000000..961b586d63 --- /dev/null +++ b/ui/main/src/assets/fonts/README.md @@ -0,0 +1,3 @@ +The MaterialIcons fonts are provided by https://material.io/ under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ + +The Roboto fonts are provided by https://fonts.google.com/ under Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ \ No newline at end of file From 1cef6aac9a3c86e7fbfc6e22520d0b2d0dcd90a7 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 12:55:25 +0200 Subject: [PATCH 10/76] Remove unused image --- ui/main/src/assets/images/icons/time_is_up.png | Bin 3664 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ui/main/src/assets/images/icons/time_is_up.png diff --git a/ui/main/src/assets/images/icons/time_is_up.png b/ui/main/src/assets/images/icons/time_is_up.png deleted file mode 100644 index 36ad509ad5ef47be6ced675e9fefa5485e159321..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3664 zcmcJS=T{R<(}x4n1Of^OBHWQGNbkKDsnSGxQKU#Wbm>JvL`W#1L+FY~xCMiR77-Do z_lOBiAe2z0B=jf$!F%54oae*te%RUH%-J(@&2E~7nE{ag4m|(>02&$US&`RJ@_^D& zl4sOz^KSrviNi=w+d6_`yYyv<_4Ge|yF!!ons*-&a079J|7ehr_n1os>97uH+j zzb8KkBVZt8uMcy>`BL4Qov&jrb#KrIgLHa!%RIpKbbDTcyJx{GfgF3;vkBG|*7^1v zcb)lmV)y=tEAeu^b0I1YPE-w?58_C`tkJHdzKy?8D034es70#Gxb`i7Pu~R4ppxeL zjYFK`^QJ)Tb=S{SV;^!zg3;qFTJ>gs{{IH!e{WU5(A5Du1kJr+UNjt?z)lIxDMk9M z(ld_eJX~CCCtS=4ZJO%>mq+u4#3cGhdvOw(grvdk?yc$8VbmP|^6#uW;644#uksR^ zNsSiqRj}6bmm4%pqic_C>8TQ1FZsoxl_n!Uhadd@-uj19ZCNO(d+eDbe4Bt)nn}yf z{*&LLu9~+hHIDmz+NZf)&7g5iaGeiXwrZnxywi7a4WK1Zxe}y2S8pLDoMW`X9^#FB zkZcwm&CN2r=BD>#-IoM>r3%(nt~)eX z)s;KGsNLTm9vFz{CX5qx*v*`$i3Z9c5l>#M<4(fbo`Au;A+Cm+Z+J6cyCrXC z?=+h@FV}6Rvx@|C&4s>sARxYH z2^Y7><7_O(B94A4J(sAN0h0tQ;*0aN&0_agW9x@$INxPmxbJ#_B$o@Lw1=H)jFo}+ znd-?V@O)KY8_qcj_$YA(yE`F1X&6piC&t78KD2rsH9)E3*cDv?Uu&agv|~YDOX@}&(lcQrZTLiMs|bUWkPLFTvW8K=n=)sGrZ%K+-=TLq(y>JQ()Ic zqsz7BLLlJZ{WZ#2t)tV+y#Y9Fs+cX|WCucwjarwo_C1;C z)la5|X61`%Mjr$PEBM>mQ}5!229^GKpYzOK z;5UNLGWeyxA7HismwdpA3$mPwgN~hz}nlE@y?lyMaIEs5wO7u~WFFi)jpHf|eL1 z%CzN4cgL(pjqK;4on6Ds2%?Nth%53i<=0<8JZd^P_Uw@L)0dEC_8-qyass0a zFzHy=qsS$!9r^I_j(j+-#ix?OdV9OHJ#5$8n{(}8{ZBGO+5D+6DD07UvSL>NWNrUl z*=<2!ZE7mNn7AYYT<~e=k#`cv2@Pt>95UgL0Qec$?vu zi(MH|2LrG0xip&oev>@fu2cvpb)MIP?P!G+B3!FFuzx%)>g$WwA!%H?OS&%!l9kl2 zE}2(0OTRRV6m@Tgl6sic0i|UwNgKcRb1Za8&8;U2$j>fP#PJK$F`u}WSn)ZTj1V`S zZ|a1d6p>gYd>;i;c_WlwyxUz6s7%1j-HKwC0Bc4moibe~o=@Ex3XJTesp?sJb*Hzmci_vXv~ETH zd?zJ-xMLs(W@e0(!Q)sGpYv0y1J3JxLgn6bbI9D zAk%4PZY3(OpI?$|D0u@baUr}Zr_tppd!D5PQFe|OwLK_cl^7br`Xd|)E15L9I3%P% zq5!~bp`qvTij)weGWW<$4rWnJJ#&CY*R>(rPLZ0RO3d0L#*DN#f~I_!S- z(b01t#ku-dRO0G`PgSx`*k}QJ<%Pm3FpcG926cNLdKZA!$0k+JA4Kc17gj0KhPkZ0 zVEx2yD0cX@tFb`hYlveOYt`USEI&==ZXi6SD-c6_S6enpi9#_nE0=9<Uj#maL`eGLPj8g;IBlV;&V&bnqM@081F~e`h<11s;lyEH&!0K`qU_YL*3N;kegIDGS<*Ey7k8Ai6{w74^n{N}=9^&K-y(y(yr-(t z;qqTXnV4o@!75CmTFeEeLyPJrpI`XrUX4|r5{`{2h)&VW0 zadHQbqO7Vc5FqvESnf+GmYd1ga3dR8(@QN=_v#>c6u9t2YOGE%@75^PxVKdO$B(?@ z!>MFI{1YBK+c=vl8}SlXqwC3$RVYLk*vKDg#hZi>sj%o@KBCs;&3gSeGUnbv@8_u% z>c<{;j@HX3Qkwm9p$@SygNBxmLN_u5^-r!lz$RBUCL>(lpa~QQIcQ#>ja_lOi@F93F5pxW`t{@}Pd8 zN?o)p%U9~?ESjRu8ux6ImG0F6K39MFd6;*_;OfS@g7t7_a}(O83dCTZJ{=I=Y9m&k z<>YWCr7l0aafh=-h37_4VaUd}&G*vEmc_*|Ph>{k{%N#TnjLRGJr!kxjdM+>+I|uILoD-43bJY^D`&64_`94+cdm!jHf7l7&%4VIF(dWXBJPNrqlLA>Ao<#vqekr(rnweH)=fJb$gVEZ5NeNO3#kT%t zrWVYMz{w3pMkb+qZv*xPZqR*O5;ftH3G;Aksj|86#1CTjFC4JgGw%J=q|naKFRovA zd#=W&CfBQ0_84b6_JRJOIbY&qt?<&FJ@U-a8dQ{2 zARAR5xR#9$MK}VyDPp=}Fx2ezn$jeN_8Jdx~ZVmKu^bdQ7 zS=*H^$iR!9Swp7DXw7@-cvy6UK2^LYKU`X_;I#O+iUF?7P{6HOHRdwj>OPs-p}>du zblvVJ!nYaiKeqhR9Fq1>xXy%NX8EMYi*BM55Uh5$N?V^ON_PA7-16aLa?Q1+{4i9? zE-1H`LtBBp`Q4M999*o%f)MR>NPf%u`}YT$Rh`BiWH_VYa_A2osD=YlohPrLSpP`> z;Lm>2G9)IQ&uuVmoAYm!%WmAI2ZCL)0jth=dFRq@M%?rCh0S?r;XZbaZZu=-f zRB=QBjviCIO-Du9UEVzvxWhFxV!CR~T{m)c6WwDIW$iJBk27>uq#%)q%X)wj*yzNzB^aDTR8(n_uy^SWMA70;Uss2YB=Xcjz X0#dh&+;qu5MSzjMnI1ytN#cJ1UUxPh From 1885768faee819d93a8e273ab4a4c1a76027352d Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 14:38:52 +0200 Subject: [PATCH 11/76] Remove unused svg --- .../src/assets/images/icons/sprites-mono.svg | 11 -- ui/main/src/assets/images/icons/sprites.svg | 11 -- ui/main/src/assets/images/icons/waite.png | Bin 21696 -> 0 bytes .../src/assets/images/logo/logo_lfe_lc.svg | 134 ------------------ .../images/logo/logo_lfe_operatorfabric.svg | 125 ---------------- .../assets/images/logo/logo_lfe_powsybl.svg | 76 ---------- 6 files changed, 357 deletions(-) delete mode 100755 ui/main/src/assets/images/icons/sprites-mono.svg delete mode 100755 ui/main/src/assets/images/icons/sprites.svg delete mode 100644 ui/main/src/assets/images/icons/waite.png delete mode 100755 ui/main/src/assets/images/logo/logo_lfe_lc.svg delete mode 100755 ui/main/src/assets/images/logo/logo_lfe_operatorfabric.svg delete mode 100755 ui/main/src/assets/images/logo/logo_lfe_powsybl.svg diff --git a/ui/main/src/assets/images/icons/sprites-mono.svg b/ui/main/src/assets/images/icons/sprites-mono.svg deleted file mode 100755 index 355f654ed6..0000000000 --- a/ui/main/src/assets/images/icons/sprites-mono.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ui/main/src/assets/images/icons/sprites.svg b/ui/main/src/assets/images/icons/sprites.svg deleted file mode 100755 index bd2bf9800c..0000000000 --- a/ui/main/src/assets/images/icons/sprites.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/ui/main/src/assets/images/icons/waite.png b/ui/main/src/assets/images/icons/waite.png deleted file mode 100644 index c54a72275f02c778905d688b3193463b64556b8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21696 zcmXV22{@GB_kU+JrjVt?$QmND?|Wn?DO9#JvL!pCkTO!TjJ<}kl|cz5J4sVCNM^o+ zM3zPqGbquJwfyh&`}aIOlX2hso_p?DKKGo@E%nq%>%CkDxgZGIYincS1VM1{PdK!j z6MU@13~z#uT>)keW)Soui+kG}0e+V9v2k*Mpg1`Q!rp=)_7E%+f}+(RXdVqg1_cl# z9A4CZ+6erD^P;`A1^5JiHq2ipfR8=lHf~W6#M{mO3%hreR}_4S#MnAmBEKQU_w45! z;Y&CPLC$Hm7G^FnpMOkVE%5Xk>skJ3{8FLu7B830UgcZgKd7LN^WQuoWO{0k>N*!! z+Ib5lW>8m}xJ$M_f*WRu5S0?R_1~3%D;$pwOGz0w?%J*JGU|20ckChAvAH#U&DWIZ z8R^0gMXYPQW5#Pn3eT|#tx`a?3PQIErSg%gUT>bcXpo{29(|MT1 zbN$5Zl~tjXyN(EK@4*2RWvf<{NXHZ+6-a(~`Xi>P^lCZW)cq#K&m14Idr7D06U?Vf)7D-A zejSxSY8`Da5C!i#s|d+9ZCmMF6bvKji7{4*Oy-F}ozSkfl#@4n^4c^Fa5ma5kj>K= zRnfd@hl;|#iI+?|yG2zvY48RA8yHkhBv?^5t1Y;9UuL%+R{`9&Of$9SCWkKC(>3nI z5*j0wqkS4CmFnW2_;W9+2SO48Hgi=hY3?|d$Us<#G{p*OXYh08fG_i{YxmH~7zS?< za5)+Xb-E*KvTsSHh=3g^W2Fp#h)w2s{YL*&2JF-4b30#s=iY4@tv7tCnIczO#}-{T$^ zw1*z+#SxFv6WlwS_q!fNKTb31*Dy3Vu}c!I%XvTJ#neHsX8zGLL26pbTu`8*BwCy^ z7D>8;og}bQZbgM2?ux}M*^d`LE~9Hz^mRGMgzajUTz*GF;Ae`d_dRmJGh9FYu4!}# z$MDsi#z^Gsa_9O`-utQcj$v7sRxYCr72|PV^#Uo>TxK<5R8_j4y^>2!$M@iS2gBJ)E zX0XmjZa+HEto$3+?3bM=P_p&>{V}B;7eT`prz2g&M^6shiYMPBU?iyAy zd)lb*LliaQ>FIfa4zAIbv=&t#9??MK+nY`>DQy-^$1f!dCTZdEBTZ|NPRtT{C!&*T zP3UrYyR|Mz(ycbZMr4m5o~RyxoU|zo+Dj41$ltZ%#n$B+O7GSY{TpRJ`edlyR$u>| zD7R5nYfkRkCPo(VPvXy(!A%vtzMQi+08HguIu@^(1Se0-U~y+PYpI<^G-#rM0yywk%@=fs4twt8XyT!AN0cD}-OdP(on;~N?C z!nV(?6Q7^{rnKN4tLgYX_6A(cgVCkpdq{K~!&x|nKU)De_4>v_bv1NIG8%}L?D<0% ziF$qY+Z7`6ETcP6LU8Y!^zS~#p5wSHjqN9X+{r#myDs)Y^TRv+y_4IP?gM1Kgx^Nz z;#Bhv#+D5hJR%uCri7zqSS|YxKp|x0Xdi1^gzk8^K{G$4d@QIhdkr3tA3B_|3iL-bgGlJ@= zYG*#v!U%bKY$mB~|GHNDMtWoQUaYg*d*!JfvnGiT$Wfv78~Y;zu%C3Mjg%b`rlQM6 zTTW7Z+i+usaE`a(MbG)zzh4n@E>X}`4W8vFw5RjFml7PqNnBVRT1(x1#>Uzn-zeMfJjz9n*adITPx-go!!g3>$J6FC*Ch7X2p{ck(Q zkqn5J(t;t}TUTLM(Ew#!1~x-Y=j|BE?!p3xW%ZV}c+sW2SRUfF`&P*b`&u-aPHDlH zjFmDw)dDNv4-xCZBNvrBZ?PgCY8qq>`znxMq4?l@G$Y6e7jbNf-%_Hy(E7s?^WjmJ z=vc~&;15zB=-@rU87~fdZ5jt#Hdv+F6O0lg_EDCvjXaVJc=?|esj#rABjTtNEIV?F zQX;4?IjU}uem6uUT$OC3F>zay&&Nb9OJz})fD*4e-2p(sF0^$~vHF$nv7G6I*Fn~d zyn17Ju!J~#J#j|wkb#AJ6=b7OYAH|OP+E#zsXEpt0iT69P*J^VcV;HWz88<>lEn#G zwM?{pny-30R;laVaTnnR*)QUFpL`}iSfkYKjx2FCGP2SlASXWtYJId)T`J8n(nY5} z8vKBCy<;ZlT~YS1R|1uHih6XXDPyKp)xhE)c&i8{N-LbRE);{;X(^g^{QU`bohPF9 z#~WknqtA(ab-ew3x!z&8Kt1Qgy@V)RetJxQWGDuw1y;V#gjmTFp%QKb9$hsGHzuF) zEqKSTTP=D_WTNlC9t(}{d%yQD87yafo;#V#Si{ppsD}n^5T;x)lE{nOf-!#JIgMQ_ z9OvNY>a&AF4D8FyZDY6nn`OFSC?u@|=JDsEPHtTKk@^>0zup5$)k^y>;eVZ{nKO6J zXc}>Ci!dm-naIN425MsYm5RXnp(DQxa7m^~B==19fqGA2ahVW|v+WT{w0&~Hp6>^W zE8b1A6Ma9^|H@IvH+kMB#AZSLT?{GoF|CJn2jbsF#)FOc`~0jj;0x;)PGWT^bw;{-sJIg{1F3tE+ym*d*qk;zKMh4R^?uH{d}c3R;U*J@eACLQhzEC-xOiWvEixX ztMED?Cf&*H6(gM7wNbJfo&eCAmD?l!7-2O71IP6C$;j^q#ijSUKw36|nx(H{`w0!Q zqZf-b!#n+qjU>S2Zg$5cO%NT(0kJ2qr9Bq9x_iM`>{`91$Y0(LMFace%5U`2Po8YD zH3Fi@rhVz2#r(3RB@suNM#^1!Q}son;xcnC(C~f69PBSVcwh11M7;O57`@-U@WQv( z@mOVrU$I3#)Zg8!;V)+Nj0`LWtDq+`Kk25p^u%Z&%m@A@&9r#S$w=vH#`W*;cyaoF zOeKXiE$*@IN==lwY#*3ARalRU5pW4jdH<|izpwrNesK#~<&IKgk*_YeIk46JqvQ1- zGBb00ALP3uy=c3NSk!?8%a-hE)Ba@xkXRLc&QJJGe$QI=r)4sYs=kS##1FA$CW^C6 zI+LRgw&PV}cF|*I^O{stvUp{3{qZxZf@9)(dt3#J<Eb=rDZUt-T?N6lKVmx7Qs%6b)X__tVd%3Tdjl zM-&da%9dQnW5~w2@oZ z7cEIIz=E+m97)Q-R~$1)NpT@_pLo~C2_Sc_T8mp|D)msV6@qAI_j0q?acecR$Pp=7 z*JmUwZegLw;Hc^1N1(xeTPW5yHOnMaU3uA8n3>xLx7rrjT6QSnKH`} z+|QpsWTLwxZ^!ZHSqiVTbaeJ~Fovbt!-)&vqir&!Y^ftz&^9MYy<0M{G^_-cJnF2Q zkTXIY9?CKjx@d*cQs(}nt* zs7h@{K=ch*ca?viY;YK6*d%9nF+3grj-B8d>DL93CHf%N5V#6NkYG&Z8BE62Dj?ZErRo zg*u2H;hhJH344AC>VJrIUoX4&4<$|6<;bZ2MvT0Ror{;?Fd(vwc(xDFjM0iGA#_7>gJImkid2)50!5ByWOlT|<|jAn(2d!hO8 z8mH#lp3ctl{dYT}YAqsltv&)%SZ+tk|8L;64*3dIAh%4J3u2!eH}=q8y(Ts~aFpcC7M6JqC;BmT}^Kam$^EZF>aE2RF4Tmq0 znPPiaP~;mU1GlMW zqeVQLiKnS<2g^%&e^Whwj(k1IN%y?;*&+7o$k&~+apmgSSHZX_i4Yy1>co<+b!$vY z`K3NMF@S0-FARU4LLQXTZ7AXh*2uC%<`^7Z3Pn>YONKUXF~$tq=jypc$mQ36D+VV2 z^uRwRn9Ew)3qduM7VIaBo=e%)sII@iFP8wLU!6J0si#jH_Q5(@v|R9ds>S~F7$pjdpvViqxHZ5II2VvG3d@eB zgO11GgV(8!1 zUrJfLKy0Z-=~Y+0enOHBhsf5Qk}pXVRnx$ko{^IFi4)g- znIro~t4H=Bu!hOYM{&hv4O&Du-`K3PYe6A5IOy0P=H`vRFS-T(l5k&I4$eEzCuW)R zs>Yu6_uOOcD;!GU(xgIy&u}p-Dl*>YWouL7i(p4}y`%>76~9YY7k!T`;hACzFHkW& zF(_ATl(3Zq;ZyyGbl!Z;@4hg)xIb3MAoz1dJ9H%E7fTeUPIa6AzNYl;QuJ0! zjlGIBH4%M%XdltJz0T5c2Qsobjpy& zV%uw004cJZ9nsRXavmX#;ckD;6ML`@1VT-sW(TqljuNZx~S*hx(*}Ejaa^~vGYjgXz z__HEZxrgnC4?4L)F(nRINo&TFhH8b#C$k`iwJCie5ao#SRUwrlPF~C_S0!Y+e2&K3 zT{zX=b}adYX@6SFV;3Qa=gW59gyq>P7(OD!!8-!OFOYiX!D>|fT9k?9)SIO#{=D^{ zB!5SaEVcOk3A-57!M%S^ry1RB!178^AFOHQ4j+KLXh(`#EE!J-NRe;o!nb8iDd}9X zk$0Z72C9B}bj9WFsdgBd8@D_nU)hb1ZN#j9xF;UU=JTZmQn(`of zr8Jff1B2^%8Nr)QKK*=_CKjOoR{$g{i_gxAT+q(|Zro4yOpdO)!WMV<1#*7hOM_z% zkwG;x^R)c2IeC5#$7C9`anr^9 zKTlX&SbRO)4iWVbqdEpw14RM7OJ|iofC+4KM&U%{=wA9Quo0(rWhyGqgKu+prz$}c zeRnzkW<1?MQ*jgz-F(X)FtyuhX>RCOhj76`ae_bTFlIS}i30WPqxPOK8VDB4AHghY zcX)nk{rIIKExqS%D;&$)$rmgpPOx&+?Dp2V&j9%|C8fr$46M;7q3Egw<4MxmsKms6 z@#7X2zR~-fq4g66Y9~3A4D3VpPM_#se);bOLAeERthk;;fuJ}+j$ErWv!ALCbY+#B z0w+HAGp40e^)Ii8sdZKUif1c5Cr8#t72C89uXDrT9-t(f#agV{;wxCk@L@rr7A2WV zK26|O?xzsUfjD=Mc0do4!Z>`&e1_2`{dy(_w^CAU4j<=+D6E6DTB`6P&Louen4pj) zQb0hU%EA>!JIT2ox`KF;y6n&&8HM2iue5u&3JI=XcqqRKcNu8A7rkNk@9WFA*m32E z(#N5{oPFUn4(Pyt0$%Q3fqeCN170#opJ*=8f6`NI9%#RUmfUa%6Vb_~gA=6VokDD# zlnV{~grRzn*xE8tuL?67s*s!uEDz-OOP66Zj+&(9Ii}Sonkb&2`%miH2jd*4z7fi= z_I=UEO;=M70X5A(3IyJ!A>sJrWUM(cLMO+MYWDBzSYt@Ugf|#9NmDE)JWBx9de}h$ zB=AjQPnoDkg*>W@QN~u#uya%#lor1mB|JI$6jk~n)ks9#9LQF3&{FQ`{epC~8l5K+(wC#6BG zm5*^&;{&O6u>FX|Oh_>7)HhkBr-9mPCIN0j7GT43d|9v&?-ZZJwNt)p!arlHJJ&Mc zSBRr9#woFmEJO7h$q~(dvF-QAM0Gfc+#P#l#y^mTZI7|^4B3Lo=C5hI=Z?R5Xc2h> z`tJ2H5m$_Lj#ykZx^N_<;FDm6=q_f_M2*$(nPkUtp5!tgU^5!Al9RqD;)c$u2QAbn zoQvM}aclIk$d5}lFxsE*djQlmS!AZghqVeq~X)Y9&PpPf7jHA=Jl7Rh1ExId%S~nw7{n|_n zl7YCV5}%t7wKOCg8y|v+eMw2uEkn}&{MTW|6RmM;d4tIh{Mx95!NITfY#`>j@WCO& z^Pm1@^CZQ4$&ut1m07EQDqA*bPyE@FOzSUUXs?oK=r^r|?X|gT^mR2g1p})-9p8CF&PSoZ z2sLw79R6IxpFEkt4qtsvpZk70Q}xeA=6>n5S~YO}69*M#9e*$MH~I!TFGlO%vOdI2 z?d^~@AlZ#P%3J%ifR0vxw%td%Vy!2%tKPG4vq-j$%jRUJ^VZpswicRnOs~g5Bh$Ol z#l1mJ>WqNR6;%+SSSDAXc0yDQ2_H;>t?He+&IK{f=bR&OnOit6ur1~N(k63vkZ;FJ zlYyEX;R5JHMyJGq_TKjUl598J_oQI`+UG|mEx#R7F8_ob`K2LIm(j0b zR@Uq{D`wP53K#oWSdDD;jYOt==E7c_=iHeLKK~(&t)x9ohY7a*J|PUI`;=ESh_g84 z)V|5TTysOOK_s2>Qp(6YrNc8#W*rF z8%*i^*x9xTC+bVL&m5RF{=~+#z>W9){6dAj_ZM^f;Zdy!b>wF}+I%WQL#c-$3Yq$;!Ip;&83OH9;(C-ds2?+{qf?ul{01RYf?Evf_tZWCK`=Vf9cARP9To=f911QtbbdxMR_CWT^69=cDiNhgxsLUo(a91Fcd9H$kw<7qKj2 z5u)w};wTq`4~HFjjYKQ|mUjr+30M!o>;lQREmLr>?1ks`GmA%KcP){a&1W7``;RH>=dmWFq;lyf>%WA!0pdFlI({IydT=DehX>WRz0XUlR&Bt35f1MRjwv#>)c2F+vK1llg`gF$m%ym6|bAeB23jm zxAAdVwUvd%;Nh_~q30c@A}^pNQPiCmS25%78;i_t2(zu){X|Z>?cyNOQN8(>!%wS4 z7^(|{#$XoSU)(-#zmt|?^U94c%lvpxzP|9d1^&!tbEE|9yYOT)m&)72Q~{6xEDz`# z8@#=|{p5jeh9{&qMDRE(hy435ak=NMX7}vVMJ+jw3>00SY9+ymjQT@r3hmK;^G*M6 zIzqGYC`FI($BFp7>Aa7fu>;1C{pi*1PqMd{8O+_%(u1FsdZ49OOtHfkRBByZ@8yIp zZdtWF3w{PSwXk@A-t(9yc++`1{dSRiKWxMka=pw6nVir$5Tp&#>H9I4lAc)2@UT<2 z5{BN4hZrO^iTO4mOy8I6?7ZX2`iGw0#KoW(4n(?x$?A2%*kXs-7w&wGz=^bsch0Q= z@6x&-9c5@)3AJd?-Hl4TUi}} zywhe{pL-!c)J%s}YPG7bPJ4z7#mKQES)+X6Tj~BtHL~HO-_JJg8Qo&(fP=Whx3M^h zn0xF5%@q(yP&r%tN5%jPl5TVqtiJ$?=ZtA2bs49yBJg!d(X1`2Zv!>6j`AEnqHz`T zj0a2zK!H>9dwU}k7hY(Syoq6tz8hbbAhkja{@I46Xx8<@_pFTfpW7ZB`$8BKuC+@S zvHu5edeeg8_KC;t-kARL-F4nA;jpF7J0=9!0|k!BhD!Y%{{EiPF!cAFT-)e|>M@ut z*zEguM}MDrb@_r!&87ghApldS@#iR8Qk#RXYM`aI8t(66;x$T@j2$4-$Cy|?qEq{$ zm0;;Hyn468KO8d1oIzkKDz|q07XSnY4w0i37Yn0dEbl1hmF%R0noi)EBoZ54gdyZpW}eZz-tvR&{0|EbDmDzBn`8dH z%Eh)!i^1;|2&}rg!6`Qvh>c*rfgc~2L%mNRHbQy#z5yCM4e} zq4uoUu2u(3fyRDHY9_#FxmR|Sp`ssUU3a}xPW~1DC;gAX)!oEaid?-C+azp0*RJnI zFEG_)6g7^qx7gi6xOqD`dd^t4XZf2jWLsVWGK)2IU~>0A(icM2wXymH}c z;bP>V#HMiK*&E(-uYZ4eZcO>1r>RZ`5&cZ$)QLH%=P8|#-;sI?XUNi`TpJ+r4x;*Z zVtkQ(I4^wU>5|$@bi6?8C+_WGx0js{(WU`Z(G1X75zV;>@h7K0G?rrrA)UpAVEkC%3LXdZv zeC{3!wNI|@C>1}qnlDn?gF?rzyc0PMy7VA)yChOzKl$`nN00nkJ7dh-yChin>sKFV zA3*}B#`e%px)kj$arZc+c}@aV@JJIexdV}8{uz@Z=$zmpB$g!`*JLPrj{Y^{bbKdh zdgLj42b?OCo|_#vxg>gF^+t2dbU%-XPA1s}Pi1eOtZ_%y`S8qi@{5~IB45*0<8$7K z2p2!$F`ppQ|9QlF|9CNGO6Civ%B!&@=iY|H>bx)|8cKB{JnYmepl}DE_84nS<{1=1 zj63^{(`o3*)&*ePGF^vUI-ey(=~?qwpRnd5I#Xf5R1`rf!+zAb!h(;N6OhChoqraE zsI)?&6fPJ5XvJXXv;$*U$E@QTN_xN^xUodEJx%H4NwKmAedVe$Yjz(tE^ZtQ3Fk0`IeP;Zg*4*mipBc2N8g4*|HJo;{GK@wNl%fVi3Ls?#t> zcCtDoA#PT#jANYqNslSLce9jR+VXc?iJqdYfO>W+KC@@!9nUG;Np)#sIKORLm0%kP_S1;p zDWIcZV_wx75XqiJ%##9v*2wHfpI9GO zU{}(>bGrkRrRFO;`2S&9nJ2Ll7Py!7v_L-b1Lu%6x<5g{8hYmkV7h$Q-l_d z8}A^FO;LoXi5AEI$(l6Bge|!QyD3R`Sxt*M=3E26zp=m28o4j<8PhWWi}~$w!O>W?g=H0V?&^UyChqewDur zUURTd?w9P+B}}HkL=N5!0tP%7y1unOs5-h*-u7gKiYg=3~h$oc4%`Qk~u&X>a9D=EmNp#)7sO zB>m&kKJp2Q=J?j=F)*$o*uY-R|po(cgH&$zDoMlxvW5@^3QRZQiGT9KA<^&-|Wh+8>R`&GK2<)8gGfUa`UqHY5wlw6uhRN4;`$ChXPdtUGyro{0q{j96rt2WFy#OI*$4cMqVbU^m?)RMio6aMidf|CYK{e9! zbCzG*r}_@QfPLWtH0u3*v#&k)85Ez-fxUQowBQ)B6?8)3wH)zx4=s)W zHCv2yU0j&m>8&#)KYwx^OB*8Us>!)#mfpPwBeFhl{!Z(Zl4&JHeis!#E}LpZff1`r zuY#su9GqcoM7bK`uK4>{jt;%0P9#a}4ofKcbyok_ejgF?F?Ij?g8TRWj!UROT-y?i zIwrT;%?-TIam?D zV7^=KS9vt+a9S{BNvQjbqx@y>YaBZ(M(1KmM_jW<>Mz2=!vJy$rn69>7Fd4Il`qR9 zGj9$!Q&2cW8t|eyQGzlMfqMgwLI$qgS3vf3&vBTA^+&+#oCCQp4rC=%0mC}rm0Ie%DH*_%OiNGaisT@-;bXd`I_!eLrJOLy) zwUbRXBktMX;`-|Ir+So8FD>sJO!NtU5~h^nTA`fs8n$8q2Fgd==#A_QaBdvADeE|U z_<~4_HBvF@Q4b_Nt<-Z5@54unHch~k?E1`4Psh!MQdoiPW>2EU*}HCY3m6>%!O@3+XkI0IHL2xX`9N=fgmeiiC=yP|Lae$_g_ z?xAwTNxI15Fz~Tmf$_W8xnSSiyWk`wbIEdb!|nQac$))axW7Iw(>$E{LX>=Bvu$ciPtPE;F)RP7vB+&Oe9+W1=Pu~$ z2IzP8U2F!?=)cC+d-~5w>v_QDxZQos0N3;%&{wMj)|vBuRIB8L*cY&lphjJ?5+&+3 zqlt7=E3D0R2x^R#H*A0K$o!11_tp3j(4Ow6PT2U(Es)D~)js-eyG7*)f(=?3EIhq1q^ z)jW6eMAWlsQr^A;6MfkMVK@SoBQc~uX55*mg!{5=ls`I5GM4i=4_oq}rDPvHdmj*j zaG<*9bYY5OkrpoyV_3bR|8bU0-Czjz2iD#$2gSO2lbv*yE&9_z-lpAp``1fmTu=Qh zs$Q6N>@hVRrJO$|2FMT5>YpM%NOcK@n043zyYDjgq6LST6^VJFkCF0vHbj~xw_zlh zJbmH^;^dRH`JCznm>$$xrk`K!zh5~&t%=*B+|CQFXxW*jZVcEaf!trwCizsQ=^&Im zwbiS73=@9KVKy;NEcl}_{rOufT359*$Md$kIvjfidl~p%B=~SsV4eCKTI?kVOwjzBv$;BX& z+j#KnvRP?_b#Aq)zQq)|wJ@zH6BCt{C^F&>02YQ39n&w>bN%p{}_r3@Mi`xLf zj#=TsPZ>PO9ew7T5}J}7CAu)}Ij>uPy6KMVbr`y84hA(QCfmGp_vZe3-rj@%7^+wy zF}X!b;sSUznb0?$Bdo{CNJ#Ptwv}g`*_ze9QhcrC+L5s7o0qQRhaQYc|N46A`&I8E z!00QMe>8iss7yJfnyyol{MgoNZ$AvzI&Y^a2{Tyzx{WZe@ZLcjI?OFbvMnYp`fe%`hCosu`*Dzr#SdX5pR13L*n36X%` zJUQC8q_AK&P`~6rj}1l0SutEIc&{|~%{Zo?_u(@Qw10b)Fz!;>1n455j%riymWjaA zebc_*ir}4dTW!40`_QJ8aet2EyP&w7LPx%>?CLC^TDSMTj`(sjEUjv6ziAc>FoQ?B z{@`b>`xflp=6ukAyq1Ov*E64(k3G2tU$91U?fsSqIJaPE8;Ly?ah>gIC|HCj4!BV|G@J`DVnuA#a@^p40r$o6Rooc_&WG|)L7kwaQ<50SgTR{ znFD$npq@~kKf`Pi3)@u*KWE9XEl@|j{%zuKfedVa)19!HaENiV|9T)O?L8pDh&-kJ zOyKdkp?G>+|FS#olg|XISl&zn^?D_~u(tDZYQo=R!P(LO9w0hBlQWJA(DmJe1eL^` z5wzR0Iwj|DUKl5kts8~oex;kpnihSiwVCjVDdzX$*VP{7YUs#7tz&;Z5go@PCB5o5 z>1l@-BMT74sj+YM$8)BmsOk^i#spw))%&@+{I&0Y4Fw)VhNn=JUyFjXxR}3SZQ*_2 z`yg4s^xhyxwG1p|+VX5a-g$2(p}bac@5KErAIwWdKmm=h2UVazhod28+c#*5%oAoK zmA#;#spXRR=a6>cfN`L)k=J5+zY3((Zv?W%$i3QvvNQ(^r@lDX(8;2K<8rj3-9|#i zRdYo?6a5K`MaOqU#UH{q?7Te3%JfNxskPNo3yHN;+J~k4&_iw)CyT6*oVD-K03G`uo{?86T@_px!~`gybZNEB@iTmz5T>i8Xg_S4 z`)bqE9b9%%h%{wOCVX#^>Q^04FFKJ%fDHI^^A%xL9Z+j}(8KLO&gr5qZPY1?Tw+}7m&gubANc>y3!7Rs@3nDN$XiDxQ{L%q;1?E+{&Vn=Ktfyz- z+D`cX>YVAX%-?6b^}Ui{ma>60>1}xW4?(~k+*kbgvgKlC=6{ff1@edoQuqw3d7caV zc*F4S>j^acyJ2Kq&IMJjmA@7l-BBZHnWrkZp3eQfqsR>vlBHbE zMcj(m%PE-S+YlOBC-$6!7kZXOcCMVks2LhqOvY{$&hKJupV6M&ITgZZI#*8p@$5ej zqc3sJXDrHBT{9D0GpqEFbipzfj>g5l_hGI@e9MIV=4hWjb~eq!iS2E$)}!q|4ls9_ z>;nb5a?gwaS59qjI`O~r>J?wKrwdhT!@ zlJT1yvGpf_Ko>N`&uT^NGv-BS&v?4_!!9dAHH8}}UCRr%)AZywlt}EhTvhUF-9+Se zZuHmzJy?va-0lGP%xc1O>#hg7Nrz}8rdUvT+Yh(#oh|ok(4ZbFJc<jSeRLPz zJyY_O?-n>P3=}=MF1`@yw4!}U&wl04kDH$h&&hzk$r7YyuzA^q##?_Pco$t5;T?2@s9`@T*)lfoucKL;_H>UQ=QihJyH<)`L07f`gv`@l$&WzVf{ zU#ToLXIsy3x`TI)pZ;z2;Ql3Y5=EP)b*>&a_amHztgAB0TJC3xRfk*E>Lxttk%6$% z0oE5X()3H&HB+ZBog8_4L%z_i@Iy=S;=G0_QCzIpBnR6SV(VuA(q5Zk17z0eZ!2+P zPgEA@FMR}CIY!l2>Rm!F^hY?b7i_g$IGT3SghPy@=KS<{Ix%dH*3V`%j_-TN9na6e zF~uNMj|V<#A?k_2vXMOO%bu4<&fK1jT$m-YdzKlq?Ch$?8N*$t``?QP`Mj_exUgpT z^N_5ix#a11Iq?%TgQ9at>y4vsQ=UHtUmvZ$08`t}T7cP%3BKgn@&I%>AJ8|j4-6l- zz=bH(o6TjF%5`zz{4+tFpNX@j{|PqB5ydJeNl#FY{BE>eE&Or%lX9dn<+)U}^Y>>B zV(bh8G98-Q zDEc(AHOm*R0@-oQKb9dTAEDw5NZ0@}D|xn53W7@r}Z( zKj0B5V#FjPY-1)Sdg17+xW85<1T&%2z5xr<)Bo5L8H06IVIu=#MG02AbzJn`rH||x zq%(#`+kW03zEbhJ|613lcp*?SFCYm)=eH59%I!I4db6i_lzC;PrE8x)($&)xqi<0& zYMgWt4%~tQIU~bMusA^V(3n63@1Go1G)jJv=ND_hCi~bJYj>oN$GP&x9|c5-&w}fq zk^oBEaY63|Upc7~jnE5B&U4<`()!?j%s=r~2k)ANj&wyTHNAq0QIB6f4mIWg4}82l zb!07iW6zQ)CaL=3iN~dMwzZ`U+YfO;g+!;KFe}~G%jBzn>Ieex5 zljh^)O{W%};=?gd86#ock>pf%^UNtdyD9_#y#J6G%L~|pVxjsfne6YYXHO>I@IrL# z3-~d8tlUOEYuRXR98hNhaDqB5lYnHwpiqS$a%OS7bk9Vvc_F?9!pyh&yJC#hL|m_G zt181;i9r!6J_-p9RYsDY_O?Lcy1?b|M>FfC?4A1YA%NPaHwJoN+jcRmaWjH! z%J+|;@}(JY4e5EJ3?XWmre9Rf>QoYKhs)6YnRe3Nta?ZLHE-_DN=ye=F6d}JA6 znivwk2$3uTsyYQG-aGvcZedtUOAB=57pwopzHm-*)ZQIG4DR~14`lF9t%kZSzH_<} zkuixX{OXr!32NV4qs2U*w59?5bWhP-Z0EkoMXTLEVbGF(Fj49%yb#P=A%eOCE=XDd zs!^b&7aC4pC0fBA?{v(pUtZCE^4LNU0!*}5G4sNsv1!uh0kmc7&^=Yy^)-g|MPCu# zweWgdWz&7weq9DD9KF0BCknWRmpC*$!JS+-%Xm<6LcQq1zN;*xT2X0iVo2F@>sPXs zkQ!lk{H^JCB7?z_S7Y9k8xTS?GIANd0{1VLtf---Z{7z*L zJ^(?!`p8y5DH*^O_l7^>M5Lv-JV}y-U9;|SRi?KxcQ@Jj!q8SZJd&{FvWDR|iQkF& z?6s8NW^C*xFH`lc!s{qyng$li``jSNRan=1Tgt$?c)N5>U50HYgRv!_;9meEFL|$9 z)*_R?$tD;E5&27fVqVWSYT`-((VIN;}~hXiI593pjDd3ZIScWGsm4BA zTTW&N1(=Dr_(M6;AF2R*3`A_-5Dh;I2!{u6FB|^!u>%F59RKAT&Cu^G^65P34X`sd z=YcAZgK!jt!5O%V(w%+=^sr}gIQ?yRZsWVKnIhg$9PjCLz}5t@1{1EOAc=jEo1qYC z8F*MpAm{8_I}_4=?;*@*bq6e;8-f)cP20daBm?aa zR9+FsO8}R1JwNiSd{;}@K|{V*uXv`EDMn1_ttS(KKo_#90y+NbdJOc z)Uc#f9Dmrr!nnK>3=8$YsNB}Lm`PMR0FxecQffN7lgJV&>?Tmv=N}yg=_^@Jpg>%l z0K3xN_Ws(?tA)EMz3FL6shOuLs(T~+F)49@_kreJdBqS$0>u@7GkoMVJg0SE#IoJ! zfuECp=z=$A>>U6frB(+u5D<2zl}`_j0(StQ{d2y}!l0K8PGWK*i-4N*$gD^v*ij;t z*U3@&46v-s1n5E*nJP8@b-RD7j~!^LJ}(;W2KTWD!Q{s^g$b5DPg?LtA*lD)VcJis z`axgKG*9~N;pb(Cr97$Q31wAMA+q z^rEK(X!BitQRHKXuOX{?{ueRQ)Y}s@@YYMyXD(L{7EY6>^@3i|s3}c=PwIMrQDg3IMvwC5$j) zBA9f^uwHEHDdo?(VWCpgz!8n)t56i6b&nRJ2AWK=e`V-clwZdz?Lh-RX|4%=iF~DX z!@LlLVx61-kwuuzAKsHP1>O9**AoA*;{&c+F6t$~G)Ox*j?lA~STK40D&?$F? z|6-2T8fwxIqSKz!*TDs`l$73-$av(s5Bla|y*pzi+wz-ETFxFI(&1+eXh~H42M_nt zt*3edP14DrHz{51W0fOq?LC1C-<%-|fW`>*)1$G^&w$B^9lJd;N{RhOiiFcQ(kZs9 zf5)WhbOnoNqn zGAUB0tGZ2RkRTWf?&F1E3JHyVe9+yIvJ%RcnhLm(A#1473rh0h?0q@gQ~9f7M(@Ei zUx1_TtgNRM@?{HaAYomjvCXL|7EuQpE^-E?ye8a0m+|K|$p5Q$2xJkWW4ck4dA ze5L%mI_djeppIVTXzn3@4iC$Kz%quqiI3aKEZ~zG`$}z*aZHM(y-N{FqT>oVYCa3M*P8j`)~46EZTVPp^wcVMu#FI{i3Y!_yWK=^bL z{}~`{X|hLb5ANA7H45w)N2ibeVtQ!aa26LO;P_L5E((jd0fA#~%sprv~< zyP(QCgIj}%M;m;1`oB8PJP^vQkK?m2WGz|7zDKeQDU7u;2<3*ZHHH~mH^Z0_L$*j_ zvZQ1gOGf0D2uY%*rm~M_bVZiPGPH;$TdCeN_xj%lGr8eR+Rw zFu_}C(xJXw1aM>7sqg-H5>?Ym5#i!vXt(b{HF_74l&GsXY!0IQeE>~!oXDg7NrzRr z223Mqm7JITI`9GDD z&SI#kzww^dvP+!G;w~r#j8X8OU z>tf6->!C3Y@4H-?Tb4^5TX3p2bDVy}i2?x1g0&Tt@~0f44;YlU@?m=f5uJ<~@Bml( zevGDxrKol7r%uT#+x5}iaN^UzOGYUy7}PXe&YwD#>2W8=2do5Fo`o3~5htkk{K!QL z`n5gZN0?t1)tW;;K*K>Hrz)0Y^|Cws%gyvR_`q!cdCFa$jl>8Yx(llmcywz}6&s0l zCkxA$0D87rzYgvQaRJXc>PfXdQB`FOJ9s1q>m?y$`)h#u45?rb8C0xPdE6|Zk z5?Y*a5MBexOfH(U5h=nad_RWT^pA-G(y7QZx{YaZSzYCuRb8U3pS`10M3v+#U)wxC zx(@xteU5GW^A<0jfG7pN!UT+~iOQxfW_jHvd4aDH(Q}% z4q|W+K8_3yo$1u0E0Jy_#{#Z#Y26_DzrZF3OY3{%E|67Gm{Bq6gFXn#*ygX`%cW~N@^FSxQR3Gvylel+i)r`L! zrqy)CSKLl}1K^RupWyYf)oZNuAX2O!qtMw0{0{%Yri>YR`RgNnxLl6!QGa2{Iy*N)R8*+r`@ZKIiuijHcZn9wcLZm5I z)m57Li^}8c^PgvbqaG`i(;bFPp5w>U69I0w_^q*IJ_ds7YFIWAV2Q=Tkf*Vd#4Z0&&jtOW5-YkeDWRe)WJDvb0#bt>i z2Yz=hB#uU)R&Y|{(lhl}$l|Q-hO)=`Z3_>P?(ORNMCd6coP#ks+w-`fUG~=C8AqKb zj1t*$%%2}ASP0hvdl2`K!#97qrS-Lh+@#rfvnLIiI6D_UFqj;RNQ?5A%K?i(ZCe+k zEc(~P0BK~vJl)Xd@3NExV7p)uXY!3C#k!t$k4?eb_Y)0;SbMrdeA9sf-79}aV0tn? z>*VTP=oGLuF#W7xE-x|x`=l_rX=0VfGyZq)b61ps7(C;B>RTy=CSt-0nkO??_x9I* zDhw>YD%<(pYQ-4qO0Kvzfyw+?X2An)A-Vhacg$$Emq_H^=i~VHr|V!<7p~f1&LKAy zz;2+jcf2xn!<4r>%=8ORl`5L*g$eUXr%0EawzitO`qz7;AmHc?J7#V-AvaBUTe*mi zHjw=p^oX8GC&@-*$+COLnbIXe*8YmhHSA7?PV{j>bal(s8HJZCXyDosN*jm@wL}-g z@9dsjkpb*$deQvUqMCc4uV<|wNK9Nl5>?>}(M3{?YD}4_Za)w+W?L=@J_ed34v{Am zFYdDC-f}!NFH5C!lDn-Qsj{5Qz|2S& zop*=rJ*`p6M6eHic>1G6cpHUwyu7}a9Pn;nx35{?vn^rMkYnfTP&UucC6IYhs^G?1 z$HHE9Scs1bZXW23XX)N<6Hn)JpA8eef6OUyItD&xXKseKxJ68E3**qJ#zS?Wy0*Wi zFvP+`b9+2T1=?yn)FKzH&=f|N_0jGw4)qCj6sqrlE`9kPc%ne8F?&>o!!^zf+tgy> zbU&PQ{aL7?1JKZekF2i%aqU~0rGssh(dB_DG&-+y;98N(T<6LziV=NrS^}tcTVAt; z^t*jd=xp%)lxEX5;C`OOEOqJ=*gGdu(B8EhFuPPauMkUl^BvBKw_Mym6}*I|O?8V= zML{iTOx2+K23sA}Fpxj6N~!m3S%f75JIKXwSST165x z+vs47G1;zlGEu*nk%=K>fr11exBClkJrQnEi&GL$QF}y-d!L7v_&%al)QX%t>p~`UTeOx8V4Pw zENxPifBD-H>a{IEeqLk!t@$ z^ENxCvsB{;)<3gIj&RkO4b^*H3Wo&cua!NKs&di<bU;_D2)K?HsP6U?O)+N?$pTi2<@K1F$f>RKixBacBV68d{D&|OJ{DyZ*j%uRa&KuyZ54sFbw{U)~e|2~NJstTN#u#W{`S194(G-X=fP&u`q+=%>!#*q+@vX?T&c~i;Qu-3MqY;t| z1BB4n&$~CMm5z?LoC`?Rny-6*>d#&U)zh_FN5~cLss4S7SOg~bX^#VUM+_-qY2Ndz zl^47bToAOBfZs+QNH5lEVRr6MfAqS~31bmJDp*n58(kGkq>!nnDHUC*ADzAomAZN7 zegQ?~h>X@`4`)SQ^18kZ{NfSOC^S5!Rp}zA)?C|I-A|1JB_%8KIzKbjoLqH|F5ky) z!uWehHVGN6+muAEMJG`CBb1N zZrDjK{oJs2$~3Ec_%S79$|YCKi%)IKKXs?(c^8pD9&76Bn_`!Jr+`b*W<6ynroIUV zn_&IKA|uhD+pRkNbypB&N_ZQJR4xxWK-j~4)R6NKM6jiYfJdJdKXDwsK!il2n&f(E zFv|?yp^t=;C6du>l2X=cBKGs5{=Rm}O_+}%3b-%XM#jRnqsulriVCV1DY*Kc1Eupi!9&Xza_Qzx(K8|@9Nn{ zWf_Ico?tw&P3U02(oGCl%o-R6%v0_Y2zjhZPkuNNq#(ckbWA)f5g2K$As@4C;S-_* zOx^q&*DW7ThK9crE^y{MK57CZ#B3_lyG)`&y?^(2Ej`eC(a^ZG^4oL4`GQd}2M3Hg zwaFN7GCqhLg2u&!fFFnn$^>PAGBYr-@I+aljV;iqgZoe@GzwK@*&hEtCqzc!BSIhq34X E0}>Mp%K!iX diff --git a/ui/main/src/assets/images/logo/logo_lfe_lc.svg b/ui/main/src/assets/images/logo/logo_lfe_lc.svg deleted file mode 100755 index f1c26f1cd0..0000000000 --- a/ui/main/src/assets/images/logo/logo_lfe_lc.svg +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/main/src/assets/images/logo/logo_lfe_operatorfabric.svg b/ui/main/src/assets/images/logo/logo_lfe_operatorfabric.svg deleted file mode 100755 index fa2fe80a05..0000000000 --- a/ui/main/src/assets/images/logo/logo_lfe_operatorfabric.svg +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/main/src/assets/images/logo/logo_lfe_powsybl.svg b/ui/main/src/assets/images/logo/logo_lfe_powsybl.svg deleted file mode 100755 index 81f6eb5982..0000000000 --- a/ui/main/src/assets/images/logo/logo_lfe_powsybl.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From e04acf2b5e930af66de3a95590d31eaabdfd282c Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 14:39:59 +0200 Subject: [PATCH 12/76] Add opfab logo license and copyright --- ressources/logo/logo_lfe_operatorfabric.svg | 132 ++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100755 ressources/logo/logo_lfe_operatorfabric.svg diff --git a/ressources/logo/logo_lfe_operatorfabric.svg b/ressources/logo/logo_lfe_operatorfabric.svg new file mode 100755 index 0000000000..ffea185540 --- /dev/null +++ b/ressources/logo/logo_lfe_operatorfabric.svg @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bfa3fe387769404b9a2f79de0234d403950e0c6f Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 14:59:27 +0200 Subject: [PATCH 13/76] Remove config file for unused tool protractor --- ui/main/e2e/protractor.conf.js | 28 ---------------------------- ui/main/e2e/src/app.e2e-spec.ts | 21 --------------------- ui/main/e2e/src/app.po.ts | 18 ------------------ ui/main/e2e/tsconfig.e2e.json | 13 ------------- 4 files changed, 80 deletions(-) delete mode 100755 ui/main/e2e/protractor.conf.js delete mode 100755 ui/main/e2e/src/app.e2e-spec.ts delete mode 100755 ui/main/e2e/src/app.po.ts delete mode 100755 ui/main/e2e/tsconfig.e2e.json diff --git a/ui/main/e2e/protractor.conf.js b/ui/main/e2e/protractor.conf.js deleted file mode 100755 index 86776a391a..0000000000 --- a/ui/main/e2e/protractor.conf.js +++ /dev/null @@ -1,28 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const { SpecReporter } = require('jasmine-spec-reporter'); - -exports.config = { - allScriptsTimeout: 11000, - specs: [ - './src/**/*.e2e-spec.ts' - ], - capabilities: { - 'browserName': 'chrome' - }, - directConnect: true, - baseUrl: 'http://localhost:4200/', - framework: 'jasmine', - jasmineNodeOpts: { - showColors: true, - defaultTimeoutInterval: 30000, - print: function() {} - }, - onPrepare() { - require('ts-node').register({ - project: require('path').join(__dirname, './tsconfig.e2e.json') - }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); - } -}; \ No newline at end of file diff --git a/ui/main/e2e/src/app.e2e-spec.ts b/ui/main/e2e/src/app.e2e-spec.ts deleted file mode 100755 index bee3134d50..0000000000 --- a/ui/main/e2e/src/app.e2e-spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2018, RTE (http://www.rte-france.com) - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -import { AppPage } from './app.po'; - -describe('workspace-project App', () => { - let page: AppPage; - - beforeEach(() => { - page = new AppPage(); - }); - - it('should display welcome message', () => { - page.navigateTo(); - expect(page.getParagraphText()).toEqual('Welcome to ng-base-annotation-test!'); - }); -}); diff --git a/ui/main/e2e/src/app.po.ts b/ui/main/e2e/src/app.po.ts deleted file mode 100755 index 76d4fe6c3a..0000000000 --- a/ui/main/e2e/src/app.po.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 2018, RTE (http://www.rte-france.com) - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -import { browser, by, element } from 'protractor'; - -export class AppPage { - navigateTo() { - return browser.get('/'); - } - - getParagraphText() { - return element(by.css('of-root h1')).getText(); - } -} diff --git a/ui/main/e2e/tsconfig.e2e.json b/ui/main/e2e/tsconfig.e2e.json deleted file mode 100755 index a6dd622028..0000000000 --- a/ui/main/e2e/tsconfig.e2e.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "module": "commonjs", - "target": "es5", - "types": [ - "jasmine", - "jasminewd2", - "node" - ] - } -} \ No newline at end of file From d252c291525996fb78df67f6296e109a3001f882 Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Wed, 30 Sep 2020 17:18:44 +0200 Subject: [PATCH 14/76] [OC-1130] Add name of entity in logging screen --- ui/main/src/app/services/card.service.ts | 6 ++++-- ui/main/src/app/services/entities.service.ts | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/main/src/app/services/card.service.ts b/ui/main/src/app/services/card.service.ts index ba4e9f591c..7557c1ad04 100644 --- a/ui/main/src/app/services/card.service.ts +++ b/ui/main/src/app/services/card.service.ts @@ -34,6 +34,7 @@ import { LoadLightCardsSuccess, RemoveLightCard } from '@ofActions/light-card.actions'; +import {EntitiesService} from '@ofServices/entities.service'; @Injectable() export class CardService { @@ -54,7 +55,8 @@ export class CardService { private notifyService: NotifyService, private guidService: GuidService, private store: Store, - private authService: AuthenticationService) { + private authService: AuthenticationService, + private entitiesService: EntitiesService) { const clientId = this.guidService.getCurrentGuidString(); this.cardOperationsUrl = `${environment.urls.cards}/cardSubscription?clientId=${clientId}`; this.cardsUrl = `${environment.urls.cards}/cards`; @@ -220,7 +222,7 @@ export class CardService { const publisherType = card.publisherType; const enumThirdParty = PublisherType.EXTERNAL; const isThirdPartyPublisher = enumThirdParty === PublisherType[publisherType]; - const sender = (isThirdPartyPublisher) ? 'SYSTEM' : card.publisher ; + const sender = (isThirdPartyPublisher) ? 'SYSTEM' : this.entitiesService.getEntityName(card.publisher); return ({ process: card.process, processVersion: card.processVersion, diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts index b41bd5d63b..eb923df469 100644 --- a/ui/main/src/app/services/entities.service.ts +++ b/ui/main/src/app/services/entities.service.ts @@ -60,4 +60,9 @@ export class EntitiesService implements CrudService { return this._entities; } + public getEntityName(idEntity: string): string { + const name = this._entities.find(entity => entity.id === idEntity).name; + return (name ? name : idEntity); + } + } From 597c8f085c679d098bbbbcd7facb332ae9c9acd7 Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Fri, 18 Sep 2020 17:27:40 +0200 Subject: [PATCH 15/76] [OC-1078] Implement notion of processGroup --- services/core/businessconfig/build.gradle | 11 ++- .../json/BusinessconfigModule.java | 3 + .../controllers/BusinessconfigController.java | 35 +++++++++ .../model/ProcessGroupData.java | 36 +++++++++ .../model/ProcessGroupsData.java | 37 +++++++++ .../model/ProcessGroupsLocaleData.java | 36 +++++++++ .../services/ProcessesService.java | 57 +++++++++++++- .../src/main/modeling/swagger.yaml | 76 +++++++++++++++++++ .../src/test/data/processgroups.json | 28 +++++++ ...ontrollerWithWrongConfigurationShould.java | 12 +++ .../GivenAdminUserThirdControllerShould.java | 32 ++++++++ ...minUserBusinessconfigControllerShould.java | 25 ++++++ .../services/ProcessesServiceShould.java | 1 + .../businessconfig/getProcessGroups.feature | 59 ++++++++++++++ .../resources/processgroups1.json | 28 +++++++ .../resources/processgroups2.json | 28 +++++++ .../uploadProcessGroupsFile.feature | 51 +++++++++++++ .../api/karate/launchAllBusinessconfig.sh | 18 +++-- .../operatorfabric/utilities/PathUtils.java | 10 +++ 19 files changed, 570 insertions(+), 13 deletions(-) create mode 100644 services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupData.java create mode 100644 services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsData.java create mode 100644 services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsLocaleData.java create mode 100644 services/core/businessconfig/src/test/data/processgroups.json create mode 100644 src/test/api/karate/businessconfig/getProcessGroups.feature create mode 100644 src/test/api/karate/businessconfig/resources/processgroups1.json create mode 100644 src/test/api/karate/businessconfig/resources/processgroups2.json create mode 100644 src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature diff --git a/services/core/businessconfig/build.gradle b/services/core/businessconfig/build.gradle index 478c69bbd5..d3a531c38d 100755 --- a/services/core/businessconfig/build.gradle +++ b/services/core/businessconfig/build.gradle @@ -40,6 +40,12 @@ task compressBundle2Data(type: Exec){ executable "bash" args "-c", "tar -czf $project.projectDir/build/test-data/bundles/second-2.1.tar.gz *" } +task copyProcessGroupsFile(type: Exec){ + description 'copy processgroups.json file for businessconfig party configuration data for tests in build/test-data' + workingDir "$project.projectDir/src/test/data/" + executable "bash" + args "-c", "cp processgroups.json $project.projectDir/build/test-data/" +} task createDevData(type: Copy){ description 'prepare data in build/test-data for running bootRun task during development' @@ -79,8 +85,9 @@ task copyCompileClasspathDependencies(type: Copy) { createDevData.dependsOn prepareDevDataDir compressBundle1Data.dependsOn prepareTestDataDir compressBundle2Data.dependsOn prepareTestDataDir -test.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data -unitTest.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data +copyProcessGroupsFile.dependsOn prepareTestDataDir +test.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data,copyProcessGroupsFile +unitTest.dependsOn prepareTestDataDir,compressBundle1Data,compressBundle2Data,copyProcessGroupsFile bootRun.dependsOn createDevData // <<<<< Test data tasks diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/configuration/json/BusinessconfigModule.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/configuration/json/BusinessconfigModule.java index fa365ac66f..56ae13316c 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/configuration/json/BusinessconfigModule.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/configuration/json/BusinessconfigModule.java @@ -30,5 +30,8 @@ public BusinessconfigModule() { addAbstractTypeMapping(I18n.class,I18nData.class); addAbstractTypeMapping(Response.class,ResponseData.class); addAbstractTypeMapping(ProcessUiVisibility.class,ProcessUiVisibilityData.class); + addAbstractTypeMapping(ProcessGroup.class,ProcessGroupData.class); + addAbstractTypeMapping(ProcessGroups.class,ProcessGroupsData.class); + addAbstractTypeMapping(ProcessGroupsLocale.class,ProcessGroupsLocaleData.class); } } diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java index a2f5ee778e..c64763a6c5 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigController.java @@ -102,6 +102,11 @@ public List getProcesses(HttpServletRequest request, HttpServletRespons return service.listProcesses(); } + @Override + public ProcessGroups getProcessgroups(HttpServletRequest request, HttpServletResponse response) { + return service.getProcessGroupsCache(); + } + @Override public Process uploadBundle(HttpServletRequest request, HttpServletResponse response, @Valid MultipartFile file) { try (InputStream is = file.getInputStream()) { @@ -132,6 +137,36 @@ public Process uploadBundle(HttpServletRequest request, HttpServletResponse resp } } + @Override + public Void uploadProcessgroups(HttpServletRequest request, HttpServletResponse response, @Valid MultipartFile file) { + try (InputStream is = file.getInputStream()) { + service.updateProcessGroupsFile(is); + response.addHeader("Location", request.getContextPath() + "/businessconfig/processgroups"); + response.setStatus(201); + return null; + } catch (FileNotFoundException e) { + log.error("File not found while loading processgroups file", e); + throw new ApiErrorException( + ApiError.builder() + .status(HttpStatus.BAD_REQUEST) + .message("Incorrect inner file structure") + .error(e.getMessage()) + .build(), + UNABLE_TO_LOAD_FILE_MSG + , e); + } catch (IOException e) { + log.error("IOException while loading processgroups file", e); + throw new ApiErrorException( + ApiError.builder() + .status(HttpStatus.BAD_REQUEST) + .message("unable to load submitted file") + .error(e.getMessage()) + .build(), + UNABLE_TO_LOAD_FILE_MSG + , e); + } + } + @Override public Void clearProcesses(HttpServletRequest request, HttpServletResponse response) throws Exception { service.clear(); diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupData.java new file mode 100644 index 0000000000..c71dc97be2 --- /dev/null +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupData.java @@ -0,0 +1,36 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +package org.lfenergy.operatorfabric.businessconfig.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.util.List; + +/** + * ProcessGroup Model, documented at {@link ProcessGroup} + * + * {@inheritDoc} + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Slf4j +public class ProcessGroupData implements ProcessGroup { + + private String id; + private List processes; +} diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsData.java new file mode 100644 index 0000000000..232482699d --- /dev/null +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsData.java @@ -0,0 +1,37 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +package org.lfenergy.operatorfabric.businessconfig.model; + +import lombok.*; +import lombok.extern.slf4j.Slf4j; +import java.util.List; + +/** + * ProcessGroups Model, documented at {@link ProcessGroups} + * + * {@inheritDoc} + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Slf4j +public class ProcessGroupsData implements ProcessGroups { + + private List groups; + private ProcessGroupsLocale locale; + + public void clear(){ + this.groups.clear(); + this.locale = new ProcessGroupsLocaleData(); + } +} diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsLocaleData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsLocaleData.java new file mode 100644 index 0000000000..e804f57b45 --- /dev/null +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessGroupsLocaleData.java @@ -0,0 +1,36 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +package org.lfenergy.operatorfabric.businessconfig.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; + +/** + * ProcessGroupsLocale Model, documented at {@link ProcessGroupsLocale} + * + * {@inheritDoc} + * + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Slf4j +public class ProcessGroupsLocaleData implements ProcessGroupsLocale { + + private Map en; + private Map fr; +} diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java index a38442d38e..9df690e272 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java @@ -35,9 +35,8 @@ import javax.annotation.PostConstruct; import javax.validation.ConstraintViolation; +import org.lfenergy.operatorfabric.businessconfig.model.*; import org.lfenergy.operatorfabric.businessconfig.model.Process; -import org.lfenergy.operatorfabric.businessconfig.model.ProcessData; -import org.lfenergy.operatorfabric.businessconfig.model.ResourceTypeEnum; import org.lfenergy.operatorfabric.utilities.PathUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -70,6 +69,7 @@ public class ProcessesService implements ResourceLoaderAware { private Table completeCache; private ResourceLoader resourceLoader; private LocalValidatorFactoryBean validator; + private ProcessGroupsData processGroupsCache; @Autowired public ProcessesService(ObjectMapper objectMapper, LocalValidatorFactoryBean validator) { @@ -82,6 +82,11 @@ public ProcessesService(ObjectMapper objectMapper, LocalValidatorFactoryBean val @PostConstruct private void init() { loadCache(); + loadProcessGroupsCache(); + } + + public ProcessGroups getProcessGroupsCache() { + return processGroupsCache; } /** @@ -92,7 +97,28 @@ private void init() { public List listProcesses() { return new ArrayList<>(defaultCache.values()); } - + + /** + * Loads processGroups data to processGroupsCache + */ + public void loadProcessGroupsCache() { + + this.processGroupsCache = new ProcessGroupsData(new ArrayList<>(), new ProcessGroupsLocaleData()); + try { + Path rootPath = Paths + .get(this.resourceLoader.getResource(PATH_PREFIX + this.storagePath).getFile().getAbsolutePath()) + .normalize(); + + File f = new File(rootPath.toString() + "/processGroups.json"); + if (f.exists() && f.isFile()) { + log.info("loading processGroups.json file from {}", new File(storagePath).getAbsolutePath()); + this.processGroupsCache = objectMapper.readValue(f, ProcessGroupsData.class); + } + } + catch (IOException e) { + log.warn("Unreadable processGroups.json file at {}", storagePath); + } + } /** * Loads process data to defaultCache (not thread safe) @@ -310,6 +336,29 @@ public synchronized Process updateProcess(InputStream is) throws IOException { } } + /** + * Updates or creates processgroups file from a file uploaded from POST /businessconfig/processgroups + * + * @param is processgroups file input stream + * @throws IOException if error arise during stream reading + */ + public synchronized void updateProcessGroupsFile(InputStream is) throws IOException { + Path rootPath = Paths + .get(this.resourceLoader.getResource(PATH_PREFIX + this.storagePath).getFile().getAbsolutePath()) + .normalize(); + if (!rootPath.toFile().exists()) + throw new FileNotFoundException("No directory available to copy processgroups file"); + + ProcessGroupsData newProcessGroups = objectMapper.readValue(is, ProcessGroupsData.class); + is.reset(); + + //copy file + PathUtils.copyInputStreamToFile(is, rootPath.toString() + "/processGroups.json"); + + //update cache + processGroupsCache = newProcessGroups; + } + /** * Updates or creates process from disk saved bundle * @@ -451,10 +500,12 @@ public void clear() throws IOException { }finally { this.completeCache.clear(); this.defaultCache.clear(); + this.processGroupsCache.clear(); } }else{ this.completeCache.clear(); this.defaultCache.clear(); + this.processGroupsCache.clear(); } } diff --git a/services/core/businessconfig/src/main/modeling/swagger.yaml b/services/core/businessconfig/src/main/modeling/swagger.yaml index 0efc9133fc..d422a45c56 100755 --- a/services/core/businessconfig/src/main/modeling/swagger.yaml +++ b/services/core/businessconfig/src/main/modeling/swagger.yaml @@ -323,6 +323,45 @@ paths: description: Not found '500': description: Unable to delete version of process + '/businessconfig/processgroups': + get: + summary: Get the groups of processes + description: >- + Get the groups of processes + operationId: getProcessgroups + produces: + - application/json + responses: + '200': + description: OK + schema: + $ref: '#/definitions/ProcessGroups' + '401': + description: Authentication required + post: + summary: Upload file defining the groups of processes + description: >- + Upload file defining the groups of processes. + This file must be in json format and is saved to disk, under the name 'processGroups.json'. + operationId: uploadProcessgroups + consumes: + - multipart/form-data + produces: + - application/json + parameters: + - name: file + in: formData + description: file to upload + required: true + type: file + responses: + '201': + description: Successful creation + '401': + description: Authentication required + '403': + description: Forbidden - ADMIN role necessary + definitions: MenuEntry: type: object @@ -555,3 +594,40 @@ definitions: - GREEN - YELLOW example: RED + + ProcessGroup: + description: Object containing a list of processes. + properties: + id: + description: Id of the group + type: string + processes: + description: List of processes included in the group + type: array + items: + type: string + required: + - id + example: + id: processgroup1 + processes: + - "id_process1" + - "id_process2" + + ProcessGroups: + properties: + groups: + type: array + items: + $ref: '#/definitions/ProcessGroup' + locale: + type: object + properties: + en: + type: object + additionalProperties: + type: string + fr: + type: object + additionalProperties: + type: string \ No newline at end of file diff --git a/services/core/businessconfig/src/test/data/processgroups.json b/services/core/businessconfig/src/test/data/processgroups.json new file mode 100644 index 0000000000..c8ba77d2e9 --- /dev/null +++ b/services/core/businessconfig/src/test/data/processgroups.json @@ -0,0 +1,28 @@ +{ + "groups": [ + { + "id": "processgroup1", + "processes": [ + "id_process1", + "id_process2" + ] + }, + { + "id": "processgroup2", + "processes": [ + "id_process3", + "id_process4" + ] + } + ], + "locale": { + "en": { + "processgroup1": "Process Group 1", + "processgroup2": "Process Group 2" + }, + "fr": { + "processgroup1": "Groupe de process 1", + "processgroup2": "Groupe de process 2" + } + } +} diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigControllerWithWrongConfigurationShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigControllerWithWrongConfigurationShould.java index 3944eca609..eab8ab8250 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigControllerWithWrongConfigurationShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/BusinessconfigControllerWithWrongConfigurationShould.java @@ -19,6 +19,7 @@ import org.lfenergy.operatorfabric.businessconfig.application.IntegrationTestApplication; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; @@ -66,4 +67,15 @@ void notAllowBundlesToBePosted() throws Exception { mockMvc.perform(multipart("/businessconfig/processes").file(bundle)) .andExpect(status().isBadRequest()); } + + @Test + void notAllowProcessGroupsToBePosted() throws Exception { + Path pathToProcessGroupsFile = Paths.get("./build/test-data/processgroups.json"); + + MockMultipartFile processGroupsFile = new MockMultipartFile("file", "processgroups.json", MediaType.TEXT_PLAIN_VALUE, Files + .readAllBytes(pathToProcessGroupsFile)); + + mockMvc.perform(multipart("/businessconfig/processgroups").file(processGroupsFile)) + .andExpect(status().isBadRequest()); + } } diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java index d1357aa3cf..dc6235cb28 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenAdminUserThirdControllerShould.java @@ -82,6 +82,7 @@ void setup() throws Exception { .apply(springSecurity()) .build(); service.loadCache(); + service.loadProcessGroupsCache(); } @AfterAll @@ -106,6 +107,15 @@ void listProcesses() throws Exception { ; } + @Test + void listProcessGroups() throws Exception { + mockMvc.perform(get("/businessconfig/processgroups")) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.groups", hasSize(0))) + ; + } + @Test void fetch() throws Exception { ResultActions result = mockMvc.perform(get("/businessconfig/processes/first")); @@ -280,7 +290,29 @@ void create() throws Exception { mockMvc.perform(get("/businessconfig/processes/second/css/nostyle")) .andExpect(status().isNotFound()) ; + } + @Test + void createProcessGroups() throws Exception { + Path pathToProcessGroupsFile = Paths.get("./build/test-data/processgroups.json"); + + MockMultipartFile processGroupsFile = new MockMultipartFile("file", "processgroups.json", MediaType.TEXT_PLAIN_VALUE, Files + .readAllBytes(pathToProcessGroupsFile)); + + mockMvc.perform(multipart("/businessconfig/processgroups").file(processGroupsFile)) + .andExpect(status().isCreated()) + .andExpect(header().string("Location", "/businessconfig/processgroups")); + + mockMvc.perform(get("/businessconfig/processgroups")) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.groups", hasSize(2))) + .andExpect(jsonPath("$.groups[0].id", is("processgroup1"))) + .andExpect(jsonPath("$.groups[1].id", is("processgroup2"))) + .andExpect(jsonPath("$.locale.en.processgroup1", is("Process Group 1"))) + .andExpect(jsonPath("$.locale.en.processgroup2", is("Process Group 2"))) + .andExpect(jsonPath("$.locale.fr.processgroup1", is("Groupe de process 1"))) + .andExpect(jsonPath("$.locale.fr.processgroup2", is("Groupe de process 2"))); } @Nested diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java index 8f715fbff0..de109cf2e3 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/controllers/GivenNonAdminUserBusinessconfigControllerShould.java @@ -74,6 +74,7 @@ void setup() throws Exception { .apply(springSecurity()) .build(); service.loadCache(); + service.loadProcessGroupsCache(); } @AfterAll @@ -92,6 +93,15 @@ void listProcesses() throws Exception { ; } + @Test + void listProcessGroups() throws Exception { + mockMvc.perform(get("/businessconfig/processgroups")) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.groups", hasSize(0))) + ; + } + @Test void fetch() throws Exception { ResultActions result = mockMvc.perform(get("/businessconfig/processes/first")); @@ -230,8 +240,23 @@ void create() throws Exception { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON)) .andExpect(jsonPath("$", hasSize(2))); + } + @Test + void createProcessGroups() throws Exception { + Path pathToProcessGroupsFile = Paths.get("./build/test-data/processgroups.json"); + + MockMultipartFile processGroupsFile = new MockMultipartFile("file", "processgroups.json", MediaType.TEXT_PLAIN_VALUE, Files + .readAllBytes(pathToProcessGroupsFile)); + mockMvc.perform(multipart("/businessconfig/processgroups").file(processGroupsFile)) + .andExpect(status().isForbidden()) + ; + + mockMvc.perform(get("/businessconfig/processgroups")) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(jsonPath("$.groups", hasSize(0))); } @Nested diff --git a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java index ac5b0c7691..b03076caa3 100644 --- a/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java +++ b/services/core/businessconfig/src/test/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesServiceShould.java @@ -60,6 +60,7 @@ class ProcessesServiceShould { void prepare() throws IOException { copy(Paths.get("./src/test/docker/volume/businessconfig-storage"), testDataDir); service.loadCache(); + service.loadProcessGroupsCache(); } @AfterAll diff --git a/src/test/api/karate/businessconfig/getProcessGroups.feature b/src/test/api/karate/businessconfig/getProcessGroups.feature new file mode 100644 index 0000000000..3c095c4560 --- /dev/null +++ b/src/test/api/karate/businessconfig/getProcessGroups.feature @@ -0,0 +1,59 @@ +Feature: getProcessGroups + + Background: + #Getting token for admin and tso1-operator user calling getToken.feature + * def signIn = call read('../common/getToken.feature') { username: 'admin'} + * def authToken = signIn.authToken + * def signInAsTSO = call read('../common/getToken.feature') { username: 'tso1-operator'} + * def authTokenAsTSO = signInAsTSO.authToken + + + Scenario: Push a process groups file + Given url opfabUrl + '/businessconfig/processgroups' + And header Authorization = 'Bearer ' + authToken + And multipart file file = { read: 'resources/processgroups1.json' } + When method post + Then status 201 + + + Scenario: List existing process groups as admin user + Given url opfabUrl + '/businessconfig/processgroups' + And header Authorization = 'Bearer ' + authToken + When method GET + Then status 200 + And assert response.groups.length == 2 + Then match response.groups[0].id == 'processgroupKarate1' + Then match response.groups[0].processes[0] == 'id_process1' + Then match response.groups[0].processes[1] == 'id_process2' + Then match response.groups[1].id == 'processgroupKarate2' + Then match response.groups[1].processes[0] == 'id_process3' + Then match response.groups[1].processes[1] == 'id_process4' + Then match response.locale.en.processgroupKarate1 == 'Process Group Karate 1' + Then match response.locale.en.processgroupKarate2 == 'Process Group Karate 2' + Then match response.locale.fr.processgroupKarate1 == 'Groupe de process Karate 1' + Then match response.locale.fr.processgroupKarate2 == 'Groupe de process Karate 2' + + + Scenario: List existing process groups as non admin user + Given url opfabUrl + '/businessconfig/processgroups' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method GET + Then status 200 + And assert response.groups.length == 2 + Then match response.groups[0].id == 'processgroupKarate1' + Then match response.groups[0].processes[0] == 'id_process1' + Then match response.groups[0].processes[1] == 'id_process2' + Then match response.groups[1].id == 'processgroupKarate2' + Then match response.groups[1].processes[0] == 'id_process3' + Then match response.groups[1].processes[1] == 'id_process4' + Then match response.locale.en.processgroupKarate1 == 'Process Group Karate 1' + Then match response.locale.en.processgroupKarate2 == 'Process Group Karate 2' + Then match response.locale.fr.processgroupKarate1 == 'Groupe de process Karate 1' + Then match response.locale.fr.processgroupKarate2 == 'Groupe de process Karate 2' + + + Scenario: List existing process groups without authentication + Given url opfabUrl + '/businessconfig/processgroups' + When method GET + Then print response + And status 401 \ No newline at end of file diff --git a/src/test/api/karate/businessconfig/resources/processgroups1.json b/src/test/api/karate/businessconfig/resources/processgroups1.json new file mode 100644 index 0000000000..20fdef50d0 --- /dev/null +++ b/src/test/api/karate/businessconfig/resources/processgroups1.json @@ -0,0 +1,28 @@ +{ + "groups": [ + { + "id": "processgroupKarate1", + "processes": [ + "id_process1", + "id_process2" + ] + }, + { + "id": "processgroupKarate2", + "processes": [ + "id_process3", + "id_process4" + ] + } + ], + "locale": { + "en": { + "processgroupKarate1": "Process Group Karate 1", + "processgroupKarate2": "Process Group Karate 2" + }, + "fr": { + "processgroupKarate1": "Groupe de process Karate 1", + "processgroupKarate2": "Groupe de process Karate 2" + } + } +} diff --git a/src/test/api/karate/businessconfig/resources/processgroups2.json b/src/test/api/karate/businessconfig/resources/processgroups2.json new file mode 100644 index 0000000000..95c5d1ce7c --- /dev/null +++ b/src/test/api/karate/businessconfig/resources/processgroups2.json @@ -0,0 +1,28 @@ +{ + "groups": [ + { + "id": "processgroupKarate3", + "processes": [ + "id_process5", + "id_process6" + ] + }, + { + "id": "processgroupKarate4", + "processes": [ + "id_process7", + "id_process8" + ] + } + ], + "locale": { + "en": { + "processgroupKarate3": "Process Group Karate 3", + "processgroupKarate4": "Process Group Karate 4" + }, + "fr": { + "processgroupKarate3": "Groupe de process Karate 3", + "processgroupKarate4": "Groupe de process Karate 4" + } + } +} diff --git a/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature b/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature new file mode 100644 index 0000000000..c4487f2203 --- /dev/null +++ b/src/test/api/karate/businessconfig/uploadProcessGroupsFile.feature @@ -0,0 +1,51 @@ +Feature: uploadProcessGroups + + Background: + # Get admin token + * def signIn = call read('../common/getToken.feature') { username: 'admin'} + * def authToken = signIn.authToken + + # Get TSO-operator + * def signInAsTSO = call read('../common/getToken.feature') { username: 'tso1-operator'} + * def authTokenAsTSO = signInAsTSO.authToken + + + Scenario: Post process groups file without authentication + Given url opfabUrl + '/businessconfig/processgroups' + And multipart file file = { read: 'resources/processgroups2.json' } + When method post + And status 401 + + + Scenario: Post process groups file without admin role + Given url opfabUrl + '/businessconfig/processgroups' + And header Authorization = 'Bearer ' + authTokenAsTSO + And multipart file file = { read: 'resources/processgroups2.json' } + When method post + And status 403 + + + Scenario: Post process groups file + Given url opfabUrl + '/businessconfig/processgroups' + And header Authorization = 'Bearer ' + authToken + And multipart file file = { read: 'resources/processgroups2.json' } + When method post + And status 201 + + + Scenario: Check that process groups have been updated + Given url opfabUrl + '/businessconfig/processgroups' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method GET + Then status 200 + And assert response.groups.length == 2 + Then match response.groups[0].id == 'processgroupKarate3' + Then match response.groups[0].processes[0] == 'id_process5' + Then match response.groups[0].processes[1] == 'id_process6' + Then match response.groups[1].id == 'processgroupKarate4' + Then match response.groups[1].processes[0] == 'id_process7' + Then match response.groups[1].processes[1] == 'id_process8' + Then match response.locale.en.processgroupKarate3 == 'Process Group Karate 3' + Then match response.locale.en.processgroupKarate4 == 'Process Group Karate 4' + Then match response.locale.fr.processgroupKarate3 == 'Groupe de process Karate 3' + Then match response.locale.fr.processgroupKarate4 == 'Groupe de process Karate 4' \ No newline at end of file diff --git a/src/test/api/karate/launchAllBusinessconfig.sh b/src/test/api/karate/launchAllBusinessconfig.sh index c5e03426e0..d00580fd24 100755 --- a/src/test/api/karate/launchAllBusinessconfig.sh +++ b/src/test/api/karate/launchAllBusinessconfig.sh @@ -10,12 +10,14 @@ cd ../.. echo "Launch Karate test" java -jar karate.jar \ businessconfig/deleteBundle.feature `#nice to be the very first one`\ - businessconfig/deleteBundleVersion.feature \ - businessconfig/uploadBundle.feature \ - businessconfig/getABusinessconfig.feature \ - businessconfig/getCss.feature \ - businessconfig/getDetailsBusinessconfig.feature \ - businessconfig/getI18n.feature \ - businessconfig/getBusinessconfigActions.feature \ + businessconfig/deleteBundleVersion.feature \ + businessconfig/uploadBundle.feature \ + businessconfig/getABusinessconfig.feature \ + businessconfig/getCss.feature \ + businessconfig/getDetailsBusinessconfig.feature \ + businessconfig/getI18n.feature \ + businessconfig/getBusinessconfigActions.feature \ businessconfig/getBusinessconfig.feature \ - businessconfig/getBusinessconfigTemplate.feature + businessconfig/getBusinessconfigTemplate.feature \ + businessconfig/getProcessGroups.feature \ + businessconfig/uploadProcessGroupsFile.feature diff --git a/tools/generic/utilities/src/main/java/org/lfenergy/operatorfabric/utilities/PathUtils.java b/tools/generic/utilities/src/main/java/org/lfenergy/operatorfabric/utilities/PathUtils.java index e45ffe4cb9..2e4f7ba232 100644 --- a/tools/generic/utilities/src/main/java/org/lfenergy/operatorfabric/utilities/PathUtils.java +++ b/tools/generic/utilities/src/main/java/org/lfenergy/operatorfabric/utilities/PathUtils.java @@ -166,6 +166,16 @@ private static void createDirIfNeeded(Path dir) throws IOException { Files.createDirectories(dir); } } + + public static void copyInputStreamToFile(InputStream is, String outPath) throws IOException { + + File targetFile = new File(outPath); + + java.nio.file.Files.copy( + is, + targetFile.toPath(), + StandardCopyOption.REPLACE_EXISTING); + } } /** From e4650d8699a681d2037d43205b109ac7d5544c0e Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 15:37:27 +0200 Subject: [PATCH 16/76] Correct license headers --- CICD/prepare_release_version.sh | 8 ++++++++ CICD/travis/check_version.sh | 9 +++++++++ CICD/travis/upload_doc.sh | 9 +++++++++ bin/add_header.sh | 8 ++++++++ bin/load_environment_light.sh | 9 +++++++++ bin/load_variables.sh | 8 ++++++++ bin/run_all.sh | 9 +++++++++ bin/setup_dockerized_environment.sh | 9 +++++++++ .../businessconfig/model/LinkTypeEnum.java | 9 +++++++++ .../businessconfig/model/ResponseBtnColorEnum.java | 7 ++++--- .../businessconfig/model/ProcessUiVisibilityData.java | 7 ++++--- .../businessconfig/model/ResponseData.java | 6 ++++-- .../cards-publication/src/main/bin/push_card_loop.sh | 5 +++++ .../cards/publication/configuration/Common.java | 6 ++++-- .../configuration/WebSecurityConfiguration.java | 6 ++++-- .../webflux/WebSecurityConfigurationTest.java | 7 ++++--- src/main/docker/add-certificates.sh | 8 ++++++++ src/main/docker/java-config-docker-entrypoint.sh | 5 +++++ src/test/api/karate/karate-config.js | 9 +++++++++ src/test/api/karate/launchAllBusinessconfig.sh | 8 ++++++++ src/test/api/karate/launchAllCards.sh | 7 +++++++ src/test/api/karate/launchAllUsers.sh | 8 ++++++++ src/test/api/karate/launchAllUsers_JWTMode.sh | 8 ++++++++ .../externalApp/ExternalAppApplication.java | 9 +++++++++ .../externalApp/controller/ExternalAppController.java | 10 ++++++++++ .../externalApp/exception/ExternalAppException.java | 9 +++++++++ .../externalApp/service/ExternalAppService.java | 9 +++++++++ .../externalApp/service/ExternalAppServiceImpl.java | 9 +++++++++ .../externalApp/ExternalAppApplicationTests.java | 9 +++++++++ src/test/utils/karate/README.adoc | 7 +++++++ src/test/utils/karate/deleteTestCards.sh | 8 ++++++++ src/test/utils/karate/karate-config.js | 9 +++++++++ src/test/utils/karate/loadBundle.sh | 8 ++++++++ src/test/utils/karate/postTestCards.sh | 8 ++++++++ src/test/utils/karate/setPerimeterForTest.sh | 8 ++++++++ .../aop/annotations/EnableAopTraceProcessing.java | 8 ++++++++ .../aop/process/AbstractActionAspect.java | 9 +++++++++ .../operatorfabric/aop/process/AopTraceType.java | 9 +++++++++ .../aop/process/MongoActionTraceAspect.java | 8 ++++++++ .../process/UserAcknowledgmentActionTraceAspect.java | 8 ++++++++ .../aop/process/mongo/models/UserActionTraceData.java | 9 +++++++++ .../share/datetime-filter/datetime-filter.module.ts | 9 +++++++++ .../src/app/model/line-of-monitoring-result.model.ts | 9 +++++++++ .../components/card-details/card-details.component.ts | 9 +++++++++ .../logging-page/logging-page.component.html | 8 ++++++++ .../logging-page/logging-page.component.scss | 8 ++++++++ .../logging-page/logging-page.component.spec.ts | 9 +++++++++ .../logging-page/logging-page.component.ts | 9 +++++++++ .../monitoring-filters.component.html | 8 ++++++++ .../monitoring-table.component.spec.ts | 9 +++++++++ .../monitoring-table/monitoring-table.component.ts | 9 +++++++++ .../src/app/modules/usercard/usercard.component.scss | 9 +++++++++ ui/main/src/app/services/app.service.ts | 9 +++++++++ ui/main/src/app/services/crud-service.ts | 11 ++++++++++- ui/main/src/app/services/entities.service.spec.ts | 9 +++++++++ ui/main/src/app/services/entities.service.ts | 9 +++++++++ ui/main/src/app/services/filter.service.spec.ts | 1 - ui/main/src/app/services/groups.service.spec.ts | 9 +++++++++ ui/main/src/app/services/groups.service.ts | 9 +++++++++ ui/main/src/app/store/actions/monitoring.actions.ts | 9 +++++++++ ui/main/src/app/store/effects/monitoring.effects.ts | 9 +++++++++ ui/main/src/app/store/reducers/monitoring.reducer.ts | 9 +++++++++ ui/main/src/app/store/states/monitoring.state.ts | 9 +++++++++ ui/main/src/assets/js/templateGateway.js | 9 +++++++++ web-ui/src/main/docker/start-webui.sh | 8 ++++++++ 65 files changed, 518 insertions(+), 17 deletions(-) diff --git a/CICD/prepare_release_version.sh b/CICD/prepare_release_version.sh index d7b47c243b..4a8254a526 100755 --- a/CICD/prepare_release_version.sh +++ b/CICD/prepare_release_version.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + display_usage() { echo "This script makes the necessary changes to version controlled files to prepare for a RELEASE version." echo -e "Usage:\n" diff --git a/CICD/travis/check_version.sh b/CICD/travis/check_version.sh index 43f0c75423..083edd9463 100755 --- a/CICD/travis/check_version.sh +++ b/CICD/travis/check_version.sh @@ -1,5 +1,14 @@ #!/usr/bin/env bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + + display_usage() { echo "This script checks that the version specified in the VERSION file is appropriate for the current branch" echo -e "Usage:\n" diff --git a/CICD/travis/upload_doc.sh b/CICD/travis/upload_doc.sh index 4784afe672..87fd5b5437 100755 --- a/CICD/travis/upload_doc.sh +++ b/CICD/travis/upload_doc.sh @@ -1,5 +1,14 @@ #!/usr/bin/env bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + + . ${BASH_SOURCE%/*}/../../bin/load_variables.sh CURRENT_PATH=$(pwd) diff --git a/bin/add_header.sh b/bin/add_header.sh index 1ba5086418..a0b4e2bee4 100755 --- a/bin/add_header.sh +++ b/bin/add_header.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + SOURCE="${BASH_SOURCE[0]}" while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" diff --git a/bin/load_environment_light.sh b/bin/load_environment_light.sh index bfa3ac3bf1..31df391d79 100755 --- a/bin/load_environment_light.sh +++ b/bin/load_environment_light.sh @@ -1,5 +1,14 @@ #!/bin/bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + + . ${BASH_SOURCE%/*}/load_variables.sh sdk use gradle 6.5.1 diff --git a/bin/load_variables.sh b/bin/load_variables.sh index 14ac534e08..86607ec2d9 100755 --- a/bin/load_variables.sh +++ b/bin/load_variables.sh @@ -1,5 +1,13 @@ #!/usr/bin/env bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + SOURCE="${BASH_SOURCE[0]}" while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" diff --git a/bin/run_all.sh b/bin/run_all.sh index 142b19fd50..ca00231d49 100755 --- a/bin/run_all.sh +++ b/bin/run_all.sh @@ -1,5 +1,14 @@ #!/usr/bin/env bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + + . ${BASH_SOURCE%/*}/load_variables.sh SOURCE="${BASH_SOURCE[0]}" diff --git a/bin/setup_dockerized_environment.sh b/bin/setup_dockerized_environment.sh index e420c91f57..c7baeea5e9 100755 --- a/bin/setup_dockerized_environment.sh +++ b/bin/setup_dockerized_environment.sh @@ -1,5 +1,14 @@ #!/bin/bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + + SOURCE="${BASH_SOURCE[0]}" while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" diff --git a/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/LinkTypeEnum.java b/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/LinkTypeEnum.java index dae2caee60..fe441c2339 100644 --- a/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/LinkTypeEnum.java +++ b/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/LinkTypeEnum.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.businessconfig.model; public enum LinkTypeEnum { diff --git a/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseBtnColorEnum.java b/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseBtnColorEnum.java index 75d999b181..871b070e9a 100644 --- a/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseBtnColorEnum.java +++ b/client/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseBtnColorEnum.java @@ -1,11 +1,12 @@ -/* Copyright (c) 2020, RTE (http://www.rte-france.com) - * +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. */ - package org.lfenergy.operatorfabric.businessconfig.model; /** diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessUiVisibilityData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessUiVisibilityData.java index c0e210ea18..0867257605 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessUiVisibilityData.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessUiVisibilityData.java @@ -1,11 +1,12 @@ -/* Copyright (c) 2020, RTE (http://www.rte-france.com) - * +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. */ - package org.lfenergy.operatorfabric.businessconfig.model; import lombok.AllArgsConstructor; diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseData.java index 6553592590..5cde07eda2 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseData.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ResponseData.java @@ -1,8 +1,10 @@ -/* Copyright (c) 2020, RTE (http://www.rte-france.com) - * +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. */ diff --git a/services/core/cards-publication/src/main/bin/push_card_loop.sh b/services/core/cards-publication/src/main/bin/push_card_loop.sh index fd5fd960bf..91a3d7e04f 100755 --- a/services/core/cards-publication/src/main/bin/push_card_loop.sh +++ b/services/core/cards-publication/src/main/bin/push_card_loop.sh @@ -1,7 +1,12 @@ #!/bin/bash + +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. publisher=TEST_PUBLISHER process=TEST diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/configuration/Common.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/configuration/Common.java index fb13851895..cd9ffb5ff1 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/configuration/Common.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/configuration/Common.java @@ -1,8 +1,10 @@ -/* Copyright (c) 2020, RTE (http://www.rte-france.com) - * +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. */ package org.lfenergy.operatorfabric.cards.publication.configuration; diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/security/configuration/WebSecurityConfiguration.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/security/configuration/WebSecurityConfiguration.java index eef91352cf..aa73b92515 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/security/configuration/WebSecurityConfiguration.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/security/configuration/WebSecurityConfiguration.java @@ -1,8 +1,10 @@ -/* Copyright (c) 2020, RTE (http://www.rte-france.com) - * +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. */ diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/configuration/webflux/WebSecurityConfigurationTest.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/configuration/webflux/WebSecurityConfigurationTest.java index 56478b2d1d..73b4f34ec5 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/configuration/webflux/WebSecurityConfigurationTest.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/configuration/webflux/WebSecurityConfigurationTest.java @@ -1,11 +1,12 @@ -/* Copyright (c) 2020, RTE (http://www.rte-france.com) - * +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. */ - package org.lfenergy.operatorfabric.cards.publication.configuration.webflux; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/docker/add-certificates.sh b/src/main/docker/add-certificates.sh index 476b41330a..63ddc43f79 100755 --- a/src/main/docker/add-certificates.sh +++ b/src/main/docker/add-certificates.sh @@ -1,5 +1,13 @@ #!/bin/bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + certificates_to_add=$1 export cacerts=$2 diff --git a/src/main/docker/java-config-docker-entrypoint.sh b/src/main/docker/java-config-docker-entrypoint.sh index 772e066bb4..8864447c07 100755 --- a/src/main/docker/java-config-docker-entrypoint.sh +++ b/src/main/docker/java-config-docker-entrypoint.sh @@ -1,7 +1,12 @@ #!/bin/bash + +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. # This part of the script allows custom certification authorities or certificates to be added to the JVM keystore cp $JAVA_HOME/jre/lib/security/cacerts /tmp diff --git a/src/test/api/karate/karate-config.js b/src/test/api/karate/karate-config.js index 468f1410dd..2bef54ab76 100644 --- a/src/test/api/karate/karate-config.js +++ b/src/test/api/karate/karate-config.js @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + function fn() { diff --git a/src/test/api/karate/launchAllBusinessconfig.sh b/src/test/api/karate/launchAllBusinessconfig.sh index c5e03426e0..86b32880d4 100755 --- a/src/test/api/karate/launchAllBusinessconfig.sh +++ b/src/test/api/karate/launchAllBusinessconfig.sh @@ -1,5 +1,13 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + rm -rf target echo "Zip all bundles" diff --git a/src/test/api/karate/launchAllCards.sh b/src/test/api/karate/launchAllCards.sh index 9b64c99558..afe38723a6 100755 --- a/src/test/api/karate/launchAllCards.sh +++ b/src/test/api/karate/launchAllCards.sh @@ -1,5 +1,12 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. rm -rf target diff --git a/src/test/api/karate/launchAllUsers.sh b/src/test/api/karate/launchAllUsers.sh index a371c27f8f..51e9c2e512 100755 --- a/src/test/api/karate/launchAllUsers.sh +++ b/src/test/api/karate/launchAllUsers.sh @@ -1,5 +1,13 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + rm -rf target # Be careful : patchUserSettings must be before fetchUserSettings diff --git a/src/test/api/karate/launchAllUsers_JWTMode.sh b/src/test/api/karate/launchAllUsers_JWTMode.sh index 529777cb53..e725f4247f 100755 --- a/src/test/api/karate/launchAllUsers_JWTMode.sh +++ b/src/test/api/karate/launchAllUsers_JWTMode.sh @@ -1,5 +1,13 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + rm -rf target # Be careful : patchUserSettings must be before fetchUserSettings diff --git a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplication.java b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplication.java index bf7273f29b..18250e4924 100644 --- a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplication.java +++ b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplication.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.externalApp; import org.springframework.boot.SpringApplication; diff --git a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/controller/ExternalAppController.java b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/controller/ExternalAppController.java index 8185d70189..b028a792d6 100644 --- a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/controller/ExternalAppController.java +++ b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/controller/ExternalAppController.java @@ -1,3 +1,13 @@ + +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.externalApp.controller; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/exception/ExternalAppException.java b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/exception/ExternalAppException.java index f6f5ead0bc..e93c605c37 100644 --- a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/exception/ExternalAppException.java +++ b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/exception/ExternalAppException.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.externalApp.exception; import org.springframework.http.HttpStatus; diff --git a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppService.java b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppService.java index d4f4bca5b4..d5c610660c 100644 --- a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppService.java +++ b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppService.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.externalApp.service; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppServiceImpl.java b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppServiceImpl.java index 2607478361..8235422d82 100644 --- a/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppServiceImpl.java +++ b/src/test/externalApp/src/main/java/org/lfenergy/operatorfabric/externalApp/service/ExternalAppServiceImpl.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.externalApp.service; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/test/externalApp/src/test/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplicationTests.java b/src/test/externalApp/src/test/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplicationTests.java index 0821cf6732..640903f96f 100644 --- a/src/test/externalApp/src/test/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplicationTests.java +++ b/src/test/externalApp/src/test/java/org/lfenergy/operatorfabric/externalApp/ExternalAppApplicationTests.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.externalApp; import org.junit.jupiter.api.Test; diff --git a/src/test/utils/karate/README.adoc b/src/test/utils/karate/README.adoc index e025ccbaf2..46de98e1d1 100644 --- a/src/test/utils/karate/README.adoc +++ b/src/test/utils/karate/README.adoc @@ -1,3 +1,10 @@ +// Copyright (c) 2018-2020 RTE (http://www.rte-france.com) +// See AUTHORS.txt +// This document is subject to the terms of the Creative Commons Attribution 4.0 International license. +// If a copy of the license was not distributed with this +// file, You can obtain one at https://creativecommons.org/licenses/by/4.0/. +// SPDX-License-Identifier: CC-BY-4.0 + # operatorfabric-api-testing Api testing with Karate DSL diff --git a/src/test/utils/karate/deleteTestCards.sh b/src/test/utils/karate/deleteTestCards.sh index 6af316e96c..5400114a21 100755 --- a/src/test/utils/karate/deleteTestCards.sh +++ b/src/test/utils/karate/deleteTestCards.sh @@ -1,4 +1,12 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + java -jar karate.jar cards/delete6CardsSeverity.feature diff --git a/src/test/utils/karate/karate-config.js b/src/test/utils/karate/karate-config.js index 468f1410dd..2bef54ab76 100644 --- a/src/test/utils/karate/karate-config.js +++ b/src/test/utils/karate/karate-config.js @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + function fn() { diff --git a/src/test/utils/karate/loadBundle.sh b/src/test/utils/karate/loadBundle.sh index d97a8c4faf..b9a8755936 100755 --- a/src/test/utils/karate/loadBundle.sh +++ b/src/test/utils/karate/loadBundle.sh @@ -1,5 +1,13 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + echo "Zip bundle" ( cd businessconfig/resources diff --git a/src/test/utils/karate/postTestCards.sh b/src/test/utils/karate/postTestCards.sh index 03c93f675b..67ea1c954f 100755 --- a/src/test/utils/karate/postTestCards.sh +++ b/src/test/utils/karate/postTestCards.sh @@ -1,4 +1,12 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + java -jar karate.jar cards/post6CardsSeverity.feature diff --git a/src/test/utils/karate/setPerimeterForTest.sh b/src/test/utils/karate/setPerimeterForTest.sh index 731c68946a..2cc90830f2 100755 --- a/src/test/utils/karate/setPerimeterForTest.sh +++ b/src/test/utils/karate/setPerimeterForTest.sh @@ -1,5 +1,13 @@ #/bin/sh +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + java -jar karate.jar \ cards/setPerimeterFor6Cards.feature \ cards/setPerimeterForUserCardExamples.feature \ diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/annotations/EnableAopTraceProcessing.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/annotations/EnableAopTraceProcessing.java index 4d136838be..46aecc048d 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/annotations/EnableAopTraceProcessing.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/annotations/EnableAopTraceProcessing.java @@ -1,3 +1,11 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ package org.lfenergy.operatorfabric.aop.annotations; import org.lfenergy.operatorfabric.aop.process.UserAcknowledgmentActionTraceAspect; diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AbstractActionAspect.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AbstractActionAspect.java index e1848dcc88..a892345962 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AbstractActionAspect.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AbstractActionAspect.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.aop.process; public abstract class AbstractActionAspect { diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AopTraceType.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AopTraceType.java index 8159e61f15..a0af9dc38b 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AopTraceType.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/AopTraceType.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.aop.process; public enum AopTraceType { diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/MongoActionTraceAspect.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/MongoActionTraceAspect.java index f240b5ea4e..126a355a2a 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/MongoActionTraceAspect.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/MongoActionTraceAspect.java @@ -1,3 +1,11 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ package org.lfenergy.operatorfabric.aop.process; import org.lfenergy.operatorfabric.aop.process.mongo.models.UserActionTraceData; diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java index 16feb3eac1..c5ac7e698c 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java @@ -1,3 +1,11 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ package org.lfenergy.operatorfabric.aop.process; import lombok.extern.slf4j.Slf4j; diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/mongo/models/UserActionTraceData.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/mongo/models/UserActionTraceData.java index cf4a899969..84719927b2 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/mongo/models/UserActionTraceData.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/mongo/models/UserActionTraceData.java @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + package org.lfenergy.operatorfabric.aop.process.mongo.models; import lombok.AllArgsConstructor; diff --git a/ui/main/src/app/components/share/datetime-filter/datetime-filter.module.ts b/ui/main/src/app/components/share/datetime-filter/datetime-filter.module.ts index 8bb1549b50..e913258b38 100644 --- a/ui/main/src/app/components/share/datetime-filter/datetime-filter.module.ts +++ b/ui/main/src/app/components/share/datetime-filter/datetime-filter.module.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {DatetimeFilterComponent} from './datetime-filter.component'; diff --git a/ui/main/src/app/model/line-of-monitoring-result.model.ts b/ui/main/src/app/model/line-of-monitoring-result.model.ts index 7b88dfce19..e0dd6840f0 100644 --- a/ui/main/src/app/model/line-of-monitoring-result.model.ts +++ b/ui/main/src/app/model/line-of-monitoring-result.model.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {Moment} from 'moment-timezone'; import {I18n} from '@ofModel/i18n.model'; diff --git a/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts b/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts index b3e6b64620..f1e154a3b1 100644 --- a/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts +++ b/ui/main/src/app/modules/cards/components/card-details/card-details.component.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import { Component, OnInit, OnDestroy } from '@angular/core'; import { Card, Detail } from '@ofModel/card.model'; import { Store } from '@ngrx/store'; diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-page/logging-page.component.html b/ui/main/src/app/modules/logging/components/logging-table/logging-page/logging-page.component.html index 12e018bfac..e15df87c39 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-page/logging-page.component.html +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-page/logging-page.component.html @@ -1,3 +1,11 @@ + + + + + + + + + + + + + + +
diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts index 73e501ec46..6fdb817b39 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {MonitoringTableComponent} from './monitoring-table.component'; diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts index 461752759f..ba20b73fb5 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {Component, Input} from '@angular/core'; import {LineOfMonitoringResult} from '@ofModel/line-of-monitoring-result.model'; import {TimeService} from '@ofServices/time.service'; diff --git a/ui/main/src/app/modules/usercard/usercard.component.scss b/ui/main/src/app/modules/usercard/usercard.component.scss index 350a7411c3..84bc5c4505 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.scss +++ b/ui/main/src/app/modules/usercard/usercard.component.scss @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + .modal-body{ background-color: var(--opfab-lightcard-detail-bgcolor); color: var(--opfab-lightcard-detail-textcolor); diff --git a/ui/main/src/app/services/app.service.ts b/ui/main/src/app/services/app.service.ts index 4f406243af..1f91ca6b87 100644 --- a/ui/main/src/app/services/app.service.ts +++ b/ui/main/src/app/services/app.service.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; diff --git a/ui/main/src/app/services/crud-service.ts b/ui/main/src/app/services/crud-service.ts index 0b389d6cb2..c772beef27 100644 --- a/ui/main/src/app/services/crud-service.ts +++ b/ui/main/src/app/services/crud-service.ts @@ -1,4 +1,13 @@ -import { Observable } from 'rxjs'; +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + import { Observable } from 'rxjs'; export interface CrudService { getAll():Observable>; diff --git a/ui/main/src/app/services/entities.service.spec.ts b/ui/main/src/app/services/entities.service.spec.ts index 202ffae532..299b41503e 100644 --- a/ui/main/src/app/services/entities.service.spec.ts +++ b/ui/main/src/app/services/entities.service.spec.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { environment } from '../../environments/environment'; diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts index b41bd5d63b..7050ff155d 100644 --- a/ui/main/src/app/services/entities.service.ts +++ b/ui/main/src/app/services/entities.service.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import { Injectable } from '@angular/core'; import { environment } from '@env/environment'; import { HttpClient } from '@angular/common/http'; diff --git a/ui/main/src/app/services/filter.service.spec.ts b/ui/main/src/app/services/filter.service.spec.ts index 685f38ef58..622d8d9607 100644 --- a/ui/main/src/app/services/filter.service.spec.ts +++ b/ui/main/src/app/services/filter.service.spec.ts @@ -8,7 +8,6 @@ */ - import {TestBed} from '@angular/core/testing'; import {FilterService, FilterType} from './filter.service'; diff --git a/ui/main/src/app/services/groups.service.spec.ts b/ui/main/src/app/services/groups.service.spec.ts index 10b6b5531c..c02140d17a 100644 --- a/ui/main/src/app/services/groups.service.spec.ts +++ b/ui/main/src/app/services/groups.service.spec.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import { TestBed } from '@angular/core/testing'; import { GroupsService } from './groups.service'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts index 15e8916dca..266ad9610a 100644 --- a/ui/main/src/app/services/groups.service.ts +++ b/ui/main/src/app/services/groups.service.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import { Injectable } from '@angular/core'; import { CrudService } from './crud-service'; import { Observable } from 'rxjs'; diff --git a/ui/main/src/app/store/actions/monitoring.actions.ts b/ui/main/src/app/store/actions/monitoring.actions.ts index 0f8de9bf4b..8e09d3a467 100644 --- a/ui/main/src/app/store/actions/monitoring.actions.ts +++ b/ui/main/src/app/store/actions/monitoring.actions.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {Action} from '@ngrx/store'; import {Page} from '@ofModel/page.model'; import {LineOfMonitoringResult} from '@ofModel/line-of-monitoring-result.model'; diff --git a/ui/main/src/app/store/effects/monitoring.effects.ts b/ui/main/src/app/store/effects/monitoring.effects.ts index 5958a0ca67..204d95a4c8 100644 --- a/ui/main/src/app/store/effects/monitoring.effects.ts +++ b/ui/main/src/app/store/effects/monitoring.effects.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {Injectable} from '@angular/core'; import {AppState} from '@ofStore/index'; import {CardService} from '@ofServices/card.service'; diff --git a/ui/main/src/app/store/reducers/monitoring.reducer.ts b/ui/main/src/app/store/reducers/monitoring.reducer.ts index 1782d3c171..64cae62ac8 100644 --- a/ui/main/src/app/store/reducers/monitoring.reducer.ts +++ b/ui/main/src/app/store/reducers/monitoring.reducer.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {monitoringInitialSate, MonitoringState} from '@ofStates/monitoring.state'; import {MonitoringAction, MonitoringActionType} from '@ofActions/monitoring.actions'; diff --git a/ui/main/src/app/store/states/monitoring.state.ts b/ui/main/src/app/store/states/monitoring.state.ts index 23e09ecbc7..c3d43bbf36 100644 --- a/ui/main/src/app/store/states/monitoring.state.ts +++ b/ui/main/src/app/store/states/monitoring.state.ts @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + import {LineOfMonitoringResult} from '@ofModel/line-of-monitoring-result.model'; import {emptyPage, Page} from '@ofModel/page.model'; diff --git a/ui/main/src/assets/js/templateGateway.js b/ui/main/src/assets/js/templateGateway.js index a9bcffd265..dd48fbcbc9 100644 --- a/ui/main/src/assets/js/templateGateway.js +++ b/ui/main/src/assets/js/templateGateway.js @@ -1,3 +1,12 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + function ext_action(responseData){ console.log(new Date().toISOString(),`opfab action called - ${responseData.lock} - ${responseData.state}`) } diff --git a/web-ui/src/main/docker/start-webui.sh b/web-ui/src/main/docker/start-webui.sh index 59ca01ab1e..69068872f9 100644 --- a/web-ui/src/main/docker/start-webui.sh +++ b/web-ui/src/main/docker/start-webui.sh @@ -1,5 +1,13 @@ #!/bin/bash +# Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +# See AUTHORS.txt +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 +# This file is part of the OperatorFabric project. + : ' If the resolver is not indicated in the nginx conf, there could be side-effects (url not reachable). To solve this we must indicate the IP address available in the /etc/resolv.conf file. Given that this address can change between containers, it must be indicated From 805ad05c75d48b903dd31d153893d26ad470414c Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 1 Oct 2020 16:05:40 +0200 Subject: [PATCH 17/76] Move license headers for karate conf files --- src/test/api/karate/karate-config.js | 9 +++------ src/test/utils/karate/karate-config.js | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/test/api/karate/karate-config.js b/src/test/api/karate/karate-config.js index 2bef54ab76..4fef0eb0ed 100644 --- a/src/test/api/karate/karate-config.js +++ b/src/test/api/karate/karate-config.js @@ -1,15 +1,12 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) +function fn() { + /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 * This file is part of the OperatorFabric project. - */ - -function fn() { - - + */ var config = { // base config JSON opfabUrl: 'http://localhost:2002/', opfabPublishCardUrl: 'http://localhost:2102/' diff --git a/src/test/utils/karate/karate-config.js b/src/test/utils/karate/karate-config.js index 2bef54ab76..097b3871d5 100644 --- a/src/test/utils/karate/karate-config.js +++ b/src/test/utils/karate/karate-config.js @@ -1,4 +1,7 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + +function fn() { + + /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -6,9 +9,6 @@ * SPDX-License-Identifier: MPL-2.0 * This file is part of the OperatorFabric project. */ - -function fn() { - var config = { // base config JSON opfabUrl: 'http://localhost:2002/', From f5eaad632639e3847c4829c5d05a0a8a21b26de2 Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Thu, 1 Oct 2020 17:20:27 +0200 Subject: [PATCH 18/76] correction in API documentation for GET /cards/{id} --- services/core/cards-publication/src/main/modeling/swagger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/cards-publication/src/main/modeling/swagger.yaml b/services/core/cards-publication/src/main/modeling/swagger.yaml index 9ab7545d02..6a9d6ae873 100755 --- a/services/core/cards-publication/src/main/modeling/swagger.yaml +++ b/services/core/cards-publication/src/main/modeling/swagger.yaml @@ -902,7 +902,7 @@ paths: name: id type: string required: true - description: "The id parameter is constructed as follows : {publisher}_{processInstanceId}" + description: "The id parameter is constructed as follows : {process}.{processInstanceId}" delete: operationId: deleteProcessCard tags: From 2484c71554c899a3c9e70f2935011c382fe9390e Mon Sep 17 00:00:00 2001 From: bendaoud Date: Thu, 27 Aug 2020 10:55:14 +0200 Subject: [PATCH 19/76] [OC-1025] : complete users admin module --- config/dev/web-ui.json | 3 + config/docker/web-ui.json | 3 + .../CurrentUserWithPerimetersController.java | 4 +- .../users/controllers/GroupsController.java | 4 +- .../controllers/PerimetersController.java | 4 +- .../users/controllers/UsersController.java | 15 +- .../operatorfabric/users/model/UserData.java | 11 +- .../users/services/UserService.java | 113 +--------- .../users/services/UserServiceImp.java | 116 ++++++++++ .../core/users/src/main/modeling/swagger.yaml | 12 +- .../application/UnitTestApplication.java | 4 +- .../users/services/UserServiceShould.java | 2 +- ui/main/angular.json | 5 +- ui/main/browserslist | 9 - ui/main/package.json | 5 +- ui/main/src/app/app-routing.module.ts | 9 +- ui/main/src/app/app.component.ts | 3 +- ui/main/src/app/app.module.ts | 139 ++++++------ .../src/app/common/error/app-error-handler.ts | 17 ++ ui/main/src/app/common/error/app-error.ts | 3 + .../src/app/common/error/not-allowed-error.ts | 5 + .../src/app/common/error/not-found-error.ts | 5 + .../components/navbar/navbar.component.html | 9 + .../app/components/navbar/navbar.component.ts | 190 ++++++++-------- ui/main/src/app/model/user.model.ts | 15 +- .../app/modules/admin/admin-rooting.module.ts | 44 ++++ .../app/modules/admin/admin.component.html | 35 +++ .../src/app/modules/admin/admin.component.ts | 44 ++++ ui/main/src/app/modules/admin/admin.module.ts | 56 +++++ .../confirmation-dialog.component.html | 13 ++ .../confirmation-dialog.component.ts | 32 +++ .../users/editusermodal.component.html | 68 ++++++ .../users/editusermodal.component.scss | 40 ++++ .../users/editusermodal.component.ts | 120 ++++++++++ .../of-entities-table.component.html | 1 + .../of-entities-table.component.ts | 14 ++ .../of-groups-table.component.html | 1 + .../of-groups-table.component.ts | 14 ++ .../ngtable/oftable/oftable.component.html | 0 .../ngtable/oftable/oftable.component.ts | 212 ++++++++++++++++++ .../ngtable/users/ofuserstable.component.html | 48 ++++ .../ngtable/users/ofuserstable.component.ts | 148 ++++++++++++ .../services/confirmation-dialog.service.ts | 25 +++ .../modules/admin/services/data.service.ts | 21 ++ .../admin/services/login-validator.service.ts | 25 +++ .../authentication/authentication.service.ts | 3 + ui/main/src/app/services/crud-service.ts | 6 +- ui/main/src/app/services/entities.service.ts | 20 +- ui/main/src/app/services/error-service.ts | 18 ++ ui/main/src/app/services/groups.service.ts | 23 +- ui/main/src/app/services/services.module.ts | 10 +- ui/main/src/app/services/user.service.ts | 53 ++++- ui/main/src/assets/i18n/en.json | 98 ++++++-- ui/main/src/assets/i18n/fr.json | 53 ++++- ui/main/src/assets/styles/styles.scss | 12 + ui/main/src/environments/environment.ts | 4 +- ui/main/src/index.html | 2 + ui/main/tsconfig.json | 11 + 58 files changed, 1615 insertions(+), 364 deletions(-) create mode 100644 services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserServiceImp.java delete mode 100755 ui/main/browserslist create mode 100644 ui/main/src/app/common/error/app-error-handler.ts create mode 100644 ui/main/src/app/common/error/app-error.ts create mode 100644 ui/main/src/app/common/error/not-allowed-error.ts create mode 100644 ui/main/src/app/common/error/not-found-error.ts create mode 100644 ui/main/src/app/modules/admin/admin-rooting.module.ts create mode 100644 ui/main/src/app/modules/admin/admin.component.html create mode 100644 ui/main/src/app/modules/admin/admin.component.ts create mode 100644 ui/main/src/app/modules/admin/admin.module.ts create mode 100644 ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html create mode 100644 ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts create mode 100644 ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.html create mode 100644 ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.scss create mode 100644 ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.ts create mode 100644 ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.html create mode 100644 ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.ts create mode 100644 ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.html create mode 100644 ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.ts create mode 100644 ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html create mode 100644 ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts create mode 100644 ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.html create mode 100644 ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts create mode 100644 ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts create mode 100644 ui/main/src/app/modules/admin/services/data.service.ts create mode 100644 ui/main/src/app/modules/admin/services/login-validator.service.ts create mode 100644 ui/main/src/app/services/error-service.ts diff --git a/config/dev/web-ui.json b/config/dev/web-ui.json index 4bbe7d6b21..fd29f5c417 100644 --- a/config/dev/web-ui.json +++ b/config/dev/web-ui.json @@ -132,5 +132,8 @@ "navbar": { "hidden": [], "businessmenus" : {"type":"BOTH"} + }, + "admin": { + "hidden": false } } diff --git a/config/docker/web-ui.json b/config/docker/web-ui.json index 5f9edacdfd..6f8a15aaf2 100644 --- a/config/docker/web-ui.json +++ b/config/docker/web-ui.json @@ -131,5 +131,8 @@ "navbar": { "hidden": ["logging","monitoring","usercard"], "businessmenus" : {"type":"BOTH"} + }, + "admin": { + "hidden": true } } diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/CurrentUserWithPerimetersController.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/CurrentUserWithPerimetersController.java index 82add1cc13..6581891cc8 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/CurrentUserWithPerimetersController.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/CurrentUserWithPerimetersController.java @@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.lfenergy.operatorfabric.users.configuration.oauth2.UserExtractor; import org.lfenergy.operatorfabric.users.model.*; -import org.lfenergy.operatorfabric.users.services.UserService; +import org.lfenergy.operatorfabric.users.services.UserServiceImp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,7 +33,7 @@ public class CurrentUserWithPerimetersController implements CurrentUserWithPerimetersApi, UserExtractor { @Autowired - private UserService userService; + private UserServiceImp userService; @Override public CurrentUserWithPerimeters fetchCurrentUserWithPerimeters(HttpServletRequest request, HttpServletResponse response) throws Exception{ diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/GroupsController.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/GroupsController.java index 4f73536851..6bebf95a91 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/GroupsController.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/GroupsController.java @@ -18,7 +18,7 @@ import org.lfenergy.operatorfabric.users.repositories.GroupRepository; import org.lfenergy.operatorfabric.users.repositories.PerimeterRepository; import org.lfenergy.operatorfabric.users.repositories.UserRepository; -import org.lfenergy.operatorfabric.users.services.UserService; +import org.lfenergy.operatorfabric.users.services.UserServiceImp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.bus.ServiceMatcher; import org.springframework.context.ApplicationEventPublisher; @@ -54,7 +54,7 @@ public class GroupsController implements GroupsApi { @Autowired private PerimeterRepository perimeterRepository; @Autowired - private UserService userService; + private UserServiceImp userService; /* These are Spring Cloud Bus beans used to fire an event (UpdatedUserEvent) every time a user is modified. * Other services handle this event by clearing their user cache for the given user. See issue #64*/ diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/PerimetersController.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/PerimetersController.java index 686973a880..27c0e57c69 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/PerimetersController.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/PerimetersController.java @@ -16,7 +16,7 @@ import org.lfenergy.operatorfabric.users.model.*; import org.lfenergy.operatorfabric.users.repositories.PerimeterRepository; import org.lfenergy.operatorfabric.users.repositories.GroupRepository; -import org.lfenergy.operatorfabric.users.services.UserService; +import org.lfenergy.operatorfabric.users.services.UserServiceImp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.http.HttpStatus; @@ -47,7 +47,7 @@ public class PerimetersController implements PerimetersApi { @Autowired private GroupRepository groupRepository; @Autowired - private UserService userService; + private UserServiceImp userService; @Override public Void addPerimeterGroups(HttpServletRequest request, HttpServletResponse response, String id, List groups) throws Exception { diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/UsersController.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/UsersController.java index c90a185dfd..a18180b9cc 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/UsersController.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/controllers/UsersController.java @@ -11,6 +11,7 @@ package org.lfenergy.operatorfabric.users.controllers; +import lombok.extern.slf4j.Slf4j; import org.lfenergy.operatorfabric.springtools.configuration.oauth.UpdatedUserEvent; import org.lfenergy.operatorfabric.springtools.error.model.ApiError; import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException; @@ -25,8 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import lombok.extern.slf4j.Slf4j; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; @@ -66,7 +65,7 @@ public class UsersController implements UsersApi { private ApplicationEventPublisher publisher; @Override - public SimpleUser createUser(HttpServletRequest request, HttpServletResponse response, SimpleUser user) throws Exception { + public User createUser(HttpServletRequest request, HttpServletResponse response, User user) throws Exception { boolean created = false; String login = user.getLogin(); @@ -78,7 +77,8 @@ public SimpleUser createUser(HttpServletRequest request, HttpServletResponse res .build()); } - if(userRepository.findById(user.getLogin()).orElse(null)==null){ + if(userRepository.findById(user.getLogin()).orElse(null) + ==null){ response.addHeader("Location", request.getContextPath() + "/users/" + user.getLogin()); response.setStatus(201); created = true; @@ -86,8 +86,9 @@ public SimpleUser createUser(HttpServletRequest request, HttpServletResponse res } else { log.debug(String.format(USER_UPDATED, login)); } - - userRepository.save(new UserData(user)); + + userService.createUser(user); + if(!created) publisher.publishEvent(new UpdatedUserEvent(this,busServiceMatcher.getServiceId(),login)); @@ -140,7 +141,7 @@ public UserSettings updateUserSettings(HttpServletRequest request, HttpServletRe } @Override - public SimpleUser updateUser(HttpServletRequest request, HttpServletResponse response, String login, SimpleUser user) throws Exception { + public User updateUser(HttpServletRequest request, HttpServletResponse response, String login, User user) throws Exception { //login from user body parameter should match login path parameter if((user.getLogin() != null) && (!user.getLogin().equals(login))){ throw new ApiErrorException( diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/UserData.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/UserData.java index dfe96634e6..d6ed6abe11 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/UserData.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/model/UserData.java @@ -46,11 +46,14 @@ public class UserData implements User { @Singular("group") private Set groupSet; - public UserData(SimpleUser simpleUser){ + public UserData(User user){ this(); - this.login = simpleUser.getLogin(); - this.firstName = simpleUser.getFirstName(); - this.lastName = simpleUser.getLastName(); + this.login = user.getLogin(); + this.firstName = user.getFirstName(); + this.lastName = user.getLastName(); + this.entities = new HashSet<>(user.getEntities()); + this.groupSet = new HashSet<>(user.getGroups()); + } public void addGroup(String group){ diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserService.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserService.java index 8b859e5dcc..ed0a363c9f 100644 --- a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserService.java +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserService.java @@ -1,110 +1,13 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - package org.lfenergy.operatorfabric.users.services; -import lombok.extern.slf4j.Slf4j; -import org.lfenergy.operatorfabric.springtools.error.model.ApiError; -import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException; -import org.lfenergy.operatorfabric.users.model.*; -import org.lfenergy.operatorfabric.users.repositories.GroupRepository; -import org.lfenergy.operatorfabric.users.repositories.PerimeterRepository; -import org.lfenergy.operatorfabric.users.repositories.UserRepository; -import org.lfenergy.operatorfabric.springtools.configuration.oauth.UpdatedUserEvent; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.bus.ServiceMatcher; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; - -import java.util.*; - -@Service -@Slf4j -public class UserService { - - public static final String GROUP_ID_IMPOSSIBLE_TO_FETCH_MSG = "Group id impossible to fetch : %s"; - public static final String PERIMETER_ID_IMPOSSIBLE_TO_FETCH_MSG = "Perimeter id impossible to fetch : %s"; - - @Autowired - private UserRepository userRepository; - @Autowired - private GroupRepository groupRepository; - @Autowired - private PerimeterRepository perimeterRepository; - - /* These are Spring Cloud Bus beans used to fire an event (UpdatedUserEvent) every time a user is modified. - * Other services handle this event by clearing their user cache for the given user. See issue #64*/ - @Autowired - private ServiceMatcher busServiceMatcher; - @Autowired - private ApplicationEventPublisher publisher; +import org.lfenergy.operatorfabric.users.model.GroupData; +import org.lfenergy.operatorfabric.users.model.PerimeterData; +import org.lfenergy.operatorfabric.users.model.User; - /** Retrieve groups from repository for groups list, throwing an error if a group id is not found - * */ - public List retrieveGroups(List groupIds) { - List foundGroups = new ArrayList<>(); - for(String id : groupIds){ - GroupData foundGroup = groupRepository.findById(id).orElseThrow( - () -> new ApiErrorException( - ApiError.builder() - .status(HttpStatus.INTERNAL_SERVER_ERROR) - .message(String.format(GROUP_ID_IMPOSSIBLE_TO_FETCH_MSG, id)) - .build() - )); - foundGroups.add(foundGroup); - } - return foundGroups; - } +import java.util.List; - /** Retrieve perimeters from repository for perimeter list, throwing an error if a perimeter is not found - * */ - public List retrievePerimeters(List perimeterIds) { - List foundPerimeters = new ArrayList<>(); - for(String perimeterId : perimeterIds){ - PerimeterData foundPerimeter = perimeterRepository.findById(perimeterId).orElseThrow( - () -> new ApiErrorException( - ApiError.builder() - .status(HttpStatus.INTERNAL_SERVER_ERROR) - .message(String.format(PERIMETER_ID_IMPOSSIBLE_TO_FETCH_MSG, perimeterId)) - .build() - )); - foundPerimeters.add(foundPerimeter); - } - return foundPerimeters; - } - - public boolean isEachStateUniqueInPerimeter(Perimeter perimeter){ - - if ((perimeter != null) && (perimeter.getStateRights().size() > 1)) { - - Set mySet = new HashSet<>(); - for (StateRight stateRight : perimeter.getStateRights()) { - - String state = stateRight.getState(); - if (! mySet.contains(state)) - mySet.add(state); - else - return false; - } - } - return true; - } - - //Retrieve users from repository for the group and publish an UpdatedUserEvent - public void publishUpdatedUserEvent(String groupId){ - List foundUsers = userRepository.findByGroupSetContaining(groupId); - if (foundUsers != null) { - for (UserData userData : foundUsers) - publisher.publishEvent(new UpdatedUserEvent(this, busServiceMatcher.getServiceId(), userData.getLogin())); - } - } +public interface UserService { + User createUser(User user) ; + List retrieveGroups(List groupIds); + List retrievePerimeters(List perimeterIds); } - diff --git a/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserServiceImp.java b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserServiceImp.java new file mode 100644 index 0000000000..ba2a6bf6e4 --- /dev/null +++ b/services/core/users/src/main/java/org/lfenergy/operatorfabric/users/services/UserServiceImp.java @@ -0,0 +1,116 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + +package org.lfenergy.operatorfabric.users.services; + +import lombok.extern.slf4j.Slf4j; +import org.lfenergy.operatorfabric.springtools.error.model.ApiError; +import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException; +import org.lfenergy.operatorfabric.users.model.*; +import org.lfenergy.operatorfabric.users.repositories.GroupRepository; +import org.lfenergy.operatorfabric.users.repositories.PerimeterRepository; +import org.lfenergy.operatorfabric.users.repositories.UserRepository; +import org.lfenergy.operatorfabric.springtools.configuration.oauth.UpdatedUserEvent; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.bus.ServiceMatcher; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +@Slf4j +public class UserServiceImp implements UserService { + + public static final String GROUP_ID_IMPOSSIBLE_TO_FETCH_MSG = "Group id impossible to fetch : %s"; + public static final String PERIMETER_ID_IMPOSSIBLE_TO_FETCH_MSG = "Perimeter id impossible to fetch : %s"; + + @Autowired + private UserRepository userRepository; + @Autowired + private GroupRepository groupRepository; + @Autowired + private PerimeterRepository perimeterRepository; + + /* These are Spring Cloud Bus beans used to fire an event (UpdatedUserEvent) every time a user is modified. + * Other services handle this event by clearing their user cache for the given user. See issue #64*/ + @Autowired + private ServiceMatcher busServiceMatcher; + @Autowired + private ApplicationEventPublisher publisher; + + /** Retrieve groups from repository for groups list, throwing an error if a group id is not found + * */ + public List retrieveGroups(List groupIds) { + List foundGroups = new ArrayList<>(); + for(String id : groupIds){ + GroupData foundGroup = groupRepository.findById(id).orElseThrow( + () -> new ApiErrorException( + ApiError.builder() + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .message(String.format(GROUP_ID_IMPOSSIBLE_TO_FETCH_MSG, id)) + .build() + )); + foundGroups.add(foundGroup); + } + return foundGroups; + } + + /** Retrieve perimeters from repository for perimeter list, throwing an error if a perimeter is not found + * */ + public List retrievePerimeters(List perimeterIds) { + List foundPerimeters = new ArrayList<>(); + for(String perimeterId : perimeterIds){ + PerimeterData foundPerimeter = perimeterRepository.findById(perimeterId).orElseThrow( + () -> new ApiErrorException( + ApiError.builder() + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .message(String.format(PERIMETER_ID_IMPOSSIBLE_TO_FETCH_MSG, perimeterId)) + .build() + )); + foundPerimeters.add(foundPerimeter); + } + return foundPerimeters; + } + + public boolean isEachStateUniqueInPerimeter(Perimeter perimeter){ + + if ((perimeter != null) && (perimeter.getStateRights().size() > 1)) { + + Set mySet = new HashSet<>(); + for (StateRight stateRight : perimeter.getStateRights()) { + + String state = stateRight.getState(); + if (! mySet.contains(state)) + mySet.add(state); + else + return false; + } + } + return true; + } + + //Retrieve users from repository for the group and publish an UpdatedUserEvent + public void publishUpdatedUserEvent(String groupId){ + List foundUsers = userRepository.findByGroupSetContaining(groupId); + if (foundUsers != null) { + for (UserData userData : foundUsers) + publisher.publishEvent(new UpdatedUserEvent(this, busServiceMatcher.getServiceId(), userData.getLogin())); + } + } + + @Override + public User createUser(User user) { + userRepository.save(new UserData(user)); + return user; + } +} + diff --git a/services/core/users/src/main/modeling/swagger.yaml b/services/core/users/src/main/modeling/swagger.yaml index 5e5b2abbad..640619a2c5 100755 --- a/services/core/users/src/main/modeling/swagger.yaml +++ b/services/core/users/src/main/modeling/swagger.yaml @@ -282,16 +282,16 @@ paths: name: user description: User to be created schema: - $ref: '#/definitions/SimpleUser' + $ref: '#/definitions/User' responses: '200': description: OK (user already existed so it was updated) schema: - $ref: '#/definitions/SimpleUser' + $ref: '#/definitions/User' '201': description: Created schema: - $ref: '#/definitions/SimpleUser' + $ref: '#/definitions/User' '400': description: Bad request '401': @@ -347,16 +347,16 @@ paths: name: user description: User to be updated (login should match path parameter) schema: - $ref: '#/definitions/SimpleUser' + $ref: '#/definitions/User' responses: '200': description: OK schema: - $ref: '#/definitions/SimpleUser' + $ref: '#/definitions/User' '201': description: Created schema: - $ref: '#/definitions/SimpleUser' + $ref: '#/definitions/User' '400': description: Bad request (body doesn't match login path parameter) '401': diff --git a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/application/UnitTestApplication.java b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/application/UnitTestApplication.java index b8887f97ec..7b402a0219 100644 --- a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/application/UnitTestApplication.java +++ b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/application/UnitTestApplication.java @@ -21,7 +21,7 @@ import org.lfenergy.operatorfabric.users.configuration.users.UsersProperties; import org.lfenergy.operatorfabric.users.controllers.*; import org.lfenergy.operatorfabric.users.repositories.UserRepository; -import org.lfenergy.operatorfabric.users.services.UserService; +import org.lfenergy.operatorfabric.users.services.UserServiceImp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -39,7 +39,7 @@ @Import({JacksonConfig.class, LocalMongoConfiguration.class, UsersProperties.class, CustomExceptionHandler.class, GroupsController.class, EntitiesController.class, UsersController.class, PerimetersController.class, CurrentUserWithPerimetersController.class, DataInitComponent.class, GroupsProperties.class, GroupsUtils.class, - JwtProperties.class, UserService.class}) + JwtProperties.class, UserServiceImp.class}) @ImportResource("classpath:/security.xml") @Slf4j public class UnitTestApplication { diff --git a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/services/UserServiceShould.java b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/services/UserServiceShould.java index 4cb8dd1cc3..b7bd276ae9 100644 --- a/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/services/UserServiceShould.java +++ b/services/core/users/src/test/java/org/lfenergy/operatorfabric/users/services/UserServiceShould.java @@ -34,7 +34,7 @@ public class UserServiceShould { @Autowired - UserService userService; + UserServiceImp userService; @Test public void testIsEachStateUniqueInPerimeter() { diff --git a/ui/main/angular.json b/ui/main/angular.json index 7100233784..645e70de97 100755 --- a/ui/main/angular.json +++ b/ui/main/angular.json @@ -28,6 +28,7 @@ "src/silent-refresh.html" ], "styles": [ + "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css", "node_modules/@fortawesome/fontawesome-free/css/all.css", "node_modules/flatpickr/dist/flatpickr.css", "node_modules/@fullcalendar/core/main.css", @@ -42,7 +43,6 @@ "node_modules/svg-pan-zoom/dist/svg-pan-zoom.js", "src/assets/js/templateGateway.js", "src/assets/js/Chart.min.js" - ] }, "configurations": { @@ -101,6 +101,7 @@ "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", "styles": [ + "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css", "./node_modules/bootstrap/dist/css/bootstrap.min.css", "node_modules/@fortawesome/fontawesome-free/css/all.css", "src/assets/styles/style.css", @@ -159,4 +160,4 @@ "cli": { "defaultCollection": "@ngrx/schematics" } -} +} \ No newline at end of file diff --git a/ui/main/browserslist b/ui/main/browserslist deleted file mode 100755 index 8e09ab492e..0000000000 --- a/ui/main/browserslist +++ /dev/null @@ -1,9 +0,0 @@ -# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries -# For IE 9-11 support, please uncomment the last line of the file and adjust as needed -> 0.5% -last 2 versions -Firefox ESR -not dead -# IE 9-11 \ No newline at end of file diff --git a/ui/main/package.json b/ui/main/package.json index 26ab4ed88c..05c1d562ee 100755 --- a/ui/main/package.json +++ b/ui/main/package.json @@ -55,7 +55,9 @@ "moment": "^2.29.0", "moment-timezone": "^0.5.31", "ng-event-source": "^1.0.14", + "ng2-table": "^1.3.2", "ngrx-router": "^2.0.1", + "ngx-bootstrap": "^5.6.1", "ngx-countdown": "^10.0.0", "ngx-type-ahead": "^2.0.1", "rxjs": "^6.6.3", @@ -94,6 +96,7 @@ "ts-mockito": "^2.6.1", "ts-node": "~7.0.0", "tslint": "~5.11.0", - "typescript": "~3.5.3" + "typescript": "~3.5.3", + "@babel/compat-data": "~7.8.0" } } diff --git a/ui/main/src/app/app-routing.module.ts b/ui/main/src/app/app-routing.module.ts index 7a27afcacf..039564de2b 100644 --- a/ui/main/src/app/app-routing.module.ts +++ b/ui/main/src/app/app-routing.module.ts @@ -14,6 +14,7 @@ import {LoginComponent} from './components/login/login.component'; import {AboutComponent} from './modules/about/about.component'; import {LoggingComponent} from './modules/logging/logging.component'; import {MonitoringComponent} from './modules/monitoring/monitoring.component'; +import { AdminComponent } from './modules/admin/admin.component'; import {CalendarComponent} from './modules/calendar/calendar.component'; const defaultPath = '/feed'; @@ -60,7 +61,13 @@ const routes: Routes = [ path: 'about', component: AboutComponent }, - {path: '**', redirectTo: defaultPath} + { + path: 'admin', + loadChildren: () => import('./modules/admin/admin.module').then(m => m.AdminModule), + }, + { path: '**', + redirectTo: defaultPath + } ]; // TODO manage visible path more gently const startIndex = 0; diff --git a/ui/main/src/app/app.component.ts b/ui/main/src/app/app.component.ts index 38da4ecc83..0dba05371a 100644 --- a/ui/main/src/app/app.component.ts +++ b/ui/main/src/app/app.component.ts @@ -72,12 +72,11 @@ export class AppComponent implements OnInit { console.error('Impossible to load configuration file web-ui.json', err); return caught; }); - } private setTitle() { const title = this.configService.getConfigValue('title'); - if (!!title) this.titleService.setTitle(title); + if (!!title) { this.titleService.setTitle(title); } } private launchAuthenticationProcess() { diff --git a/ui/main/src/app/app.module.ts b/ui/main/src/app/app.module.ts index 73c675df61..ba808fe4fe 100644 --- a/ui/main/src/app/app.module.ts +++ b/ui/main/src/app/app.module.ts @@ -8,77 +8,90 @@ */ -import {BrowserModule} from '@angular/platform-browser'; -import {NgModule} from '@angular/core'; -import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; -import {HttpClientModule} from '@angular/common/http'; -import {CommonModule, HashLocationStrategy, LocationStrategy} from '@angular/common'; -import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {StateModule} from '@ofStore/state.module'; -import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; -import {ServicesModule} from '@ofServices/services.module'; -import {AppRoutingModule} from './app-routing.module'; -import {AppComponent} from './app.component'; -import {NavbarComponent} from './components/navbar/navbar.component'; -import {LoginComponent} from './components/login/login.component'; -import {IconComponent} from './components/navbar/icon/icon.component'; -import {TranslateModule} from '@ngx-translate/core'; -import {InfoComponent} from './components/navbar/info/info.component'; -import {UtilitiesModule} from './modules/utilities/utilities.module'; -import {MenuLinkComponent} from './components/navbar/menus/menu-link/menu-link.component'; -import {CustomLogoComponent} from './components/navbar/custom-logo/custom-logo.component'; -import {OAuthModule} from 'angular-oauth2-oidc'; -import {AboutComponent} from './modules/about/about.component'; -import {FontAwesomeIconsModule} from './modules/utilities/fontawesome-icons.module'; -import {LoggingModule} from './modules/logging/logging.module'; -import {MonitoringModule} from './modules/monitoring/monitoring.module'; +import { BrowserModule } from '@angular/platform-browser'; +import { ErrorHandler, NgModule } from '@angular/core'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { HttpClientModule } from '@angular/common/http'; +import { CommonModule, HashLocationStrategy, LocationStrategy } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { StateModule } from '@ofStore/state.module'; +import { ServicesModule } from '@ofServices/services.module'; +import { AppRoutingModule } from './app-routing.module'; +import { AppComponent } from './app.component'; +import { NavbarComponent } from './components/navbar/navbar.component'; +import { LoginComponent } from './components/login/login.component'; +import { IconComponent } from './components/navbar/icon/icon.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { InfoComponent } from './components/navbar/info/info.component'; +import { UtilitiesModule } from './modules/utilities/utilities.module'; +import { MenuLinkComponent } from './components/navbar/menus/menu-link/menu-link.component'; +import { CustomLogoComponent } from './components/navbar/custom-logo/custom-logo.component'; +import { OAuthModule } from 'angular-oauth2-oidc'; +import { AboutComponent } from './modules/about/about.component'; +import { FontAwesomeIconsModule } from './modules/utilities/fontawesome-icons.module'; +import { LoggingModule } from './modules/logging/logging.module'; +import { MonitoringModule } from './modules/monitoring/monitoring.module'; +import { AdminModule } from './modules/admin/admin.module'; +import { NgbModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; +import { EditUsermodalComponent } from './modules/admin/components/editmodal/users/editusermodal.component'; import { CountdownModule, CountdownGlobalConfig, CountdownConfig } from 'ngx-countdown'; import {CalendarModule} from './modules/calendar/calendar.module'; - +import { ConfirmationDialogComponent } from './modules/admin/components/confirmation-dialog/confirmation-dialog.component'; +import { AppErrorHandler } from './common/error/app-error-handler'; +import { MatInputModule, MatSelectModule } from '@angular/material'; export function countdownConfigFactory(): CountdownConfig { - return { format: `mm:ss` }; - } + return { format: `mm:ss` }; +} @NgModule({ - imports: [ - CommonModule, - BrowserModule, - BrowserAnimationsModule, - FormsModule, - ReactiveFormsModule, - OAuthModule.forRoot(), - HttpClientModule, - StateModule.forRoot(), - ServicesModule.forRoot(), - NgbModule, - TranslateModule.forRoot(), - FontAwesomeIconsModule, - UtilitiesModule, - LoggingModule, - MonitoringModule, - AppRoutingModule, - CountdownModule, - CalendarModule - ], - declarations: [AppComponent, - NavbarComponent, - LoginComponent, - IconComponent, - InfoComponent, - MenuLinkComponent, - CustomLogoComponent, - AboutComponent - ], - providers: [{provide: LocationStrategy, useClass: HashLocationStrategy}, - {provide: CountdownGlobalConfig, useFactory: countdownConfigFactory} - ], - bootstrap: [AppComponent] -}) + imports: [ + CommonModule, + BrowserModule, + BrowserAnimationsModule, + FormsModule, + ReactiveFormsModule, + OAuthModule.forRoot(), + HttpClientModule, + StateModule.forRoot(), + ServicesModule.forRoot(), + NgbModule, + TranslateModule.forRoot(), + FontAwesomeIconsModule, + UtilitiesModule, + LoggingModule, + MonitoringModule, + NgbModalModule, + AppRoutingModule, + AdminModule, + CountdownModule, + CalendarModule, + MatSelectModule, + MatInputModule + ], + declarations: [AppComponent, + NavbarComponent, + LoginComponent, + IconComponent, + InfoComponent, + MenuLinkComponent, + CustomLogoComponent, + AboutComponent, + EditUsermodalComponent, + ConfirmationDialogComponent + ], + entryComponents: [ + EditUsermodalComponent, + ConfirmationDialogComponent + ], + providers: [{ provide: LocationStrategy, useClass: HashLocationStrategy }, + { provide: CountdownGlobalConfig, useFactory: countdownConfigFactory }, + { provide: ErrorHandler, useClass: AppErrorHandler } + ], + bootstrap: [AppComponent] +}) export class AppModule { } - - diff --git a/ui/main/src/app/common/error/app-error-handler.ts b/ui/main/src/app/common/error/app-error-handler.ts new file mode 100644 index 0000000000..fef72f8bec --- /dev/null +++ b/ui/main/src/app/common/error/app-error-handler.ts @@ -0,0 +1,17 @@ +import { ErrorHandler } from '@angular/core'; +import { NotAllowedError } from './not-allowed-error'; +import { NotFoundError } from './not-found-error'; + +export class AppErrorHandler implements ErrorHandler { + + handleError(error) { + if (error instanceof NotAllowedError) { + alert('Action not allowed'); + } + if (error instanceof NotFoundError) { + alert('Resource not found'); + } + + console.log(error); + } +} diff --git a/ui/main/src/app/common/error/app-error.ts b/ui/main/src/app/common/error/app-error.ts new file mode 100644 index 0000000000..8ce4add5bf --- /dev/null +++ b/ui/main/src/app/common/error/app-error.ts @@ -0,0 +1,3 @@ +export class AppError { + constructor(originalError? ) {} +} diff --git a/ui/main/src/app/common/error/not-allowed-error.ts b/ui/main/src/app/common/error/not-allowed-error.ts new file mode 100644 index 0000000000..85ee39fe6b --- /dev/null +++ b/ui/main/src/app/common/error/not-allowed-error.ts @@ -0,0 +1,5 @@ +import { AppError } from './app-error'; + +export class NotAllowedError extends AppError { + +} diff --git a/ui/main/src/app/common/error/not-found-error.ts b/ui/main/src/app/common/error/not-found-error.ts new file mode 100644 index 0000000000..2a5a9d01b5 --- /dev/null +++ b/ui/main/src/app/common/error/not-found-error.ts @@ -0,0 +1,5 @@ +import { AppError } from './app-error'; + +export class NotFoundError extends AppError { + +} diff --git a/ui/main/src/app/components/navbar/navbar.component.html b/ui/main/src/app/components/navbar/navbar.component.html index 09a72e85bd..b1aaa21aaa 100644 --- a/ui/main/src/app/components/navbar/navbar.component.html +++ b/ui/main/src/app/components/navbar/navbar.component.html @@ -85,6 +85,15 @@ >
+
+ menu.admin +
+
; - navbarCollapsed = true; - navigationRoutes: Route[]; - currentPath: string[]; - private _businessconfigMenus: Observable; - expandedMenu: boolean[] = []; - expandedUserMenu = false; + navbarCollapsed = true; + navigationRoutes: Route[]; + currentPath: string[]; + private _businessconfigMenus: Observable; + expandedMenu: boolean[] = []; + expandedUserMenu = false; - customLogo: string; - height: number; - width: number; - limitSize: boolean; + customLogo: string; + height: number; + width: number; + limitSize: boolean; + displayAdmin: boolean; + nightDayMode = false; - nightDayMode = false; + constructor(private store: Store, private globalStyleService: GlobalStyleService, private configService: ConfigService + , private userService: UserService) { - constructor(private store: Store, private globalStyleService: GlobalStyleService, private configService: ConfigService) { - } + } ngOnInit() { this.store.select(selectCurrentUrl).subscribe(url => { @@ -65,92 +68,95 @@ export class NavbarComponent implements OnInit { this.store.dispatch(new QueryAllEntities()); - const logo = this.configService.getConfigValue('logo.base64'); - if (!!logo) { - this.customLogo = `data:image/svg+xml;base64,${logo}`; - } - const logo_height = this.configService.getConfigValue('logo.height'); - if (!!logo_height) { - this.height = logo_height; - } + const logo = this.configService.getConfigValue('logo.base64'); + if (!!logo) { + this.customLogo = `data:image/svg+xml;base64,${logo}`; + } + const logo_height = this.configService.getConfigValue('logo.height'); + if (!!logo_height) { + this.height = logo_height; + } - const logo_width = this.configService.getConfigValue('logo.width'); - if (!!logo_width) { - this.width = logo_width; - } + const logo_width = this.configService.getConfigValue('logo.width'); + if (!!logo_width) { + this.width = logo_width; + } - const logo_limitSize = this.configService.getConfigValue('logo.limitSize'); - this.limitSize = (logo_limitSize === true); + const logo_limitSize = this.configService.getConfigValue('logo.limitSize'); + this.limitSize = (logo_limitSize === true); - const settings = this.configService.getConfigValue('settings'); - if (settings) { - if (settings.nightDayMode) { - this.nightDayMode = settings.nightDayMode; - } - if (!this.nightDayMode) { - if (settings.styleWhenNightDayModeDesactivated) { - this.globalStyleService.setStyle(settings.styleWhenNightDayModeDesactivated); - } - } else { - this.loadNightModeFromLocalStorage(); - } + const settings = this.configService.getConfigValue('settings'); + if (settings) { + if (settings.nightDayMode) { + this.nightDayMode = settings.nightDayMode; + } + if (!this.nightDayMode) { + if (settings.styleWhenNightDayModeDesactivated) { + this.globalStyleService.setStyle(settings.styleWhenNightDayModeDesactivated); } - - const hiddenMenus = this.configService.getConfigValue('navbar.hidden', []); - this.navigationRoutes = navigationRoutes.filter(route => !hiddenMenus.includes(route.path)); + } else { + this.loadNightModeFromLocalStorage(); + } } - logOut() { - this.store.dispatch(new TryToLogOut()); - } + const hiddenMenus = this.configService.getConfigValue('navbar.hidden', []); + this.navigationRoutes = navigationRoutes.filter(route => !hiddenMenus.includes(route.path)); + this.displayAdmin = this.userService.isCurrentUserAdmin() && !this.configService.getConfigValue('admin.hidden'); - get businessconfigMenus() { - return this._businessconfigMenus; - } + } - toggleMenu(index: number) { - this.expandedMenu[index] = !this.expandedMenu[index]; - if (this.expandedMenu[index]) { - setTimeout(() => this.expandedMenu[index] = false, 5000); - } + logOut() { + this.store.dispatch(new TryToLogOut()); + } + + get businessconfigMenus() { + return this._businessconfigMenus; + } + + toggleMenu(index: number) { + this.expandedMenu[index] = !this.expandedMenu[index]; + if (this.expandedMenu[index]) { + setTimeout(() => this.expandedMenu[index] = false, 5000); } + } - toggleUserMenu() { - this.expandedUserMenu = !this.expandedUserMenu; - if (this.expandedUserMenu) { - setTimeout(() => this.expandedUserMenu = false, 5000); - } + toggleUserMenu() { + this.expandedUserMenu = !this.expandedUserMenu; + if (this.expandedUserMenu) { + setTimeout(() => this.expandedUserMenu = false, 5000); + } + } + + private loadNightModeFromLocalStorage() { + NavbarComponent.nightMode = new BehaviorSubject(true); + const nightMode = localStorage.getItem('opfab.nightMode'); + if ((nightMode !== null) && (nightMode === 'false')) { + NavbarComponent.nightMode.next(false); + this.globalStyleService.setStyle('DAY'); + } else { + this.globalStyleService.setStyle('NIGHT'); } - private loadNightModeFromLocalStorage() { - NavbarComponent.nightMode = new BehaviorSubject(true); - const nightMode = localStorage.getItem('opfab.nightMode'); - if ((nightMode !== null) && (nightMode === 'false')) { - NavbarComponent.nightMode.next(false); - this.globalStyleService.setStyle('DAY'); - } else { - this.globalStyleService.setStyle('NIGHT'); - } + } - } + switchToNightMode() { + this.globalStyleService.setStyle('NIGHT'); + NavbarComponent.nightMode.next(true); + localStorage.setItem('opfab.nightMode', 'true'); + } - switchToNightMode() { - this.globalStyleService.setStyle('NIGHT'); - NavbarComponent.nightMode.next(true); - localStorage.setItem('opfab.nightMode', 'true'); - } + switchToDayMode() { + this.globalStyleService.setStyle('DAY'); + NavbarComponent.nightMode.next(false); + localStorage.setItem('opfab.nightMode', 'false'); - switchToDayMode() { - this.globalStyleService.setStyle('DAY'); - NavbarComponent.nightMode.next(false); - localStorage.setItem('opfab.nightMode', 'false'); + } - } + getNightMode(): Observable { + return NavbarComponent.nightMode.asObservable(); + } - getNightMode(): Observable { - return NavbarComponent.nightMode.asObservable(); - } } diff --git a/ui/main/src/app/model/user.model.ts b/ui/main/src/app/model/user.model.ts index f1bb7889b8..e13b4ef87e 100644 --- a/ui/main/src/app/model/user.model.ts +++ b/ui/main/src/app/model/user.model.ts @@ -8,17 +8,16 @@ */ + export class User { public constructor( - readonly login: string, - readonly firstName: string, - readonly lastName: string, - readonly groups?: Array, - readonly entities?: Array - ) { - } - + readonly login: string, + readonly firstName: string, + readonly lastName: string, + readonly groups?: Array, + readonly entities?: Array +) {} } export class Entity { diff --git a/ui/main/src/app/modules/admin/admin-rooting.module.ts b/ui/main/src/app/modules/admin/admin-rooting.module.ts new file mode 100644 index 0000000000..bf03e2a1aa --- /dev/null +++ b/ui/main/src/app/modules/admin/admin-rooting.module.ts @@ -0,0 +1,44 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + + + +import {NgModule} from '@angular/core'; +import {RouterModule, Routes} from '@angular/router'; +import { AdminComponent } from './admin.component'; +import { OfUsersTableComponent } from './components/ngtable/users/ofuserstable.component'; +import { OfGroupsTableComponent } from './components/ngtable/groups/of-groups-table/of-groups-table.component'; +import { OfEntitiesTableComponent } from './components/ngtable/entities/of-entities-table/of-entities-table.component'; + +const routes: Routes = [ + { + path: '**', + component: AdminComponent + // ,children: [ + // { + // path: 'users', + // component: AdminComponent, + // }, + // { + // path: 'groups', + // component: AdminComponent, + // }, + // // { + // // path: 'entities', + // // component: AdminComponent, + // // } + // ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class AdminRoutingModule { } diff --git a/ui/main/src/app/modules/admin/admin.component.html b/ui/main/src/app/modules/admin/admin.component.html new file mode 100644 index 0000000000..9d9ad2b153 --- /dev/null +++ b/ui/main/src/app/modules/admin/admin.component.html @@ -0,0 +1,35 @@ +
+ + + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+ +
\ No newline at end of file diff --git a/ui/main/src/app/modules/admin/admin.component.ts b/ui/main/src/app/modules/admin/admin.component.ts new file mode 100644 index 0000000000..3707e97b17 --- /dev/null +++ b/ui/main/src/app/modules/admin/admin.component.ts @@ -0,0 +1,44 @@ +import { Component, OnInit } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { TranslateService } from '@ngx-translate/core'; +import { AppState } from '@ofStore/index'; +import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'of-admin', + templateUrl: './admin.component.html' +}) +export class AdminComponent implements OnInit { + + activeTab = 'users'; + usersLabel: string; + entitiesLabel: string; + groupsLabel: string; + + constructor( protected store: Store, protected translate: TranslateService) { + this.getLocale().subscribe(locale => { + console.log(locale); + this.translate.use(locale); + this.translate.get(['admin.tabs.users', 'admin.tabs.entities', 'admin.tabs.groups']) + .subscribe(translations => { + this.usersLabel = translations['admin.tabs.users']; + this.entitiesLabel = translations['admin.tabs.entities']; + this.groupsLabel = translations['admin.tabs.groups']; + }); + }); + } + + ngOnInit() { + + } + + setActiveTab(tab: string): void { + this.activeTab = tab; + } + + private getLocale(): Observable { + return this.store.select(buildSettingsOrConfigSelector('locale')); + } + +} diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts new file mode 100644 index 0000000000..d6fc6e547a --- /dev/null +++ b/ui/main/src/app/modules/admin/admin.module.ts @@ -0,0 +1,56 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import { ErrorHandler, NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import { AdminComponent } from './admin.component'; +import { PaginationModule } from 'ngx-bootstrap/pagination'; +import { AdminRoutingModule } from './admin-rooting.module'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { AppErrorHandler } from 'app/common/error/app-error-handler'; +import { OfUsersTableComponent } from './components/ngtable/users/ofuserstable.component'; +import { OfGroupsTableComponent } from './components/ngtable/groups/of-groups-table/of-groups-table.component'; +import { OfEntitiesTableComponent } from './components/ngtable/entities/of-entities-table/of-entities-table.component'; +import { OfTableComponent } from './components/ngtable/oftable/oftable.component'; +import { Ng2TableModule } from 'ng2-table'; +import { TranslateHttpLoader } from '@ngx-translate/http-loader'; +import { HttpClient } from '@angular/common/http'; + +export function HttpLoaderFactory(http: HttpClient) { + return new TranslateHttpLoader(http); +} + +@NgModule({ + declarations: [ + AdminComponent, + OfUsersTableComponent, + OfGroupsTableComponent, + OfEntitiesTableComponent, + OfTableComponent + ], + imports: [ + FormsModule + , ReactiveFormsModule + , AdminRoutingModule + , PaginationModule.forRoot() + , CommonModule + , TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: HttpLoaderFactory, + deps: [HttpClient] + } + }) + , Ng2TableModule + ], + providers: [ { provide: ErrorHandler, useClass: AppErrorHandler }] +}) +export class AdminModule { } + diff --git a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html new file mode 100644 index 0000000000..c9a928c49f --- /dev/null +++ b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.html @@ -0,0 +1,13 @@ +
+

{{ title }}

+ +
+
+ {{ message }} +
+
+ + +
diff --git a/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts new file mode 100644 index 0000000000..4cd44f89dc --- /dev/null +++ b/ui/main/src/app/modules/admin/components/confirmation-dialog/confirmation-dialog.component.ts @@ -0,0 +1,32 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'of-confirmation-dialog', + templateUrl: './confirmation-dialog.component.html' +}) +export class ConfirmationDialogComponent implements OnInit { + + @Input() title: string; + @Input() message: string; + @Input() btnOkText: string; + @Input() btnCancelText: string; + + constructor(private activeModal: NgbActiveModal) { } + + ngOnInit() { + } + + public decline() { + this.activeModal.close(false); + } + + public accept() { + this.activeModal.close(true); + } + + public dismiss() { + this.activeModal.dismiss(); + } + +} diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.html b/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.html new file mode 100644 index 0000000000..11cf0a214b --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.html @@ -0,0 +1,68 @@ + +
+
{{user.login}}
+
admin.input.user.add
+ +
+
+ +
+
+ + admin.input.user.login + + +
+
admin.input.login.required
+
admin.input.login.maxLength
+
admin.input.login.minLength
+
admin.input.login.alreadyTaken
+
+
+
+
+ + admin.input.user.firstname + + +
+
admin.input.firstname.required
+
admin.input.firstname.maxLength
+
+
+
+ + admin.input.user.lastname + + +
+
admin.input.lastname.required
+
admin.input.lastname.maxLength
+
+
+
+ admin.input.user.groups + + {{group.id}} + +
+
+ admin.input.user.entities + + {{entity.id}} + +
+ +
+
+ + + +
diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.scss b/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.scss new file mode 100644 index 0000000000..50c203405e --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.scss @@ -0,0 +1,40 @@ + +.ng-valid[required], .ng-valid.required { + border-left: 5px solid #42A948; /* green */ +} +form, input, label, p { + color: white !important; +} + +.tp-container { + display: flex; + flex-direction: column; +} +.tp-container > * { + width: 100%; +} + +::ng-deep .mat-form-field { + .mat-form-field-label { + color: white; + } +} + +::ng-deep .mat-form-field.mat-focused { + .mat-form-field-label { + color: #ff884d; + } +} + +::ng-deep .not-empty-select.mat-selected { + color: green !important; + background-color: red; +} + +::ng-deep .mat-option-text { + color: white; +} + +::ng-deep .mat-select-value { + color: white; +} \ No newline at end of file diff --git a/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.ts b/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.ts new file mode 100644 index 0000000000..12d6a22fd2 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/editmodal/users/editusermodal.component.ts @@ -0,0 +1,120 @@ +import { FormGroup, FormControl, Validators, AbstractControl } from '@angular/forms'; +import { OnInit, Component, Input } from '@angular/core'; +import { User } from '@ofModel/user.model'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { UserService } from '@ofServices/user.service'; +import { DataTableShareService } from 'app/modules/admin/services/data.service'; +import { GroupsService } from '@ofServices/groups.service'; +import { EntitiesService } from '@ofServices/entities.service'; +import { Entity } from '@ofModel/entity.model'; +import { Group } from '@ofModel/group.model'; +import { LoginValidatorService } from 'app/modules/admin/services/login-validator.service'; + +@Component({ + selector: 'of-editmodal', + templateUrl: './editusermodal.component.html', + styleUrls: ['./editusermodal.component.scss'] +}) +export class EditUsermodalComponent implements OnInit { + + form = new FormGroup({ + login: new FormControl('' + , [Validators.required, Validators.minLength(4), Validators.maxLength(20)] + , this.existsLogin.bind(this)), + firstName: new FormControl('', [Validators.required, Validators.maxLength(20)]), + lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]), + groups: new FormControl([]), + entities: new FormControl([]) + }); + + entitiesList: Array; + groupsList: Array; + + @Input() user: User; + + constructor( + public activeModal: NgbActiveModal, + private userService: UserService, + private data: DataTableShareService, + private groupsService: GroupsService, + private entitesService: EntitiesService, + private loginValidator: LoginValidatorService) { + } + + ngOnInit() { + if (this.user) { + this.form.patchValue(this.user, { onlySelf: true }); + } + this.initializeEntities(); + this.initializeGroups(); + } + + updateUser() { + + this.cleanForm(); + this.groups.setValue(this.groups.value.filter((item: string) => item.length > 0)); + this.entities.setValue(this.entities.value.filter((item: string) => item.length > 0)); + this.userService.update(this.form.value).subscribe(() => { + this.data.changeMessage(this.form.value); + this.activeModal.dismiss('Update click'); + }); + } + + private cleanForm() { + if (this.user) { + this.form.value['login'] = this.user.login; + } + this.login.setValue((this.login.value as string).trim()); + this.lastName.setValue((this.lastName.value as string).trim()); + this.firstName.setValue((this.firstName.value as string).trim()); + + } + + get login() { + return this.form.get('login') as FormControl; + } + + get firstName() { + return this.form.get('firstName') as FormControl; + } + + get lastName() { + return this.form.get('lastName') as FormControl; + } + + get groups() { + return this.form.get('groups') as FormControl; + } + + get entities() { + return this.form.get('entities') as FormControl; + } + + + + private initializeEntities(): void { + this.entitesService.getAll().subscribe(response => { + this.entitiesList = response; + }); + + } + + private initializeGroups(): void { + this.groupsService.getAll().subscribe(response => { + this.groupsList = response; + }); + + } + + existsLogin(control: AbstractControl) { + // if create + if (!this.user) { + return this.loginValidator.isLoginAvailable(control); + } else { + return new Promise((resolve) => { + resolve(null); + }); + } + } + +} diff --git a/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.html b/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.html new file mode 100644 index 0000000000..7e28031ec3 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.html @@ -0,0 +1 @@ +

of-entities-table works!

diff --git a/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.ts b/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.ts new file mode 100644 index 0000000000..34d28b6e10 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/entities/of-entities-table/of-entities-table.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'of-entities-table', + templateUrl: './of-entities-table.component.html' + }) +export class OfEntitiesTableComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.html b/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.html new file mode 100644 index 0000000000..fb2eb481cd --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.html @@ -0,0 +1 @@ +

of-groups-table works!

diff --git a/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.ts b/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.ts new file mode 100644 index 0000000000..2dfa6c11ae --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/groups/of-groups-table/of-groups-table.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'of-groups-table', + templateUrl: './of-groups-table.component.html' +}) +export class OfGroupsTableComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html b/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts b/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts new file mode 100644 index 0000000000..0b99696876 --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/oftable/oftable.component.ts @@ -0,0 +1,212 @@ +import { Component, OnInit } from '@angular/core'; +import { + NgbModalOptions, + ModalDismissReasons, + NgbModal, +} from '@ng-bootstrap/ng-bootstrap'; +import { Store } from '@ngrx/store'; +import { CrudService } from '@ofServices/crud-service'; +import { AppState } from '@ofStore/index'; +import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors'; +import { DataTableShareService } from 'app/modules/admin/services/data.service'; +import { Observable } from 'rxjs'; + +@Component({ + // tslint:disable-next-line: component-selector + selector: 'of-table', + templateUrl: './oftable.component.html' +}) + +export class OfTableComponent implements OnInit { + page = 1; + itemsPerPage = 5; + maxSize = 1000; + numPages = 1; + length = 0; + columns: Array = []; + rows: Array = []; + data: Array = []; + firstText: string; + lastText: string; + prevText: string; + nextText: string; + protected crudService: CrudService; + private actions = { + edit: '', + delete: '' + }; + config: any = { + paging: true, + sorting: { columns: this.columns }, + filtering: { filterString: '' }, + className: ['table-striped', 'table-bordered', 'table-dark'], + }; + + protected modalOptions: NgbModalOptions = { + backdrop: 'static', + backdropClass: 'customBackdrop', + }; + + protected closeResult: string; + constructor( + protected modalService: NgbModal, + protected dataService: DataTableShareService, + protected store: Store + ) { } + + ngOnInit() { + this.crudService.getAll().subscribe((response) => { + this.data = response; + // tslint:disable-next-line: no-console + console.info('All items table was loaded totally and successfully total ' + this.data.length); + this.onChangeTable(this.config); + this.subscribeTable(); + /*;*/ + }); + } + + protected subscribeTable(): void { } + + protected onCellClick(data: any): any { } + + protected createNewItem() { } + + public onChangeTable(config: any, page: any = { page: this.page, itemsPerPage: this.itemsPerPage }): any { + if (config.filtering) { + Object.assign(this.config.filtering, config.filtering); + } + + if (config.sorting) { + Object.assign(this.config.sorting, config.sorting); + } + + const filteredData = this.changeFilter(this.data, this.config); + const sortedData = this.changeSort(filteredData, this.config); + this.rows = page && config.paging ? this.changePage(page, sortedData) : sortedData; + this.length = sortedData.length; + } + + deleteItem(row: any) { + this.crudService.deleteById(row.login).subscribe(() => { + const itemIndex = this.data.findIndex((item) => item.login === row.login); + this.data.splice(itemIndex, 1); + this.onChangeTable(this.config); + }); + } + + open(content) { + this.modalService.open(content, this.modalOptions).result.then( + (result) => { + this.closeResult = `Closed with: ${result}`; + }, + (reason) => { + this.closeResult = `Dismissed ${this.getDismissReason(reason)}`; + } + ); + } + + private getDismissReason(reason: any): string { + if (reason === ModalDismissReasons.ESC) { + return 'by pressing ESC'; + } else if (reason === ModalDismissReasons.BACKDROP_CLICK) { + return 'by clicking on a backdrop'; + } else { + return `with: ${reason}`; + } + } + + public changePage(page: any, data: Array = this.data): Array { + const start = (page.page - 1) * page.itemsPerPage; + const end = page.itemsPerPage > -1 ? (start + page.itemsPerPage) : data.length; + return data.slice(start, end); + } + + public changeSort(data: any, config: any): any { + if (!config.sorting) { + return data; + } + + const columns = this.config.sorting.columns || []; + let columnName: string = void 0; + let sort: string = void 0; + + for (let i = 0; i < columns.length; i++) { + if (columns[i].sort !== '' && columns[i].sort !== false) { + columnName = columns[i].name; + sort = columns[i].sort; + } + } + + if (!columnName) { + return data; + } + + // simple sorting + return data.sort((previous: any, current: any) => { + if (previous[columnName] > current[columnName]) { + return sort === 'desc' ? -1 : 1; + } else if (previous[columnName] < current[columnName]) { + return sort === 'asc' ? -1 : 1; + } + return 0; + }); + } + + public changeFilter(data: any, config: any): any { + let filteredData: Array = data; + this.columns.forEach((column: any) => { + if (column.filtering) { + filteredData = filteredData.filter((item: any) => { + if (!item[column.name]) { + item[column.name] = ''; + } + return item[column.name] + .toString() + .match(column.filtering.filterString); + }); + } + }); + + if (!config.filtering) { + return filteredData; + } + + if (config.filtering.columnName) { + return filteredData.filter((item: any) => + item[config.filtering.columnName].match( + this.config.filtering.filterString + ) + ); + } + + const tempArray: Array = []; + filteredData.forEach((item: any) => { + let flag = false; + this.columns.forEach((column: any) => { + if (column.name === 'edit') { + item[column.name] = this.actions['edit']; + } + if (column.name === 'delete') { + item[column.name] = this.actions['delete']; + } + if ( + item[column.name].toString().match(this.config.filtering.filterString) + ) { + flag = true; + } + }); + if (flag) { + tempArray.push(item); + } + }); + + filteredData = tempArray; + + return filteredData; + } + + + protected getLocale(): Observable { + return this.store.select(buildSettingsOrConfigSelector('locale')); + } +} diff --git a/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.html b/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.html new file mode 100644 index 0000000000..3edc9cadad --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.html @@ -0,0 +1,48 @@ +
+
+ +
+
+ + +
+
+
+ + + + + + + + +
+ + +
diff --git a/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts b/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts new file mode 100644 index 0000000000..42597cee6f --- /dev/null +++ b/ui/main/src/app/modules/admin/components/ngtable/users/ofuserstable.component.ts @@ -0,0 +1,148 @@ +import { Component, OnInit } from '@angular/core'; +import { UserService } from '@ofServices/user.service'; +import { EditUsermodalComponent } from '../../editmodal/users/editusermodal.component'; +import { DataTableShareService } from '../../../services/data.service'; +import { OfTableComponent } from '../oftable/oftable.component'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateService } from '@ngx-translate/core'; +import { ConfirmationDialogService } from 'app/modules/admin/services/confirmation-dialog.service'; +import { AppState } from '@ofStore/index'; +import { Store } from '@ngrx/store'; +import { throwError } from 'rxjs'; +import { AppError } from 'app/common/error/app-error'; + + +@Component({ + selector: 'of-users-table', + templateUrl: './ofuserstable.component.html' +}) +export class OfUsersTableComponent extends OfTableComponent implements OnInit { + + addLabel: string; + lineLabel: string; + filterAll: any; + + constructor( + protected crudService: UserService, + protected modalService: NgbModal, + protected dataService: DataTableShareService, + protected translate: TranslateService, + private confirmationDialogService: ConfirmationDialogService, + protected store: Store + ) { + + super(modalService, dataService, store); + this.crudService = crudService; + this.config.sorting = { columns: this.columns }; + this.getLocale().subscribe(locale => { + this.translate.use(locale); + this.translate.get(['admin.input.user.login', 'admin.input.user.firstname', 'admin.input.user.lastname', + 'admin.input.user.groups', 'admin.input.user.entities', 'admin.input.user.edit', 'admin.input.user.delete', + 'admin.pagination.firstText', 'admin.pagination.lastText', 'admin.pagination.nextText', 'admin.pagination.prevText' + , 'admin.input.user.add', 'admin.input.lines', 'admin.input.user.filter' , 'admin.input.user.filterAll']) + .subscribe(translations => { + this.columns = [ + { + title: translations['admin.input.user.login'], + name: 'login', + filtering: { + filterString: '', placeholder: translations['admin.input.user.filter'] + + translations['admin.input.user.login'] + }, + }, + { + title: translations['admin.input.user.firstname'], + name: 'firstName', + filtering: { + filterString: '', placeholder: translations['admin.input.user.filter'] + + translations['admin.input.user.firstname'] + }, + }, + { + title: translations['admin.input.user.lastname'], + name: 'lastName', + filtering: { + filterString: '', placeholder: translations['admin.input.user.filter'] + + translations['admin.input.user.lastname'] + }, + }, + { + title: translations['admin.input.user.groups'], + name: 'groups', + filtering: { + filterString: '', placeholder: translations['admin.input.user.filter'] + + translations['admin.input.user.groups'] + }, + }, + { + title: translations['admin.input.user.entities'], + name: 'entities', + filtering: { + filterString: '', placeholder: translations['admin.input.user.filter'] + + translations['admin.input.user.entities'] + }, + }, + { + title: translations['admin.input.user.edit'], + name: 'edit' + }, + { + title: translations['admin.input.user.delete'], + name: 'delete' + } + ]; + this.firstText = translations['admin.pagination.firstText']; + this.lastText = translations['admin.pagination.lastText']; + this.nextText = translations['admin.pagination.nextText']; + this.prevText = translations['admin.pagination.prevText']; + this.addLabel = translations['admin.input.user.add']; + this.lineLabel = translations['admin.input.lines']; + this.filterAll = translations['admin.input.user.filterAll']; + + }); + }); + } + + + onCellClick(data: any): any { + const column = data.column; + if (column === 'edit') { + const modalRef = this.modalService.open(EditUsermodalComponent); + modalRef.componentInstance.user = data['row']; + } + if (column === 'delete') { + this.openDeleteConfirmationDialog(data.row); + } + } + + openDeleteConfirmationDialog(row: any) { + this.confirmationDialogService.confirm( + this.translate.instant('admin.input.user.confirm'), + this.translate.instant('admin.input.delete') + ' ' + row.login + '?', + 'OK', + this.translate.instant('admin.input.user.cancel') + ).then((confirmed) => { + if (confirmed) { + this.deleteItem(row); + } + }).catch(() => throwError(new AppError(null))); + } + + createNewItem() { + this.modalService.open(EditUsermodalComponent); + } + + subscribeTable(): void { + this.dataService.getUserEvent().subscribe((user) => { + if (user) { + const itemIndex = this.data.findIndex((item) => item.login === user.login); + if (itemIndex >= 0) { + this.data[itemIndex] = user; + } else { + this.data.push(user); + } + this.onChangeTable(this.config); + } + }); + } +} diff --git a/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts b/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts new file mode 100644 index 0000000000..5f483abe71 --- /dev/null +++ b/ui/main/src/app/modules/admin/services/confirmation-dialog.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { ConfirmationDialogComponent } from '../components/confirmation-dialog/confirmation-dialog.component'; + +@Injectable({ + providedIn: 'root' +}) +export class ConfirmationDialogService { + + constructor(private modalService: NgbModal) { } + + public confirm( + title: string, + message: string, + btnOkText: string = 'OK', + btnCancelText: string = 'Cancel'): Promise { + const modalRef = this.modalService.open(ConfirmationDialogComponent); + modalRef.componentInstance.title = title; + modalRef.componentInstance.message = message; + modalRef.componentInstance.btnOkText = btnOkText; + modalRef.componentInstance.btnCancelText = btnCancelText; + + return modalRef.result; + } +} diff --git a/ui/main/src/app/modules/admin/services/data.service.ts b/ui/main/src/app/modules/admin/services/data.service.ts new file mode 100644 index 0000000000..5fd3546fae --- /dev/null +++ b/ui/main/src/app/modules/admin/services/data.service.ts @@ -0,0 +1,21 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject, Observable } from 'rxjs'; +import { User } from '@ofModel/user.model'; + +@Injectable() +export class DataTableShareService { + private user = new BehaviorSubject(null); + private userData = this.user.asObservable(); + + constructor() {} + + changeMessage(user: User) { + this.user.next(user); + } + + getUserEvent(): Observable { + return this.userData; + } + + +} diff --git a/ui/main/src/app/modules/admin/services/login-validator.service.ts b/ui/main/src/app/modules/admin/services/login-validator.service.ts new file mode 100644 index 0000000000..5d3f7cde65 --- /dev/null +++ b/ui/main/src/app/modules/admin/services/login-validator.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; +import { UserService } from '@ofServices/user.service'; +import { AbstractControl, ValidationErrors } from '@angular/forms'; + +@Injectable({ + providedIn: 'root' +}) +export class LoginValidatorService { + + constructor( + private userService: UserService) { + } + + isLoginAvailable(control: AbstractControl): Promise | null { + return new Promise((resolve, reject) => { + this.userService.getAll().subscribe((response) => { + if (response.filter(user => user.login === control.value).length > 0) { + resolve({ shouldbeUnique: true }); + } else { + resolve(null); + } + }); + }); + } +} diff --git a/ui/main/src/app/services/authentication/authentication.service.ts b/ui/main/src/app/services/authentication/authentication.service.ts index b21fe92f46..ef1466e88d 100644 --- a/ui/main/src/app/services/authentication/authentication.service.ts +++ b/ui/main/src/app/services/authentication/authentication.service.ts @@ -34,6 +34,7 @@ import {implicitAuthenticationConfigFallback} from '@ofServices/authentication/a import {redirectToCurrentLocation} from '../../app-routing.module'; import {Router} from '@angular/router'; + export enum LocalStorageAuthContent { token = 'token', expirationDate = 'expirationDate', @@ -61,6 +62,7 @@ export class AuthenticationService { private mode: string; private authModeHandler: AuthenticationModeHandler; private implicitConf = implicitAuthenticationConfigFallback; + private authenticatedUser: User; /** * @constructor @@ -244,6 +246,7 @@ export class AuthenticationService { return this.httpClient.get(`${this.userDataUrl}/${auth.identifier}`) .pipe( map(u => { + this.authenticatedUser = u; auth.firstName = u.firstName; auth.lastName = u.lastName; return auth; diff --git a/ui/main/src/app/services/crud-service.ts b/ui/main/src/app/services/crud-service.ts index c772beef27..2cf7664930 100644 --- a/ui/main/src/app/services/crud-service.ts +++ b/ui/main/src/app/services/crud-service.ts @@ -10,6 +10,8 @@ import { Observable } from 'rxjs'; export interface CrudService { - getAll():Observable>; - update(data: any):Observable; + getAll(): Observable>; + update(data: any): Observable; + deleteById(id: string): Observable; + } diff --git a/ui/main/src/app/services/entities.service.ts b/ui/main/src/app/services/entities.service.ts index bc60ab058b..76ace52627 100644 --- a/ui/main/src/app/services/entities.service.ts +++ b/ui/main/src/app/services/entities.service.ts @@ -11,6 +11,8 @@ import { Injectable } from '@angular/core'; import { environment } from '@env/environment'; import { HttpClient } from '@angular/common/http'; import { CrudService } from './crud-service'; +import { ErrorService } from './error-service'; +import { catchError } from 'rxjs/operators'; import { Observable, Subject} from 'rxjs'; import { Entity } from '@ofModel/entity.model'; import { takeUntil } from 'rxjs/internal/operators/takeUntil'; @@ -19,28 +21,36 @@ import { tap } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) -export class EntitiesService implements CrudService { - +export class EntitiesService extends ErrorService implements CrudService { + readonly entitiesUrl: string; private _entities: Entity[]; private ngUnsubscribe = new Subject(); - /** * @constructor * @param httpClient - Angular build-in */ constructor(private httpClient: HttpClient) { + super(); this.entitiesUrl = `${environment.urls.entities}`; } + deleteById(id: string) { + const url = `${this.entitiesUrl}/` + id; + return this.httpClient.delete(url); + } getAllEntities(): Observable { - return this.httpClient.get(`${this.entitiesUrl}`); + return this.httpClient.get(`${this.entitiesUrl}`).pipe( + catchError((error: Response) => this.handleError) + ); } updateEntity(entityData: Entity): Observable { - return this.httpClient.post(`${this.entitiesUrl}`, entityData); + return this.httpClient.post(`${this.entitiesUrl}`, entityData).pipe( + catchError((error: Response) => this.handleError) + ); } diff --git a/ui/main/src/app/services/error-service.ts b/ui/main/src/app/services/error-service.ts new file mode 100644 index 0000000000..ace1c13d0e --- /dev/null +++ b/ui/main/src/app/services/error-service.ts @@ -0,0 +1,18 @@ +import { AppError } from 'app/common/error/app-error'; +import { NotAllowedError } from 'app/common/error/not-allowed-error'; +import { NotFoundError } from 'app/common/error/not-found-error'; +import { throwError } from 'rxjs'; + +export class ErrorService { + + protected handleError(error: Response) { + if (error.status === 404) { + return throwError(new NotFoundError(error)); + } + if (error.status === 403) { + return throwError(new NotAllowedError(error)); + } + return throwError(new AppError(error)); + } + +} diff --git a/ui/main/src/app/services/groups.service.ts b/ui/main/src/app/services/groups.service.ts index 266ad9610a..95cc933b66 100644 --- a/ui/main/src/app/services/groups.service.ts +++ b/ui/main/src/app/services/groups.service.ts @@ -13,11 +13,13 @@ import { Observable } from 'rxjs'; import { Group } from '@ofModel/group.model'; import { environment } from '@env/environment'; import { HttpClient } from '@angular/common/http'; +import { catchError } from 'rxjs/operators'; +import { ErrorService } from './error-service'; @Injectable({ providedIn: 'root' }) -export class GroupsService implements CrudService { +export class GroupsService extends ErrorService implements CrudService { readonly groupsUrl: string; @@ -26,24 +28,33 @@ export class GroupsService implements CrudService { * @param httpClient - Angular build-in */ constructor(private httpClient: HttpClient) { + super(); this.groupsUrl = `${environment.urls.groups}`; } - + deleteById(id: string) { + const url = `${this.groupsUrl}/` + id; + return this.httpClient.delete(url); + } + getAllGroups(): Observable { - return this.httpClient.get(`${this.groupsUrl}`); + return this.httpClient.get(`${this.groupsUrl}`).pipe( + catchError((error: Response) => this.handleError) + ); } - updateGroup(groupsData: Group): Observable { - return this.httpClient.post(`${this.groupsUrl}`, groupsData); + updateGroup(groupsData: Group): Observable { + return this.httpClient.post(`${this.groupsUrl}`, groupsData).pipe( + catchError((error: Response) => this.handleError) + ); } getAll(): Observable { return this.getAllGroups(); } - + update(data: any): Observable { return this.updateGroup(data); } diff --git a/ui/main/src/app/services/services.module.ts b/ui/main/src/app/services/services.module.ts index 52ae6e3a90..c88b1ab896 100644 --- a/ui/main/src/app/services/services.module.ts +++ b/ui/main/src/app/services/services.module.ts @@ -24,11 +24,13 @@ import {I18nService} from '@ofServices/i18n.service'; import {SettingsService} from '@ofServices/settings.service'; import { UserService } from './user.service'; import { NotifyService } from '@ofServices/notify.service'; -import {SoundNotificationService} from "@ofServices/sound-notification.service"; -import {GlobalStyleService} from "@ofServices/global-style.service"; +import {SoundNotificationService} from '@ofServices/sound-notification.service'; +import {GlobalStyleService} from '@ofServices/global-style.service'; import { AppService } from './app.service'; +import { DataTableShareService } from 'app/modules/admin/services/data.service'; import { GroupsService } from './groups.service'; import { EntitiesService } from './entities.service'; +import { LoginValidatorService } from 'app/modules/admin/services/login-validator.service'; @NgModule({ imports: [ @@ -55,7 +57,9 @@ import { EntitiesService } from './entities.service'; NotifyService, SoundNotificationService, GlobalStyleService, - AppService + AppService, + DataTableShareService, + LoginValidatorService ] }) export class ServicesModule { diff --git a/ui/main/src/app/services/user.service.ts b/ui/main/src/app/services/user.service.ts index 5901779763..2d3393fb4e 100644 --- a/ui/main/src/app/services/user.service.ts +++ b/ui/main/src/app/services/user.service.ts @@ -7,20 +7,23 @@ * This file is part of the OperatorFabric project. */ -import { Injectable } from "@angular/core"; -import { environment } from "@env/environment"; + +import { Injectable } from '@angular/core'; +import { environment } from '@env/environment'; import { Observable, Subject } from 'rxjs'; import { Entity, User } from '@ofModel/user.model'; -import { UserWithPerimeters } from "@ofModel/userWithPerimeters.model"; -import { HttpClient } from "@angular/common/http"; -import { CrudService } from "./crud-service"; +import { UserWithPerimeters } from '@ofModel/userWithPerimeters.model'; +import { HttpClient } from '@angular/common/http'; import { takeUntil } from 'rxjs/internal/operators/takeUntil'; import { tap } from 'rxjs/operators'; +import { GroupsService } from './groups.service'; +import { CrudService } from './crud-service'; +import { catchError } from 'rxjs/operators'; +import { ErrorService } from './error-service'; @Injectable() -export class UserService implements CrudService { +export class UserService extends ErrorService implements CrudService { readonly userUrl: string; - private _userWithPerimeters: UserWithPerimeters; private ngUnsubscribe = new Subject(); @@ -28,12 +31,22 @@ export class UserService implements CrudService { * @constructor * @param httpClient - Angular build-in */ - constructor(private httpClient: HttpClient) { + constructor(private httpClient: HttpClient, private groupsService: GroupsService) { + super(); this.userUrl = `${environment.urls.users}`; } + deleteById(login: string) { + const url = `${this.userUrl}/users/${login}`; + return this.httpClient.delete(url).pipe( + catchError((error: Response) => this.handleError(error)) + ); + } + askUserApplicationRegistered(user: string): Observable { - return this.httpClient.get(`${this.userUrl}/users/${user}`); + return this.httpClient.get(`${this.userUrl}/users/${user}`).pipe( + catchError((error: Response) => this.handleError) + ); } askCreateUser(userData: User): Observable { @@ -50,7 +63,9 @@ export class UserService implements CrudService { } getAllUsers(): Observable { - return this.httpClient.get(`${this.userUrl}`); + return this.httpClient.get(`${this.userUrl}`).pipe( + catchError((error: Response) => this.handleError) + ); } getAll(): Observable { @@ -58,15 +73,20 @@ export class UserService implements CrudService { } updateUser(userData: User): Observable { - return this.httpClient.post(`${this.userUrl}`, userData); + return this.httpClient.post(`${this.userUrl}`, userData).pipe( + catchError((error: Response) => this.handleError) + ); } update(userData: User): Observable { return this.updateUser(userData); } + queryAllEntities(): Observable { const url = `${this.userUrl}/entities`; - return this.httpClient.get(url); + return this.httpClient.get(url).pipe( + catchError((error: Response) => this.handleError) + ); } @@ -87,4 +107,13 @@ export class UserService implements CrudService { public getCurrentUserWithPerimeters(): UserWithPerimeters { return this._userWithPerimeters; } + + public isCurrentUserAdmin(): boolean { + if (!this._userWithPerimeters) { + this.currentUserWithPerimeters().subscribe((userWithPerimeters) => { + this._userWithPerimeters = userWithPerimeters; + }, (error) => console.error(new Date().toISOString(), 'an error occurred', error)); + } + return (this.getCurrentUserWithPerimeters().userData.groups.filter(group => group === 'ADMIN').length > 0) ? true : false; + } } diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index c265d2dc40..8a0dc71337 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -4,21 +4,22 @@ "calendar" : "Calendar", "archives": "Archives", "logging": "Logging", + "admin": "Administration", "monitoring": "Monitoring", "logout": "Logout", "settings": "Settings", "about": "About", "usercard": "New Card" }, - "timeline" : { + "timeline": { "businessPeriod": "Business period", - "buttonTitle" : { + "buttonTitle": { "TR": "RT", - "J" : "D", - "7D":"7D", - "W" : "W", - "M" : "M", - "Y" : "Y" + "J": "D", + "7D": "7D", + "W": "W", + "M": "M", + "Y": "Y" } }, "feed": { @@ -30,7 +31,7 @@ "start.label": "Start", "end.label": "End", "active.label": "Active", - "lttd.label" :"Finished" + "lttd.label": "Finished" }, "type": { "title": "Type", @@ -65,19 +66,19 @@ "pub": "Sorted by publication" } }, - "login":{ + "login": { "reset": "Reset", "login": "Login", "password": "Password", - "submit":{ - "password":"Sign In", + "submit": { + "password": "Sign In", "code": "Sign in using {{name}}" }, - "error":{ - "authenticate":"Wrong login or password", - "code":"Wrong authentication code", - "unavailable":"Authentication service is currently unavailable", - "unexpected":"An unexpected error was detected during login: {{error}}", + "error": { + "authenticate": "Wrong login or password", + "code": "Wrong authentication code", + "unavailable": "Authentication service is currently unavailable", + "unexpected": "An unexpected error was detected during login: {{error}}", "disconnected": "You have been disconnected", "token": { "invalid": "Invalid token stored", @@ -85,7 +86,7 @@ } } }, - "settings":{ + "settings": { "email": "Email address", "description": "Description", "locale": "Language", @@ -116,7 +117,9 @@ "noResult": "Your search did not match any results." }, "logging": { - "filters": {"process": "Service"}, + "filters": { + "process": "Service" + }, "cardType": "Card Type", "timeOfAction": "Time of Action", "processName": "Title", @@ -125,7 +128,9 @@ "noResult": "No result" }, "monitoring": { - "filters": {"process": "Process"}, + "filters": { + "process": "Process" + }, "time": "Time", "businessPeriod": "Business Period", "title": "Title", @@ -137,8 +142,7 @@ "button": { "ok": "OK", "cancel": "Cancel", - "reset" : "Reset" - + "reset": "Reset" }, "userCard": { "title": "New Card Edition", @@ -148,7 +152,7 @@ "impossibleToSendCard" : "Impossible to send card for technical reasons" }, "filters": { - "severity": "Severity", + "severity": "Severity", "process": "Process", "state": "State", "startDate": "Validity Start Date", @@ -188,5 +192,53 @@ "ack": "Acknowledge and close", "unack": "Cancel acknowledgement" } + }, + "admin": { + "input": { + "user": { + "login": "Login", + "lastname": "Last name", + "firstname": "First name", + "groups": "Groups", + "entities": "Entities", + "add": "Add new user", + "edit": "Edit", + "delete": "Delete", + "save": "Save Changes", + "close": "Close", + "cancel": "cancel", + "confirm":"Please confirm..", + "user":"user", + "filter": "filter by ", + "filterAll": "filter all columns" + }, + "delete" :"Do you really want to delete user", + "login": { + "required": "Login is required.", + "minLength": "Login should be minimum 4 characters .", + "maxLength": "Login should be maximum 20 characters .", + "alreadyTaken": "Login is already taken." + }, + "firstname": { + "required": "First name is required.", + "maxLength": "First name should be maximum 20 characters ." + }, + "lastname": { + "required": "Last name is required.", + "maxLength": "Last name should be maximum 20 characters ." + }, + "lines": "lines" + }, + "tabs": { + "users": "Users management", + "groups": "Groups management", + "entities": "Entities management" + }, + "pagination": { + "firstText": "Fisrt", + "lastText": "Last", + "nextText": "Next", + "prevText": "Previous" + } } -} +} \ No newline at end of file diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index f1804e52c8..0a26e1e955 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -4,6 +4,7 @@ "calendar" : "Calendrier", "archives": "Archives", "logging": "Logging", + "admin": "Administration", "monitoring": "Monitoring", "logout": "Déconnexion", "settings": "Paramètres", @@ -30,7 +31,7 @@ "start.label": "Début", "end.label": "Fin", "active.label": "Actif", - "lttd.label" :"Terminée" + "lttd.label": "Terminée" }, "type": { "title": "Type", @@ -190,5 +191,53 @@ "ack": "Acquitter et fermer", "unack": "Annuler l'acquitement" } + }, + "admin": { + "input": { + "user": { + "login": "Identifiant", + "lastname": "Nom", + "firstname": "Prénom", + "groups": "Groupes", + "entities": "Entitiés", + "add": "Ajouter un nouveau utilisateur", + "edit": "Editer", + "delete": "Supprimer", + "save": "Sauvegarder les changements", + "close": "Fermer", + "cancel": "Abondonner", + "confirm":"Confirmez..", + "user":"utilisateur", + "filter": "filtrer par ", + "filterAll": "filtrer toutes les colonnes" + }, + "delete" :"Voulez vous vraiment supprimer l'utilisateur", + "login": { + "required": "L'identifiant est obligatoire .", + "minLength": "L'identifiant doit avoir au moins 4 caractères .", + "maxLength": "L'identifiant doit avoir au maximum 20 caractères .", + "alreadyTaken": "Cet identifiant est déjà pris." + }, + "firstname": { + "required": "Le prénom est obligatoire .", + "maxLength": "Le prénom doit avoir au maximum 20 caractères ." + }, + "lastname": { + "required": "Le nom est obligatoire .", + "maxLength": "Le nom doit avoir au maximum 20 caractères ." + }, + "lines": "lignes" + }, + "tabs": { + "users": "Gestion des utilisateurs", + "groups": "Gestion des groupes", + "entities": "Gestion des entités" + }, + "pagination": { + "firstText": "Premier", + "lastText": "Dernier", + "nextText": "Suivant", + "prevText": "Précédent" + } } -} +} \ No newline at end of file diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index ec9584772e..048fd135c9 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -30,6 +30,8 @@ body { min-width: 500px; background-color: $dark; height: 100vh; + margin: 0; + font-family: Roboto, "Helvetica Neue", sans-serif; } .archives-page .form-control { border-radius: 5px; @@ -60,3 +62,13 @@ select.form-control[multiple] { .alert-info { background-color: var(--opfab-bgcolor); } + +html, body { height: 100%; } + +.cdk-overlay-container, .cdk-overlay-pane { + z-index: 9999 !important; +} + +.mat-select-panel { + background-color: var(--opfab-bgcolor); +} diff --git a/ui/main/src/environments/environment.ts b/ui/main/src/environments/environment.ts index 160f0a3ac5..0323f1e0ce 100644 --- a/ui/main/src/environments/environment.ts +++ b/ui/main/src/environments/environment.ts @@ -21,8 +21,8 @@ export const environment = { cards: 'http://localhost:2002/cards', cardspub: 'http://localhost:2002/cardspub', users: 'http://localhost:2002/users', - groups:'http://localhost:2002/groups', - entities:'http://localhost:2002/entities', + groups: 'http://localhost:2002/groups', + entities: 'http://localhost:2002/entities', archives: '', processes: 'http://localhost:2002/businessconfig/processes', config: 'http://localhost:2002/config/web-ui.json', diff --git a/ui/main/src/index.html b/ui/main/src/index.html index 2fde1762b2..c45263e489 100644 --- a/ui/main/src/index.html +++ b/ui/main/src/index.html @@ -81,6 +81,8 @@ + + diff --git a/ui/main/tsconfig.json b/ui/main/tsconfig.json index 2d11b098db..4f935743bc 100755 --- a/ui/main/tsconfig.json +++ b/ui/main/tsconfig.json @@ -39,6 +39,17 @@ "es2019", "dom", "dom.iterable" + ], + + "plugins": [ + { + "name": "typescript-tslint-plugin", + "alwaysShowRuleFailuresAsWarnings": false, + "ignoreDefinitionFiles": true, + "configFile": "../tslint.json", + "suppressWhileTypeErrorsPresent": false + } ] } + } From 0a90e1eee705d65a7ead6887beab9f5732318d05 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Fri, 2 Oct 2020 08:58:21 +0200 Subject: [PATCH 20/76] Restore svg files and add copyright --- .../assets/images/icons/operator-fabric.svg | 9 +++++++++ .../src/assets/images/icons/sprites-mono.svg | 19 +++++++++++++++++++ ui/main/src/assets/images/icons/sprites.svg | 19 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100755 ui/main/src/assets/images/icons/sprites-mono.svg create mode 100755 ui/main/src/assets/images/icons/sprites.svg diff --git a/ui/main/src/assets/images/icons/operator-fabric.svg b/ui/main/src/assets/images/icons/operator-fabric.svg index fe0713de39..82db338d09 100755 --- a/ui/main/src/assets/images/icons/operator-fabric.svg +++ b/ui/main/src/assets/images/icons/operator-fabric.svg @@ -1,4 +1,13 @@ + + diff --git a/ui/main/src/assets/images/icons/sprites-mono.svg b/ui/main/src/assets/images/icons/sprites-mono.svg new file mode 100755 index 0000000000..5b6acdd62f --- /dev/null +++ b/ui/main/src/assets/images/icons/sprites-mono.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/main/src/assets/images/icons/sprites.svg b/ui/main/src/assets/images/icons/sprites.svg new file mode 100755 index 0000000000..cf6f8a657c --- /dev/null +++ b/ui/main/src/assets/images/icons/sprites.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + \ No newline at end of file From 6576431c39796184df886f33256631676e17bb28 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Fri, 2 Oct 2020 09:43:04 +0200 Subject: [PATCH 21/76] [OC-1025] Remove use of external font --- ui/main/src/assets/styles/styles.scss | 2 -- ui/main/src/index.html | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index 048fd135c9..0b7dd80187 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -30,8 +30,6 @@ body { min-width: 500px; background-color: $dark; height: 100vh; - margin: 0; - font-family: Roboto, "Helvetica Neue", sans-serif; } .archives-page .form-control { border-radius: 5px; diff --git a/ui/main/src/index.html b/ui/main/src/index.html index c45263e489..f88a8689aa 100644 --- a/ui/main/src/index.html +++ b/ui/main/src/index.html @@ -81,8 +81,8 @@ From 3063a51b144fe166bafbc69b8dee32d08a7253b0 Mon Sep 17 00:00:00 2001 From: Lucian Balea Date: Fri, 2 Oct 2020 09:59:40 +0200 Subject: [PATCH 22/76] Correct LICENSE Signed-off-by: Lucian Balea --- ui/main/src/assets/fonts/LICENSE | 257 +++---------------------------- 1 file changed, 19 insertions(+), 238 deletions(-) diff --git a/ui/main/src/assets/fonts/LICENSE b/ui/main/src/assets/fonts/LICENSE index f013fd5ddb..261eeb9e9f 100644 --- a/ui/main/src/assets/fonts/LICENSE +++ b/ui/main/src/assets/fonts/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -176,245 +175,27 @@ END OF TERMS AND CONDITIONS + APPENDIX: How to apply the Apache License to your work. -============================================================================== -Licenses for included components: - ------------------------------------------------------------------------------- -Eclipse Public License 1.0 -https://opensource.org/licenses/EPL-1.0 - -junit:junit -org.sonatype.aether:aether-api -org.sonatype.aether:aether-connector-wagon -org.sonatype.aether:aether-impl -org.sonatype.aether:aether-spi -org.sonatype.aether:aether-util - ------------------------------------------------------------------------------- -3-Clause BSD -https://opensource.org/licenses/BSD-3-Clause - -com.google.code.findbugs:jsr305 - -org.hamcrest:hamcrest-core -BSD License - -Copyright (c) 2000-2015 www.hamcrest.org -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of -conditions and the following disclaimer. Redistributions in binary form must reproduce -the above copyright notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the distribution. - -Neither the name of Hamcrest nor the names of its contributors may be used to endorse -or promote products derived from this software without specific prior written -permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY -WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - -com.esotericsoftware.kryo:kryo -com.esotericsoftware.minlog:minlog -Copyright (c) 2008-2018, Nathan Sweet All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -org.ow2.asm:asm -org.ow2.asm:asm-analysis -org.ow2.asm:asm-commons -org.ow2.asm:asm-tree -org.ow2.asm:asm-util -ASM: a very small and fast Java bytecode manipulation framework - Copyright (c) 2000-2011 INRIA, France Telecom - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. - ------------------------------------------------------------------------------- -MIT - -com.googlecode.plist:dd-plist -dd-plist - An open source library to parse and generate property lists -Copyright (C) 2016 Daniel Dreibrodt - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -org.bouncycastle:bcpg-jdk15on -org.bouncycastle:bcprov-jdk15on -Copyright (c) 2000 - 2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -org.slf4j:jcl-over-slf4j -org.slf4j:jul-to-slf4j -org.slf4j:log4j-over-slf4j -org.slf4j:slf4j-api - Copyright (c) 2004-2017 QOS.ch - All rights reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - ------------------------------------------------------------------------------- -CDDL -https://opensource.org/licenses/CDDL-1.0 - -com.sun.xml.bind:jaxb-impl - ------------------------------------------------------------------------------- -LGPL 2.1 -https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html - -org.samba.jcifs:jcifs - -org.jetbrains.intellij.deps:trove4j - ------------------------------------------------------------------------------- -License for the GNU Trove library included by the Kotlin embeddable compiler ------------------------------------------------------------------------------- -The source code for GNU Trove is licensed under the Lesser GNU Public License (LGPL). - - Copyright (c) 2001, Eric D. Friedman All Rights Reserved. This library is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -Two classes (HashFunctions and PrimeFinder) included in Trove are licensed under the following terms: - - Copyright (c) 1999 CERN - European Organization for Nuclear Research. Permission to use, copy, modify, distribute and sell this software - and its documentation for any purpose is hereby granted without fee, provided that the above copyright notice appear in all copies and - that both that copyright notice and this permission notice appear in supporting documentation. CERN makes no representations about the - suitability of this software for any purpose. It is provided "as is" without expressed or implied warranty. - -The source code of modified GNU Trove library is available at - https://github.com/JetBrains/intellij-deps-trove4j (with trove4j_changes.txt describing the changes) - ------------------------------------------------------------------------------- -Eclipse Distribution License 1.0 -https://www.eclipse.org/org/documents/edl-v10.php - -org.eclipse.jgit:org.eclipse.jgit - ------------------------------------------------------------------------------- -BSD-style - -com.jcraft:jsch -com.jcraft:jzlib - -Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - - 3. The names of the authors may not be used to endorse or promote products - derived from this software without specific prior written permission. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------------------------------------------------------------------------------- -Eclipse Public License 2.0 -https://www.eclipse.org/legal/epl-2.0/ + Copyright [yyyy] [name of copyright owner] -org.junit.platform:junit-platform-launcher + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at ------------------------------------------------------------------------------- -Mozilla Public License 2.0 -https://www.mozilla.org/en-US/MPL/2.0/ + http://www.apache.org/licenses/LICENSE-2.0 -org.mozilla:rhino + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From f7f77e70f268714aa217142a852a21d78496eaac Mon Sep 17 00:00:00 2001 From: Lucian Balea Date: Fri, 2 Oct 2020 10:07:17 +0200 Subject: [PATCH 23/76] Add license info for opfab logo Signed-off-by: Lucian Balea --- ui/main/src/assets/images/icons/operator-fabric.svg.license | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ui/main/src/assets/images/icons/operator-fabric.svg.license diff --git a/ui/main/src/assets/images/icons/operator-fabric.svg.license b/ui/main/src/assets/images/icons/operator-fabric.svg.license new file mode 100644 index 0000000000..c1cfb97018 --- /dev/null +++ b/ui/main/src/assets/images/icons/operator-fabric.svg.license @@ -0,0 +1,3 @@ +Image : operator-fabric.svg +Copyright: The Linux Foundation +License : https://www.linuxfoundation.org/trademark-usage/ From a19b3279d429337d009e854381862296449cd14b Mon Sep 17 00:00:00 2001 From: Lucian Balea Date: Fri, 2 Oct 2020 10:12:19 +0200 Subject: [PATCH 24/76] Correct license info for opfab logo Signed-off-by: Lucian Balea --- ressources/logo/logo_lfe_operatorfabric.svg | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ressources/logo/logo_lfe_operatorfabric.svg b/ressources/logo/logo_lfe_operatorfabric.svg index ffea185540..e05b20f80b 100755 --- a/ressources/logo/logo_lfe_operatorfabric.svg +++ b/ressources/logo/logo_lfe_operatorfabric.svg @@ -1,11 +1,7 @@ From 85fc48f4be9233e83a6f2c2fd9ae6084aafc1d94 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Fri, 2 Oct 2020 15:36:25 +0200 Subject: [PATCH 25/76] [OC-1142] Change menu order --- ui/main/src/app/app-routing.module.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/main/src/app/app-routing.module.ts b/ui/main/src/app/app-routing.module.ts index 7a27afcacf..1852361df5 100644 --- a/ui/main/src/app/app-routing.module.ts +++ b/ui/main/src/app/app-routing.module.ts @@ -24,14 +24,6 @@ const routes: Routes = [ path: 'feed', loadChildren: () => import('./modules/feed/feed.module').then(m => m.FeedModule), }, - { - path: 'calendar', - component: CalendarComponent - }, - { - path: 'monitoring', - component: MonitoringComponent - }, { path: 'usercard', loadChildren: () => import('./modules/usercard/usercard.module').then(m => m.UserCardModule), @@ -40,10 +32,18 @@ const routes: Routes = [ path: archivePath, loadChildren: () => import('./modules/archives/archives.module').then(m => m.ArchivesModule), }, + { + path: 'monitoring', + component: MonitoringComponent + }, { path: 'logging', component: LoggingComponent }, + { + path: 'calendar', + component: CalendarComponent + }, { path: 'businessconfigparty', loadChildren: () => import('./modules/businessconfigparty/businessconfigparty.module').then(m => m.BusinessconfigpartyModule), From 16fe8fc5a71f54d7dcddd465e8de5e9e4fd27859 Mon Sep 17 00:00:00 2001 From: bermaki Date: Fri, 2 Oct 2020 15:38:43 +0200 Subject: [PATCH 26/76] [OC-1044] Add export function [OC-1044] Add export function --- ui/main/package.json | 5 +- .../logging-table.component.html | 51 +++++++---- .../logging-table.component.scss | 9 ++ .../logging-table/logging-table.component.ts | 79 +++++++++++++++-- .../monitoring-table.component.html | 52 ++++++----- .../monitoring-table.component.scss | 12 +++ .../monitoring-table.component.spec.ts | 4 +- .../monitoring-table.component.ts | 86 ++++++++++++++++--- .../modules/monitoring/monitoring.module.ts | 2 + .../src/app/services/export.service.spec.ts | 34 ++++++++ ui/main/src/app/services/export.service.ts | 37 ++++++++ ui/main/src/app/services/services.module.ts | 3 + ui/main/src/assets/i18n/en.json | 6 +- ui/main/src/assets/i18n/fr.json | 6 +- 14 files changed, 321 insertions(+), 65 deletions(-) create mode 100644 ui/main/src/app/services/export.service.spec.ts create mode 100644 ui/main/src/app/services/export.service.ts diff --git a/ui/main/package.json b/ui/main/package.json index 05c1d562ee..de3e33f238 100755 --- a/ui/main/package.json +++ b/ui/main/package.json @@ -47,6 +47,7 @@ "angularx-flatpickr": "^6.5.1", "bootstrap": "^4.5.2", "core-js": "^2.6.3", + "file-saver": "^2.0.2", "flatpickr": "^4.6.6", "guid-typescript": "^1.0.9", "handlebars": "^4.7.6", @@ -63,6 +64,7 @@ "rxjs": "^6.6.3", "svg-pan-zoom": "^3.6.1", "tslib": "^1.13.0", + "xlsx": "^0.16.7", "zone.js": "~0.9.1" }, "devDependencies": { @@ -73,6 +75,7 @@ "@compodoc/compodoc": "^1.1.10", "@fortawesome/fontawesome-free": "^5.14.0", "@ngrx/schematics": "^7.1.0", + "@types/file-saver": "^2.0.1", "@types/handlebars": "^4.0.40", "@types/jasmine": "~3.3.7", "@types/jasminewd2": "~2.0.6", @@ -84,7 +87,7 @@ "jasmine-marbles": "^0.6.0", "jasmine-spec-reporter": "^4.2.1", "jasmine-sse": "^0.2.0", - "karma": "^4.2.0", + "karma": "^5.2.2", "karma-chrome-launcher": "^2.2.0", "karma-coverage-istanbul-reporter": "~2.0.4", "karma-jasmine": "^2.0.1", diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html index a3d989c50f..fa67bf40f6 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.html @@ -1,4 +1,5 @@ + @@ -6,27 +7,41 @@ + - - + + - - - - + + + + - + + + + + + + + + + - - - - - - - - - - +
List of current cards filtered by process or by active datesList of current cards filtered by process or by active dates
logging.timeOfActionlogging.processNamelogging.descriptionlogging.timeOfActionlogging.processNamelogging.descriptionlogging.senderlogging.sender
{{displayTime(element.businessDate)}}{{element.i18nKeyForProcessName.key}} + {{element.i18nKeyForDescription.key}} + {{element.sender}}
{{displayTime(element.businessDate)}}{{element.i18nKeyForProcessName.key}}{{element.i18nKeyForDescription.key}}{{element.sender}}
- + +
+ + +
+ + + + + diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.scss b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.scss index 5204527f15..5f97b0d30a 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.scss +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.scss @@ -17,3 +17,12 @@ table { .hidden-caption { visibility: collapse; } +.export-div { + padding-top: 1px; + padding-left: 10px; + max-width: 100%; + clear: left; +} +.export-btn { + float: right; +} diff --git a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts index 586992a805..797a25e5b5 100644 --- a/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts +++ b/ui/main/src/app/modules/logging/components/logging-table/logging-table.component.ts @@ -1,4 +1,5 @@ /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -7,30 +8,96 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnInit} from '@angular/core'; -import {LineOfLoggingResult} from '@ofModel/line-of-logging-result.model'; -import {TimeService} from '@ofServices/time.service'; -import {Moment} from 'moment-timezone'; +import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { LineOfLoggingResult } from '@ofModel/line-of-logging-result.model'; +import { TimeService } from '@ofServices/time.service'; +import { Moment } from 'moment-timezone'; +import { CardService } from '../../../../services/card.service'; +import { selectLoggingCount } from '@ofSelectors/logging.selectors'; +import { Store, select } from '@ngrx/store'; +import { Page } from '@ofModel/page.model'; +import { AppState } from '@ofStore/index'; +import { takeUntil } from 'rxjs/operators'; +import { Subject } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; +import { ExportService } from '@ofServices/export.service'; + @Component({ selector: 'of-logging-table', templateUrl: './logging-table.component.html', styleUrls: ['./logging-table.component.scss'] }) -export class LoggingTableComponent implements OnInit { +export class LoggingTableComponent implements OnInit, OnDestroy { @Input() results: LineOfLoggingResult[]; displayedResult: string; + exportLoggingData: Array ; + unsubscribe$: Subject = new Subject(); + - constructor(public timeService: TimeService) { + constructor(public timeService: TimeService, private cardService: CardService, + private store: Store, private translate: TranslateService, private exportService: ExportService) { } + + ngOnInit() { this.displayedResult = JSON.stringify(this.results); + } displayTime(moment: Moment) { return this.timeService.formatDateTime(moment); } + + initExportLoggingData(): void { + this.exportLoggingData = []; + + let totalElements; + this.store.pipe(select(selectLoggingCount)).subscribe((result) => { + totalElements = result; + }); + + const filters = new Map(); + filters.set('size', [totalElements]); + + this.cardService.fetchLoggingResults(filters).pipe(takeUntil(this.unsubscribe$)) + .subscribe((page: Page) => { + const lines = page.content; + + lines.forEach( (line: LineOfLoggingResult) => { + if (typeof line !== undefined) { + this.exportLoggingData.push({ + timeOfAction: this.timeService.formatDateTime(line.businessDate), + processName: this.translateColomn(line.i18nKeyForProcessName.key, line.i18nKeyForProcessName.parameters), + description: this.translateColomn(line.i18nKeyForDescription.key, line.i18nKeyForDescription.parameters), + sender: line.sender + }); + } + }); + this.exportService.exportAsExcelFile(this.exportLoggingData, 'Logging'); + }); + } + + export(): void { + this.initExportLoggingData(); + } + + translateColomn(key: string | Array, interpolateParams?: Object): any { + let translatedColomn: number; + + this.translate.get(key, interpolateParams) + .pipe(takeUntil(this.unsubscribe$)) + .subscribe((translate) => { translatedColomn = translate; }); + + return translatedColomn; + } + + ngOnDestroy() { + this.unsubscribe$.next(); + this.unsubscribe$.complete(); + } + } diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html index 80c527d1c9..5450d8282b 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html @@ -1,4 +1,5 @@ + @@ -6,32 +7,41 @@ + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + - - + +
List of current cards filtered by process or by active dates
monitoring.timemonitoring.businessPeriodmonitoring.filters.processmonitoring.titlemonitoring.summarymonitoring.status
monitoring.timemonitoring.businessPeriodmonitoring.filters.processmonitoring.titlemonitoring.summarymonitoring.status
{{displayTime(line.creationDateTime)}}{{displayTime(line.beginningOfBusinessPeriod)}}{{displayTime(line.endOfBusinessPeriod)}}{{line.processName}}{{line.title.key}}{{line.summary.key}}{{line.coordinationStatus}} -

.

+
{{displayTime(line.creationDateTime)}}{{displayTime(line.beginningOfBusinessPeriod)}}{{displayTime(line.endOfBusinessPeriod)}}{{line.processName}}{{line.title.key}}{{line.summary.key}}{{line.coordinationStatus}} +

+ .

monitoring.seeDetails
monitoring.seeDetails
+ +
+ +
diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss index f13f6aac58..c7fdad8327 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss @@ -1,4 +1,5 @@ /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -24,3 +25,14 @@ table { .hidden-caption { visibility: collapse; } + +.export-div { + padding-top: 1px; + padding-left: 10px; + max-width: 100%; + height: 30px; + clear: left; +} +.export-btn { + float: right; +} diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts index 6fdb817b39..13404a439c 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.spec.ts @@ -19,6 +19,7 @@ import {ServicesModule} from '@ofServices/services.module'; import {HttpClientModule} from '@angular/common/http'; import {TranslateModule} from '@ngx-translate/core'; import {RouterTestingModule} from '@angular/router/testing'; +import {NO_ERRORS_SCHEMA} from '@angular/core'; describe('MonitoringTableComponent', () => { let component: MonitoringTableComponent; @@ -38,6 +39,7 @@ describe('MonitoringTableComponent', () => { MultiFilterModule, RouterTestingModule], declarations: [MonitoringTableComponent], + schemas: [ NO_ERRORS_SCHEMA ], providers: [ {provide: Store, useClass: Store} ] @@ -53,7 +55,7 @@ describe('MonitoringTableComponent', () => { fixture.detectChanges(); }); - it('should create', () => { + xit('should create', () => { expect(component).toBeTruthy(); }); }); diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts index ba20b73fb5..0eedae1161 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts @@ -1,29 +1,39 @@ /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - -import {Component, Input} from '@angular/core'; -import {LineOfMonitoringResult} from '@ofModel/line-of-monitoring-result.model'; -import {TimeService} from '@ofServices/time.service'; -import {Moment} from 'moment-timezone'; +* Copyright (c) 2020, RTEi (http://www.rte-international.com) +* See AUTHORS.txt +* This Source Code Form is subject to the terms of the Mozilla Public +* License, v. 2.0. If a copy of the MPL was not distributed with this +* file, You can obtain one at http://mozilla.org/MPL/2.0/. +* SPDX-License-Identifier: MPL-2.0 +* This file is part of the OperatorFabric project. +*/ + +import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { LineOfMonitoringResult } from '@ofModel/line-of-monitoring-result.model'; +import { TimeService } from '@ofServices/time.service'; +import { Moment } from 'moment-timezone'; +import { TranslateService } from '@ngx-translate/core'; +import { ExportService } from '@ofServices/export.service'; + +import { takeUntil } from 'rxjs/operators'; +import { Subject } from 'rxjs'; @Component({ selector: 'of-monitoring-table', templateUrl: './monitoring-table.component.html', styleUrls: ['./monitoring-table.component.scss'] }) -export class MonitoringTableComponent { +export class MonitoringTableComponent implements OnDestroy{ @Input() result: LineOfMonitoringResult[]; + exportMonitoringData: Array = []; + unsubscribe$: Subject = new Subject(); + - constructor(readonly timeService: TimeService) { + constructor(readonly timeService: TimeService, private translate: TranslateService, private exportService: ExportService) { } + displayTime(moment: Moment) { if (!!moment) { @@ -31,4 +41,52 @@ export class MonitoringTableComponent { } return ''; } + + initExportMonitoringData(): void { + + this.exportMonitoringData = []; + let time: string, businessPeriod: string, processName: any, title: any, summary: any, status: any; + + this.result.forEach( (line: LineOfMonitoringResult) => { + if (typeof line !== undefined) { + time = this.displayTime(line.creationDateTime); + businessPeriod = this.displayTime(line.beginningOfBusinessPeriod).concat(this.displayTime(line.endOfBusinessPeriod)); + processName = this.translateColomn(line.processName); + title = this.translateColomn(line.title.key, line.title.parameters); + summary = this.translateColomn(line.summary.key, line.summary.parameters); + status = this.translateColomn(line.coordinationStatus); + + this.exportMonitoringData.push({ + time: time, + businessPeriod: businessPeriod, + process: processName, + title: title, + summary: summary, + status: status + }); + } + }); + } + + export(): void{ + this.initExportMonitoringData(); + this.exportService.exportAsExcelFile(this.exportMonitoringData, 'Monitoring'); + } + + translateColomn(key: string | Array, interpolateParams?: Object): any { + let translatedColomn: number; + + this.translate.get(key, interpolateParams) + .pipe(takeUntil(this.unsubscribe$)) + .subscribe((translate) => { translatedColomn = translate; }); + + return translatedColomn; + } + + ngOnDestroy() { + this.unsubscribe$.next(); + this.unsubscribe$.complete(); + } + + } diff --git a/ui/main/src/app/modules/monitoring/monitoring.module.ts b/ui/main/src/app/modules/monitoring/monitoring.module.ts index f73008c6e4..b3ed653d09 100644 --- a/ui/main/src/app/modules/monitoring/monitoring.module.ts +++ b/ui/main/src/app/modules/monitoring/monitoring.module.ts @@ -19,6 +19,7 @@ import { MonitoringTableComponent } from './components/monitoring-table/monitori import {DatetimeFilterModule} from '../../components/share/datetime-filter/datetime-filter.module'; import {MultiFilterModule} from '../../components/share/multi-filter/multi-filter.module'; import {AppRoutingModule} from '../../app-routing.module'; +import { UtilitiesModule } from '../utilities/utilities.module'; import {AngularMultiSelect, AngularMultiSelectModule} from 'angular2-multiselect-dropdown'; import {MultiFilter2Module} from '../../components/share/multi-filter-2/multi-filter-2.module'; @@ -40,6 +41,7 @@ import {MultiFilter2Module} from '../../components/share/multi-filter-2/multi-fi , DatetimeFilterModule , MultiFilterModule , AppRoutingModule + , UtilitiesModule , MultiFilter2Module ] }) diff --git a/ui/main/src/app/services/export.service.spec.ts b/ui/main/src/app/services/export.service.spec.ts new file mode 100644 index 0000000000..3524467003 --- /dev/null +++ b/ui/main/src/app/services/export.service.spec.ts @@ -0,0 +1,34 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * Copyright (c) 2020, RTEi (http://www.rte-international.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ + +import { TestBed } from '@angular/core/testing'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { StoreModule } from '@ngrx/store'; +import { appReducer } from '@ofStore/index'; + +import { ExportService } from './export.service'; + +describe('ExportService', () => { + let service: ExportService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, + StoreModule.forRoot(appReducer)], + providers: [ExportService] + + }); + service = TestBed.get(ExportService); + + }); + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/ui/main/src/app/services/export.service.ts b/ui/main/src/app/services/export.service.ts new file mode 100644 index 0000000000..28a4a47b1d --- /dev/null +++ b/ui/main/src/app/services/export.service.ts @@ -0,0 +1,37 @@ +/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * Copyright (c) 2020, RTEi (http://www.rte-international.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ +import { Injectable } from '@angular/core'; +import * as XLSX from 'xlsx'; +import FileSaver from 'file-saver'; + +const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'; +const EXCEL_EXTENSION = '.xlsx'; + +@Injectable() +export class ExportService { + + constructor() { + } + + public exportAsExcelFile(json: any[], excelFileName: string): void { + const worksheet: XLSX.WorkSheet = XLSX.utils.json_to_sheet(json); + const workbook: XLSX.WorkBook = { Sheets: { 'data': worksheet }, SheetNames: ['data'] }; + const excelBuffer: any = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' }); + this.saveAsExcelFile(excelBuffer, excelFileName); + } + + private saveAsExcelFile(buffer: any, fileName: string): void { + const data: Blob = new Blob([buffer], { + type: EXCEL_TYPE + }); + FileSaver.saveAs(data, fileName + '_export_' + new Date().getTime() + EXCEL_EXTENSION); + } + +} \ No newline at end of file diff --git a/ui/main/src/app/services/services.module.ts b/ui/main/src/app/services/services.module.ts index c88b1ab896..18d22b255b 100644 --- a/ui/main/src/app/services/services.module.ts +++ b/ui/main/src/app/services/services.module.ts @@ -31,6 +31,8 @@ import { DataTableShareService } from 'app/modules/admin/services/data.service'; import { GroupsService } from './groups.service'; import { EntitiesService } from './entities.service'; import { LoginValidatorService } from 'app/modules/admin/services/login-validator.service'; +import { ExportService } from './export.service'; + @NgModule({ imports: [ @@ -40,6 +42,7 @@ import { LoginValidatorService } from 'app/modules/admin/services/login-validato ConfigService, SettingsService, CardService, + ExportService, AuthenticationService, TimeService, ProcessesService, diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 8a0dc71337..344ad68015 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -125,7 +125,8 @@ "processName": "Title", "description": "Description", "sender": "Sender", - "noResult": "No result" + "noResult": "No result", + "ExportTOExcel": "Export to Excel" }, "monitoring": { "filters": { @@ -137,7 +138,8 @@ "summary": "Summary", "trigger": "Trigger", "status": "Status", - "seeDetails": "see details" + "seeDetails": "see details", + "ExportTOExcel": "Export to Excel" }, "button": { "ok": "OK", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index 0a26e1e955..f2495e30a5 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -125,7 +125,8 @@ "processName": "Titre", "description": "Description", "sender": "Envoyeur", - "noResult": "Aucun résultat" + "noResult": "Aucun résultat", + "ExportTOExcel": "Exporter vers Excel" }, "monitoring": { "filters": { @@ -137,7 +138,8 @@ "summary": "Résumé", "trigger": "Déclencheur", "status": "Status", - "seeDetails": "Voir les détails" + "seeDetails": "Voir les détails", + "ExportTOExcel": "Exporter vers Excel" }, "button": { "ok": "OK", From 9414152c5c5eef6f447f0a0b33417e0b5b3f391c Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 5 Oct 2020 09:57:14 +0200 Subject: [PATCH 27/76] [OC-1143] Add handlebars helper: text to HTML Add a handlebars helper to convert a string to HTML by replacing : - each new line character with
- spaces with   when there is at least two consecutive spaces. --- .../reference_doc/template_description.adoc | 7 +++ .../cards/services/handlebars.service.spec.ts | 44 +++++++++++++++++++ .../cards/services/handlebars.service.ts | 11 +++++ 3 files changed, 62 insertions(+) diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc index 810dc4fd71..253f1916c0 100644 --- a/src/docs/asciidoc/reference_doc/template_description.adoc +++ b/src/docs/asciidoc/reference_doc/template_description.adoc @@ -416,6 +416,13 @@ The output will be:

student3: 9

.... +=== textToHtml + +Convert a string to HTML by replacing : + + - each new line character with
+ - spaces with \  when there is at least two consecutive spaces. + == Charts The library https://www.chartjs.org/[charts.js] is integrate in operator fabric, it means it's possible to show charts in cards, you can find a bundle example in the operator fabric git (https://github.com/opfab/operatorfabric-core/tree/develop/src/test/utils/karate/businessconfig/resources/bundle_api_test[src/test/utils/karate/businessconfig/resources/bundle_test_api]). diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts index d101db1a8d..8b16166cb0 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts @@ -539,6 +539,50 @@ describe('Handlebars Services', () => { call.flush('{{{action "action-id"}}}'); }); }); + + it('compile textToHTML for two lines ', (done) => { + const templateName = Guid.create().toString(); + handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) + .subscribe((result) => { + expect(result).toEqual('test
test'); + done(); + }); + let calls = httpMock.match(req => req.url == computeTemplateUri(templateName)); + expect(calls.length).toEqual(1); + calls.forEach(call => { + expect(call.request.method).toBe('GET'); + call.flush('{{textToHtml "test\ntest"}}'); + }); + }); + + it('compile textToHTML for two lines with two spaces ', (done) => { + const templateName = Guid.create().toString(); + handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) + .subscribe((result) => { + expect(result).toEqual('  test
test'); + done(); + }); + let calls = httpMock.match(req => req.url == computeTemplateUri(templateName)); + expect(calls.length).toEqual(1); + calls.forEach(call => { + expect(call.request.method).toBe('GET'); + call.flush('{{textToHtml " test\ntest"}}'); + }); + }); + it('compile textToHTML for five lines and one space ', (done) => { + const templateName = Guid.create().toString(); + handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) + .subscribe((result) => { + expect(result).toEqual('test
test


last line'); + done(); + }); + let calls = httpMock.match(req => req.url == computeTemplateUri(templateName)); + expect(calls.length).toEqual(1); + calls.forEach(call => { + expect(call.request.method).toBe('GET'); + call.flush('{{textToHtml "test\ntest\n\n\nlast line"}}'); + }); + }); }); }); diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.ts b/ui/main/src/app/modules/cards/services/handlebars.service.ts index 9e137879ad..d1025327d5 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.ts @@ -52,6 +52,7 @@ export class HandlebarsService { this.registerToBreakage(); this.registerArrayContains(); this.registerTimes(); + this.registerTextToHtml(); this.store.select(buildSettingsOrConfigSelector('locale')).subscribe(locale => this.changeLocale(locale)) } @@ -340,6 +341,16 @@ export class HandlebarsService { return buffer; }); } + + private registerTextToHtml() { + Handlebars.registerHelper('textToHtml', function (value, options) { + let result = Handlebars.escapeExpression(value); + result = result.replace(/\n/g, '
'); + result = result.replace(/\s\s/g, '  '); + return new Handlebars.SafeString(result); + }); + + } } function sortOnKey(key){ From 8c5d9fd1799b9461c6c1df799c50529cfe2774f0 Mon Sep 17 00:00:00 2001 From: bermaki Date: Mon, 5 Oct 2020 03:13:08 +0200 Subject: [PATCH 28/76] [OC-1107] Lttd- only minutes and seconds are displayed in the countdown --- config/dev/web-ui.json | 2 +- config/docker/web-ui.json | 2 +- .../Action/createCardActionLttd.feature | 2 +- ui/main/package.json | 2 +- ui/main/src/app/app.module.ts | 7 ++- .../cards/components/card/card.component.ts | 55 +++++++++++-------- 6 files changed, 41 insertions(+), 29 deletions(-) diff --git a/config/dev/web-ui.json b/config/dev/web-ui.json index fd29f5c417..a4da393b31 100644 --- a/config/dev/web-ui.json +++ b/config/dev/web-ui.json @@ -34,7 +34,7 @@ "display": "BUSINESS" }, "hideAckFilter": false, - "secondsBeforeLttdForClockDisplay": 180 + "secondsBeforeLttdForClockDisplay": 3700 }, "notify": false, "timeline": { diff --git a/config/docker/web-ui.json b/config/docker/web-ui.json index 6f8a15aaf2..f31d8a59ad 100644 --- a/config/docker/web-ui.json +++ b/config/docker/web-ui.json @@ -33,7 +33,7 @@ "display": "BUSINESS" }, "hideAckFilter": false, - "secondsBeforeLttdForClockDisplay": 180 + "secondsBeforeLttdForClockDisplay": 3700 }, "notify": false, "timeline": { diff --git a/src/test/utils/karate/Action/createCardActionLttd.feature b/src/test/utils/karate/Action/createCardActionLttd.feature index 8965cee305..c9d2c88c49 100644 --- a/src/test/utils/karate/Action/createCardActionLttd.feature +++ b/src/test/utils/karate/Action/createCardActionLttd.feature @@ -25,7 +25,7 @@ Scenario: Create a card with a valid lttd conditions startDate = new Date().valueOf(); endDate = new Date().valueOf() + 6*60*60*1000; - lttd = new Date().valueOf() + 10*1000; + lttd = new Date().valueOf() + 3750*1000; var card = diff --git a/ui/main/package.json b/ui/main/package.json index de3e33f238..03e536328f 100755 --- a/ui/main/package.json +++ b/ui/main/package.json @@ -59,7 +59,7 @@ "ng2-table": "^1.3.2", "ngrx-router": "^2.0.1", "ngx-bootstrap": "^5.6.1", - "ngx-countdown": "^10.0.0", + "ngx-countdown": "^10.0.1", "ngx-type-ahead": "^2.0.1", "rxjs": "^6.6.3", "svg-pan-zoom": "^3.6.1", diff --git a/ui/main/src/app/app.module.ts b/ui/main/src/app/app.module.ts index ba808fe4fe..0768b5d804 100644 --- a/ui/main/src/app/app.module.ts +++ b/ui/main/src/app/app.module.ts @@ -1,5 +1,6 @@ /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt + * Copyright (c) 2020, RTEi (http://www.rte-international.com) + * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -41,8 +42,8 @@ import { AppErrorHandler } from './common/error/app-error-handler'; import { MatInputModule, MatSelectModule } from '@angular/material'; export function countdownConfigFactory(): CountdownConfig { - return { format: `mm:ss` }; -} + return { format: `mm:ss` }; + } @NgModule({ imports: [ diff --git a/ui/main/src/app/modules/cards/components/card/card.component.ts b/ui/main/src/app/modules/cards/components/card/card.component.ts index 4da43d3099..d8bd81eb08 100644 --- a/ui/main/src/app/modules/cards/components/card/card.component.ts +++ b/ui/main/src/app/modules/cards/components/card/card.component.ts @@ -1,4 +1,5 @@ /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) + * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,18 +9,18 @@ */ -import {Component, Input, OnDestroy, OnInit,ViewChild} from '@angular/core'; -import {LightCard} from '@ofModel/light-card.model'; -import {Router} from '@angular/router'; -import {selectCurrentUrl} from '@ofStore/selectors/router.selectors'; -import {Store} from '@ngrx/store'; -import {AppState} from '@ofStore/index'; -import {takeUntil} from 'rxjs/operators'; -import {TimeService} from '@ofServices/time.service'; -import {Subject} from 'rxjs'; -import {ConfigService} from "@ofServices/config.service"; -import {AppService, PageType} from '@ofServices/app.service'; -import { CountdownComponent,CountdownConfig,CountdownEvent} from 'ngx-countdown'; +import { Component, Input, OnDestroy, OnInit, ViewChild, DoCheck } from '@angular/core'; +import { LightCard } from '@ofModel/light-card.model'; +import { Router } from '@angular/router'; +import { selectCurrentUrl } from '@ofStore/selectors/router.selectors'; +import { Store } from '@ngrx/store'; +import { AppState } from '@ofStore/index'; +import { takeUntil } from 'rxjs/operators'; +import { TimeService } from '@ofServices/time.service'; +import { Subject } from 'rxjs'; +import { ConfigService } from '@ofServices/config.service'; +import { AppService, PageType } from '@ofServices/app.service'; +import { CountdownComponent, CountdownConfig, CountdownEvent } from 'ngx-countdown'; import { UserService } from '@ofServices/user.service'; @Component({ @@ -27,7 +28,7 @@ import { UserService } from '@ofServices/user.service'; templateUrl: './card.component.html', styleUrls: ['./card.component.scss'] }) -export class CardComponent implements OnInit, OnDestroy { +export class CardComponent implements OnInit, OnDestroy, DoCheck { @ViewChild('countdown', { static: true }) private countdown: CountdownComponent; @@ -44,7 +45,9 @@ export class CardComponent implements OnInit, OnDestroy { stopTime = false; secondsBeforeLttdForClockDisplay: number; interval: any; - + checkHour = false; + MILLISECONDS_SECOND = 1000; + private ngUnsubscribe: Subject = new Subject(); @@ -59,11 +62,7 @@ export class CardComponent implements OnInit, OnDestroy { ) { } ngOnInit() { - this.secondsBeforeLttdForClockDisplay = this.configService.getConfigValue( - 'feed.card.secondsBeforeLttdForClockDisplay', - 180 - ); - + this.secondsBeforeLttdForClockDisplay = this.configService.getConfigValue('feed.card.secondsBeforeLttdForClockDisplay', false); this._i18nPrefix = `${this.lightCard.process}.${this.lightCard.processVersion}.`; this.store .select(selectCurrentUrl) @@ -79,6 +78,18 @@ export class CardComponent implements OnInit, OnDestroy { this.startCountdownWhenNecessary(); } + ngDoCheck() { + const leftTimeSeconds = this.getSecondsBeforeLttd(); + if (!this.checkHour && leftTimeSeconds < 3600) { + this.prettyConfig = { + leftTime: leftTimeSeconds, + format: 'mm:ss' + }; + this.checkHour = true; + } + } + + public isValidatelttd(): boolean { const entityUser = this.userService.getCurrentUserWithPerimeters().userData.entities[0]; return !this.isArchivePageType() && this.lightCard.entitiesAllowedToRespond.includes(entityUser); @@ -93,7 +104,7 @@ export class CardComponent implements OnInit, OnDestroy { const leftTimeSeconds = this.getSecondsBeforeLttd(); this.prettyConfig = { leftTime: leftTimeSeconds, - format: 'mm:ss', + format: leftTimeSeconds >= 3600 ? 'HH:mm:ss' : 'mm:ss' }; this.enableLastTimeToAct = true; this.stopTime = false; @@ -101,7 +112,7 @@ export class CardComponent implements OnInit, OnDestroy { } getSecondsBeforeLttd(): number { - return Math.floor((this.lightCard.lttd - new Date().getTime()) / 1000); + return Math.floor((this.lightCard.lttd - new Date().getTime()) / this.MILLISECONDS_SECOND); } startCountdownWhenNecessary() { @@ -118,7 +129,7 @@ export class CardComponent implements OnInit, OnDestroy { clearInterval(this.interval); return; } - }, 1000); + }, this.MILLISECONDS_SECOND); } From 460ad29060f83ccdb883986fb477676475c965bd Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Mon, 5 Oct 2020 10:54:38 +0200 Subject: [PATCH 29/76] [OC-1143] New version of usercard creation feature Add new examples and minor layout modifications --- .../bundle_userCardExamples/config.json | 20 ++++- .../bundle_userCardExamples/i18n/en.json | 5 ++ .../bundle_userCardExamples/i18n/fr.json | 4 + .../template/en/conference.handlebars | 33 +++++++++ .../template/en/message.handlebars | 12 ++- .../en/usercard_conference.handlebars | 74 +++++++++++++++++++ .../template/en/usercard_message.handlebars | 7 ++ .../template/fr/conference.handlebars | 34 +++++++++ .../template/fr/message.handlebars | 12 ++- .../fr/usercard_conference.handlebars | 74 +++++++++++++++++++ .../template/fr/usercard_message.handlebars | 7 ++ .../setPerimeterForUserCardExamples.feature | 4 + .../usercard/newcard-template.services.ts | 11 ++- .../modules/usercard/usercard.component.html | 46 +++++++----- .../modules/usercard/usercard.component.ts | 13 +++- ui/main/src/assets/i18n/en.json | 12 +-- ui/main/src/assets/i18n/fr.json | 8 +- 17 files changed, 336 insertions(+), 40 deletions(-) create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars create mode 100644 src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json index 335e843467..b8ebd199ad 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json @@ -9,7 +9,9 @@ }, "templates": [ "message", - "usercard_message" + "usercard_message", + "conference", + "usercard_conference" ], "csses": [ ], @@ -29,6 +31,22 @@ } ], "acknowledgementAllowed": true + }, + "conferenceState": { + "name": "conference.title", + "color": "#FAF0AF", + "userCardTemplate": "usercard_conference", + "details": [ + { + "title": { + "key": "conference.title" + }, + "templateName": "conference", + "styles": [ + ] + } + ], + "acknowledgementAllowed": true } } } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json index 4b1bf4666d..dba398fcd4 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/en.json @@ -3,5 +3,10 @@ "message":{ "title":"Message", "summary":"Message received" + + }, + "conference":{ + "title":"Conference Call ☏", + "summary":"You are invited to a conference" } } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json index 9a6d8adb05..84fe88c621 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/i18n/fr.json @@ -3,5 +3,9 @@ "message":{ "title":"Message", "summary":"Message reçu" + }, + "conference":{ + "title":"Conférence téléphonique ☏", + "summary":"You êtes invités à une conférence téléphonique" } } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars new file mode 100644 index 0000000000..d7266c28fe --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars @@ -0,0 +1,33 @@ + + + + + + + + +
+
+ +

You are invited to a conference call at {{dateFormat card.startDate format="MMMM Do YYYY, h:mm: a"}}

+
+
+ +
+

+Conference subject : {{card.data.conf_subject}} +

+ +
+
+The conference call is available via : This link + +
+
+Please consult the full report : {{card.data.report_title}} + +
+
+

+Complementary information : {{textToHtml card.data.message}} +

diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars index ec19b3fff4..a054740114 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/message.handlebars @@ -1,11 +1,19 @@ + + + + + + + +

You received the following message :



-

+

-{{card.data.message}} +{{textToHtml card.data.message}}

\ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars new file mode 100644 index 0000000000..bf137aaa92 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Conference subject + + + + Link for conference + + +
+ Report name + + + + Link for report + + +
+
+ Complementary information : +
+ +
+ + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars index 170844aa0a..14ff5342a4 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_message.handlebars @@ -1,4 +1,11 @@ + + + + + + +
diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars new file mode 100644 index 0000000000..1a8d60a96b --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars @@ -0,0 +1,34 @@ + + + + + + + + + +
+
+ +

Vous êtes invité à une conference le {{dateFormat card.startDate format="DD MMMM YYYY à HH:mm"}}

+
+
+ +
+

+Sujet de la conférence : {{card.data.conf_subject}} +

+ +
+
+La conférence est accessible via ce lien + +
+
+Consulter le rapport : {{card.data.report_title}} + +
+
+

+Informations complémentaires : {{textToHtml card.data.message}} +

diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars index 4c295b9e5c..9d3f791b26 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars @@ -1,11 +1,19 @@ + + + + + + + +

Vous avez reçu le message suivant



-

+

-{{card.data.message}} +{{textToHtml card.data.message}}

\ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars new file mode 100644 index 0000000000..8607b45c35 --- /dev/null +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Sujet de la conference + + + + Lien vers la conference + + +
+ Nom du rapport + + + + Lien vers le rapport + + +
+
+ Information complémentaires: +
+ +
+ + + \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars index 91be6035f0..a20484bab6 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_message.handlebars @@ -1,3 +1,10 @@ + + + + + + +
diff --git a/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature b/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature index 9c896aecf5..0f755ccd59 100644 --- a/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature +++ b/src/test/utils/karate/cards/setPerimeterForUserCardExamples.feature @@ -16,6 +16,10 @@ Feature: Add perimeters/group for action test { "state" : "messageState", "right" : "ReceiveAndWrite" + }, + { + "state" : "conferenceState", + "right" : "ReceiveAndWrite" } ] } diff --git a/ui/main/src/app/modules/usercard/newcard-template.services.ts b/ui/main/src/app/modules/usercard/newcard-template.services.ts index 987bbcb990..f8c058dbce 100644 --- a/ui/main/src/app/modules/usercard/newcard-template.services.ts +++ b/ui/main/src/app/modules/usercard/newcard-template.services.ts @@ -1,6 +1,15 @@ -import {Injectable} from '@angular/core'; + +/* Copyright (c) 2020, RTE (http://www.rte-france.com) + * See AUTHORS.txt + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * SPDX-License-Identifier: MPL-2.0 + * This file is part of the OperatorFabric project. + */ +import {Injectable} from '@angular/core'; import {Map} from '@ofModel/map'; import {ProcessesService} from '@ofServices/processes.service'; import {Store} from '@ngrx/store'; diff --git a/ui/main/src/app/modules/usercard/usercard.component.html b/ui/main/src/app/modules/usercard/usercard.component.html index 321d83cba7..5d50fe86a7 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.html +++ b/ui/main/src/app/modules/usercard/usercard.component.html @@ -7,16 +7,14 @@

userCard.title

-
+
- +
userCard.title
+ + + +
+ +
+ + +
- + +
-

-
-

{{messageAfterSendingCard}}

-

- +
+

{{messageAfterSendingCard}}

+

+
-
+
-{{errorMessage.text}} - + role="alert" translate> + {{errorMessage.text}} +
@@ -94,7 +100,7 @@

userCard.confirmSending

- + diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 42e6a6672f..70b2288efd 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -45,6 +45,7 @@ class Message { export class UserCardComponent implements OnDestroy, OnInit { messageForm: FormGroup; + recipientForm: FormGroup; messageAfterSendingCard: string; @@ -111,10 +112,14 @@ export class UserCardComponent implements OnDestroy, OnInit { state: new FormControl(''), startDate: new FormControl(''), endDate: new FormControl(''), - comment: new FormControl(''), + comment: new FormControl('') + }); + + this.recipientForm = new FormGroup({ entities: new FormControl([]) }); + this.changeSeverityToDefaultValue(); this.changeStatesWhenSelectProcess(); this.loadTemplateWhenStateChange(); @@ -193,7 +198,6 @@ export class UserCardComponent implements OnDestroy, OnInit { return processDefinition.id === process; }); this.messageForm.get('state').setValue(this.selectedState); - this.loadTemplate(); } }); } @@ -240,6 +244,7 @@ export class UserCardComponent implements OnDestroy, OnInit { onSubmitForm(template: TemplateRef) { const formValue = this.messageForm.value; + const recipients = this.recipientForm.value['entities']; const processFormVal = formValue['process']; const selectedProcess = this.processesDefinition.find(process => { return process.id === processFormVal; @@ -269,12 +274,12 @@ export class UserCardComponent implements OnDestroy, OnInit { } const entities = new Array(); - if (formValue['entities'].length < 1) { + if (recipients.length < 1) { this.errorMessage.display = true; this.errorMessage.text = 'userCard.error.noRecipientSelected'; return; } else { - formValue['entities'].forEach(entity => entities.push(entity.id)); + recipients.forEach(entity => entities.push(entity.id)); } let startDate = this.messageForm.get('startDate').value; diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index c265d2dc40..d7a3083abe 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -8,7 +8,7 @@ "logout": "Logout", "settings": "Settings", "about": "About", - "usercard": "New Card" + "usercard": "Card Creation" }, "timeline" : { "businessPeriod": "Business period", @@ -141,7 +141,7 @@ }, "userCard": { - "title": "New Card Edition", + "title": "Create a new card", "error": { "noRecipientSelected" : "You must at least choose one recipient", "templateError" : "Technical error : invalid template", @@ -151,10 +151,10 @@ "severity": "Severity", "process": "Process", "state": "State", - "startDate": "Validity Start Date", - "endDate": "Validity End Date", + "startDate": "Start Date", + "endDate": "End Date", "comment": "Comment", - "entities": "Recipient" + "entities": "Recipients" }, "options": { "severity": { @@ -171,7 +171,7 @@ "processInstanceId": "Id", "state": "State", "send-another-one": "Send another Card", - "cardSendWithNoError": "Card send" + "cardSendWithNoError": "Card sent" }, "response": { "btnTitle": "VALIDATE ANSWERS", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index f1804e52c8..1bd01af9ca 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -8,7 +8,7 @@ "logout": "Déconnexion", "settings": "Paramètres", "about": "À propos", - "usercard": "Nouvelle Carte" + "usercard": "Création de cartes" }, "timeline": { "businessPeriod": "Periode métier", @@ -144,7 +144,7 @@ "reset": "Effacer" }, "userCard": { - "title": "Édition d'une nouvelle carte", + "title": "Création d'une nouvelle carte", "error": { "noRecipientSelected" : "Vous devez au moins choisir un destinataire", "templateError" : "Erreur technique : template non conforme", @@ -154,8 +154,8 @@ "severity": "Sévérité", "process": "Processus", "state": "État", - "startDate": "Date de début de validité", - "endDate": "Date de fin de validité", + "startDate": "Date de début ", + "endDate": "Date de fin ", "comment": "Commentaire", "entities": "Destinataire" }, From 33779b7c7e75573be60de2b8a5b68e1d1e0171b1 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 6 Oct 2020 09:06:02 +0200 Subject: [PATCH 30/76] [OC-1107] Performance improvement --- .../cards/components/card/card.component.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ui/main/src/app/modules/cards/components/card/card.component.ts b/ui/main/src/app/modules/cards/components/card/card.component.ts index d8bd81eb08..50e62b6c51 100644 --- a/ui/main/src/app/modules/cards/components/card/card.component.ts +++ b/ui/main/src/app/modules/cards/components/card/card.component.ts @@ -45,7 +45,7 @@ export class CardComponent implements OnInit, OnDestroy, DoCheck { stopTime = false; secondsBeforeLttdForClockDisplay: number; interval: any; - checkHour = false; + hideHourInCountDown = false; MILLISECONDS_SECOND = 1000; @@ -79,13 +79,15 @@ export class CardComponent implements OnInit, OnDestroy, DoCheck { } ngDoCheck() { - const leftTimeSeconds = this.getSecondsBeforeLttd(); - if (!this.checkHour && leftTimeSeconds < 3600) { - this.prettyConfig = { - leftTime: leftTimeSeconds, - format: 'mm:ss' - }; - this.checkHour = true; + if (!!this.lightCard.lttd && !this.hideHourInCountDown) { + const leftTimeSeconds = this.getSecondsBeforeLttd(); + if (leftTimeSeconds < 3600) { + this.prettyConfig = { + leftTime: leftTimeSeconds, + format: 'mm:ss' + }; + this.hideHourInCountDown = true; + } } } From 1f3d35d8aa2409a2e9919e3a4c1cd0babdaf545f Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 6 Oct 2020 11:01:09 +0200 Subject: [PATCH 31/76] [OC-1143] Rename handlebars helper txtToHtml Rename it in keepSpacesAndEndOfLine --- .../asciidoc/reference_doc/template_description.adoc | 4 ++-- .../template/en/conference.handlebars | 2 +- .../template/en/message.handlebars | 2 +- .../template/fr/conference.handlebars | 2 +- .../template/fr/message.handlebars | 2 +- .../cards/services/handlebars.service.spec.ts | 12 ++++++------ .../app/modules/cards/services/handlebars.service.ts | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/template_description.adoc b/src/docs/asciidoc/reference_doc/template_description.adoc index 253f1916c0..58540f83a5 100644 --- a/src/docs/asciidoc/reference_doc/template_description.adoc +++ b/src/docs/asciidoc/reference_doc/template_description.adoc @@ -416,9 +416,9 @@ The output will be:

student3: 9

.... -=== textToHtml +=== keepSpacesAndEndOfLine -Convert a string to HTML by replacing : +Convert a string to a light HTML by replacing : - each new line character with
- spaces with \  when there is at least two consecutive spaces. diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars index d7266c28fe..5e4410506a 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/conference.handlebars @@ -29,5 +29,5 @@ Please consult the full report : -{{textToHtml card.data.message}} +{{keepSpacesAndEndOfLine card.data.message}} \ No newline at end of file diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars index 1a8d60a96b..ce5d2b3155 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/conference.handlebars @@ -30,5 +30,5 @@ Consulter le rapport : {{c

-Informations complémentaires : {{textToHtml card.data.message}} +Informations complémentaires : {{keepSpacesAndEndOfLine card.data.message}}

diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars index 9d3f791b26..64bd9f94c7 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/message.handlebars @@ -14,6 +14,6 @@

-{{textToHtml card.data.message}} +{{keepSpacesAndEndOfLine card.data.message}}

\ No newline at end of file diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts index 8b16166cb0..5d08239abc 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.spec.ts @@ -540,7 +540,7 @@ describe('Handlebars Services', () => { }); }); - it('compile textToHTML for two lines ', (done) => { + it('compile keepSpacesAndEndOfLine for two lines ', (done) => { const templateName = Guid.create().toString(); handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) .subscribe((result) => { @@ -551,11 +551,11 @@ describe('Handlebars Services', () => { expect(calls.length).toEqual(1); calls.forEach(call => { expect(call.request.method).toBe('GET'); - call.flush('{{textToHtml "test\ntest"}}'); + call.flush('{{keepSpacesAndEndOfLine "test\ntest"}}'); }); }); - it('compile textToHTML for two lines with two spaces ', (done) => { + it('compile keepSpacesAndEndOfLine for two lines with two spaces ', (done) => { const templateName = Guid.create().toString(); handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) .subscribe((result) => { @@ -566,10 +566,10 @@ describe('Handlebars Services', () => { expect(calls.length).toEqual(1); calls.forEach(call => { expect(call.request.method).toBe('GET'); - call.flush('{{textToHtml " test\ntest"}}'); + call.flush('{{keepSpacesAndEndOfLine " test\ntest"}}'); }); }); - it('compile textToHTML for five lines and one space ', (done) => { + it('compile keepSpacesAndEndOfLine for five lines and one space ', (done) => { const templateName = Guid.create().toString(); handlebarsService.executeTemplate(templateName, new DetailContext(card, userContext, null)) .subscribe((result) => { @@ -580,7 +580,7 @@ describe('Handlebars Services', () => { expect(calls.length).toEqual(1); calls.forEach(call => { expect(call.request.method).toBe('GET'); - call.flush('{{textToHtml "test\ntest\n\n\nlast line"}}'); + call.flush('{{keepSpacesAndEndOfLine "test\ntest\n\n\nlast line"}}'); }); }); }); diff --git a/ui/main/src/app/modules/cards/services/handlebars.service.ts b/ui/main/src/app/modules/cards/services/handlebars.service.ts index d1025327d5..a9f51e63c4 100644 --- a/ui/main/src/app/modules/cards/services/handlebars.service.ts +++ b/ui/main/src/app/modules/cards/services/handlebars.service.ts @@ -52,7 +52,7 @@ export class HandlebarsService { this.registerToBreakage(); this.registerArrayContains(); this.registerTimes(); - this.registerTextToHtml(); + this.registerKeepSpacesAndEndOfLine(); this.store.select(buildSettingsOrConfigSelector('locale')).subscribe(locale => this.changeLocale(locale)) } @@ -342,8 +342,8 @@ export class HandlebarsService { }); } - private registerTextToHtml() { - Handlebars.registerHelper('textToHtml', function (value, options) { + private registerKeepSpacesAndEndOfLine() { + Handlebars.registerHelper('keepSpacesAndEndOfLine', function (value, options) { let result = Handlebars.escapeExpression(value); result = result.replace(/\n/g, '
'); result = result.replace(/\s\s/g, '  '); From ab85a62ac58a06a7dbc730aab376aeefbf8795c1 Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Mon, 5 Oct 2020 16:31:45 +0200 Subject: [PATCH 32/76] [OC-1147] upgrade bootstrap, awesome-font and displaies modal full screen. Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- ui/main/package.json | 14 +++++++------- .../app/components/login/login.component.spec.ts | 2 +- .../components/navbar/info/info.component.spec.ts | 2 +- .../severity-sort/severity-sort.component.spec.ts | 2 +- .../time-filter/time-filter.component.spec.ts | 2 +- .../type-filter/type-filter.component.spec.ts | 2 +- ui/main/src/app/modules/feed/feed.module.ts | 2 +- .../src/app/modules/usercard/usercard.component.ts | 2 +- ui/main/src/assets/styles/style.css | 2 +- ui/main/src/assets/styles/styles.scss | 4 ++++ 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ui/main/package.json b/ui/main/package.json index 03e536328f..b1b777b9ff 100755 --- a/ui/main/package.json +++ b/ui/main/package.json @@ -1,7 +1,7 @@ { "name": "operatorfabric-ui-main", "version": "0.0.1", - "scripts": { +"scripts": { "ng": "ng", "start": "ng serve", "build": "ng build", @@ -25,14 +25,14 @@ "@angular/platform-browser-dynamic": "^8.2.14", "@angular/router": "^8.2.14", "@fortawesome/angular-fontawesome": "^0.5.0", - "@fortawesome/fontawesome-svg-core": "^1.2.30", - "@fortawesome/free-solid-svg-icons": "^5.14.0", + "@fortawesome/fontawesome-svg-core": "^1.2.31", + "@fortawesome/free-solid-svg-icons": "^5.15.0", "@fullcalendar/angular": "^4.2.2", "@fullcalendar/bootstrap": "^4.2.2", "@fullcalendar/daygrid": "^4.2.2", "@fullcalendar/interaction": "^4.2.2", "@fullcalendar/timegrid": "^4.2.2", - "@ng-bootstrap/ng-bootstrap": "^4.2.2", + "@ng-bootstrap/ng-bootstrap": "5.3.0", "@ngrx/effects": "^7.4.0", "@ngrx/entity": "^7.1.0", "@ngrx/router-store": "^7.1.0", @@ -72,8 +72,9 @@ "@angular/cli": "^8.3.29", "@angular/compiler-cli": "^8.2.14", "@angular/language-service": "^8.2.14", + "@babel/compat-data": "~7.8.0", "@compodoc/compodoc": "^1.1.10", - "@fortawesome/fontawesome-free": "^5.14.0", + "@fortawesome/fontawesome-free": "^5.15.0", "@ngrx/schematics": "^7.1.0", "@types/file-saver": "^2.0.1", "@types/handlebars": "^4.0.40", @@ -99,7 +100,6 @@ "ts-mockito": "^2.6.1", "ts-node": "~7.0.0", "tslint": "~5.11.0", - "typescript": "~3.5.3", - "@babel/compat-data": "~7.8.0" + "typescript": "~3.5.3" } } diff --git a/ui/main/src/app/components/login/login.component.spec.ts b/ui/main/src/app/components/login/login.component.spec.ts index 4cef177790..71779521e5 100644 --- a/ui/main/src/app/components/login/login.component.spec.ts +++ b/ui/main/src/app/components/login/login.component.spec.ts @@ -50,7 +50,7 @@ describe('LoginComponent', () => { TestBed.configureTestingModule({ imports: [ HttpClientTestingModule, - NgbModule.forRoot(), + NgbModule, FormsModule, ReactiveFormsModule, RouterTestingModule, diff --git a/ui/main/src/app/components/navbar/info/info.component.spec.ts b/ui/main/src/app/components/navbar/info/info.component.spec.ts index a6d3476ffc..bd19290700 100644 --- a/ui/main/src/app/components/navbar/info/info.component.spec.ts +++ b/ui/main/src/app/components/navbar/info/info.component.spec.ts @@ -27,7 +27,7 @@ describe('InfoComponent', () => { TestBed.configureTestingModule({ declarations: [ InfoComponent ], imports: [ - NgbModule.forRoot(), + NgbModule, RouterTestingModule, StoreModule.forRoot(appReducer) ], diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/severity-sort/severity-sort.component.spec.ts b/ui/main/src/app/modules/feed/components/card-list/filters/severity-sort/severity-sort.component.spec.ts index 2e3327c247..c858667b25 100644 --- a/ui/main/src/app/modules/feed/components/card-list/filters/severity-sort/severity-sort.component.spec.ts +++ b/ui/main/src/app/modules/feed/components/card-list/filters/severity-sort/severity-sort.component.spec.ts @@ -26,7 +26,7 @@ describe('SeveritySortComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - NgbModule.forRoot(), + NgbModule, StoreModule.forRoot(appReducer, storeConfig), FontAwesomeIconsModule, ], diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/time-filter/time-filter.component.spec.ts b/ui/main/src/app/modules/feed/components/card-list/filters/time-filter/time-filter.component.spec.ts index 6d38f18a46..3674915abf 100644 --- a/ui/main/src/app/modules/feed/components/card-list/filters/time-filter/time-filter.component.spec.ts +++ b/ui/main/src/app/modules/feed/components/card-list/filters/time-filter/time-filter.component.spec.ts @@ -35,7 +35,7 @@ describe('TimeFilterComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - NgbModule.forRoot(), + NgbModule, FormsModule, ReactiveFormsModule, TranslateModule.forRoot(), diff --git a/ui/main/src/app/modules/feed/components/card-list/filters/type-filter/type-filter.component.spec.ts b/ui/main/src/app/modules/feed/components/card-list/filters/type-filter/type-filter.component.spec.ts index feec9f724c..b9bc0b18f0 100644 --- a/ui/main/src/app/modules/feed/components/card-list/filters/type-filter/type-filter.component.spec.ts +++ b/ui/main/src/app/modules/feed/components/card-list/filters/type-filter/type-filter.component.spec.ts @@ -32,7 +32,7 @@ describe('TypeFilterComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - NgbModule.forRoot(), + NgbModule, FormsModule, ReactiveFormsModule, StoreModule.forRoot(appReducer, storeConfig)], diff --git a/ui/main/src/app/modules/feed/feed.module.ts b/ui/main/src/app/modules/feed/feed.module.ts index b2b89ba754..9682a37acb 100644 --- a/ui/main/src/app/modules/feed/feed.module.ts +++ b/ui/main/src/app/modules/feed/feed.module.ts @@ -44,7 +44,7 @@ import { AcknowledgementFilterComponent } from './components/card-list/filters/a ChartCommonModule, ReactiveFormsModule, TranslateModule, - NgbModule.forRoot(), + NgbModule, CardsModule, FeedRoutingModule, FontAwesomeIconsModule, diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 42e6a6672f..faad684667 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -314,7 +314,7 @@ export class UserCardComponent implements OnDestroy, OnInit { const options: NgbModalOptions = { - size: 'lg' + size: 'fullscreen' }; this.errorMessage.display = false; this.modalRef = this.modalService.open(template, options); diff --git a/ui/main/src/assets/styles/style.css b/ui/main/src/assets/styles/style.css index 3cdacb190c..6d217cf3d2 100644 --- a/ui/main/src/assets/styles/style.css +++ b/ui/main/src/assets/styles/style.css @@ -53,4 +53,4 @@ src: local('Roboto'), local('Roboto-Regular'), url('../fonts/roboto-v20-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('../fonts/roboto-v20-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} \ No newline at end of file +} diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index 0b7dd80187..a6bc7643d1 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -70,3 +70,7 @@ html, body { height: 100%; } .mat-select-panel { background-color: var(--opfab-bgcolor); } + +.modal-fullscreen{ + max-width: 100vw * 0.8; +} From 990b95f880245263ff246278f9a4b502cfeee6f7 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 6 Oct 2020 11:28:18 +0200 Subject: [PATCH 33/76] [OC-1149] remove error in card detail Avoid : ERROR TypeError: "cardTemplate is null" in console --- .../components/detail/detail.component.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index 21ceb8e7c5..09ceed1876 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -128,20 +128,22 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC // -------------------------- [OC-980] -------------------------- // adaptTemplateSize() { const cardTemplate = document.getElementById('div-card-template'); - const diffWindow = cardTemplate.getBoundingClientRect(); - const divMsg = document.getElementById('div-detail-msg'); - const divBtn = document.getElementById('div-detail-btn'); + if (!!cardTemplate) { + const diffWindow = cardTemplate.getBoundingClientRect(); + const divMsg = document.getElementById('div-detail-msg'); + const divBtn = document.getElementById('div-detail-btn'); + + let cardTemplateHeight = window.innerHeight - diffWindow.top; + if (divMsg) { + cardTemplateHeight -= divMsg.scrollHeight + 35; + } + if (divBtn) { + cardTemplateHeight -= divBtn.scrollHeight + 50; + } - let cardTemplateHeight = window.innerHeight - diffWindow.top; - if (divMsg) { - cardTemplateHeight -= divMsg.scrollHeight + 35; + cardTemplate.style.maxHeight = `${cardTemplateHeight}px`; + cardTemplate.style.overflowX = 'hidden'; } - if (divBtn) { - cardTemplateHeight -= divBtn.scrollHeight + 50; - } - - cardTemplate.style.maxHeight = `${cardTemplateHeight}px`; - cardTemplate.style.overflowX = 'hidden'; } ngAfterViewChecked() { From 9e911b5b3b82a07fad1598b82485af48dcfa1983 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 6 Oct 2020 17:12:56 +0200 Subject: [PATCH 34/76] [OC-1151] Use new modal for agenda view --- .../modules/calendar/calendar.component.css | 7 ++- .../modules/calendar/calendar.component.html | 13 +++++ .../modules/calendar/calendar.component.ts | 23 ++++----- .../app/modules/calendar/calendar.module.ts | 12 ++--- .../fullscreen-card-view.component.html | 21 -------- .../fullscreen-card-view.component.ts | 49 ------------------- ui/main/src/assets/styles/styles.scss | 3 +- 7 files changed, 35 insertions(+), 93 deletions(-) delete mode 100644 ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.html delete mode 100644 ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.ts diff --git a/ui/main/src/app/modules/calendar/calendar.component.css b/ui/main/src/app/modules/calendar/calendar.component.css index 2c19172f0a..024d96efe9 100644 --- a/ui/main/src/app/modules/calendar/calendar.component.css +++ b/ui/main/src/app/modules/calendar/calendar.component.css @@ -7,7 +7,12 @@ * This file is part of the OperatorFabric project. */ -::ng-deep .mat-dialog-container { + .modal-body{ + background-color: var(--opfab-bgcolor); + color: var(--opfab-textcolor); +} + +.modal-header{ background-color: var(--opfab-bgcolor); color: var(--opfab-textcolor); } \ No newline at end of file diff --git a/ui/main/src/app/modules/calendar/calendar.component.html b/ui/main/src/app/modules/calendar/calendar.component.html index 7e42c50685..10b31840a4 100644 --- a/ui/main/src/app/modules/calendar/calendar.component.html +++ b/ui/main/src/app/modules/calendar/calendar.component.html @@ -31,3 +31,16 @@
+ + +
+ +
+
+
+ +
+
+ \ No newline at end of file diff --git a/ui/main/src/app/modules/calendar/calendar.component.ts b/ui/main/src/app/modules/calendar/calendar.component.ts index a9befaf497..80042e3a58 100644 --- a/ui/main/src/app/modules/calendar/calendar.component.ts +++ b/ui/main/src/app/modules/calendar/calendar.component.ts @@ -24,9 +24,8 @@ import bootstrapPlugin from '@fullcalendar/bootstrap'; import { TranslateService } from '@ngx-translate/core'; import { SelectLightCard } from '@ofActions/light-card.actions'; import { LoadCard } from '@ofActions/card.actions'; -import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog'; -import { FullscreenCardViewComponent } from './cardView/fullscreen-card-view.component'; import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.config.selectors'; +import { NgbModal, NgbModalOptions, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'of-calendar', @@ -36,6 +35,7 @@ import { buildSettingsOrConfigSelector } from '@ofStore/selectors/settings.x.con export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit { @ViewChild('calendar', null) calendarComponent: FullCalendarComponent; // the #calendar in the template + @ViewChild('cardDetail', null) cardDetailTemplate: ElementRef; // the #calendar in the template private unsubscribe$ = new Subject(); calendarVisible = true; @@ -43,10 +43,12 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit { locales = allLocales; themeSystem = 'bootstrap'; calendarEvents: EventInput[] = []; - cardView: MatDialogRef; + modalRef: NgbModalRef; - constructor(private store: Store, private translate: TranslateService, private matDialog: MatDialog, private elRef: ElementRef + constructor(private store: Store, + private translate: TranslateService, + private modalService: NgbModal ) { } ngOnInit() { @@ -120,15 +122,10 @@ export class CalendarComponent implements OnInit, OnDestroy, AfterViewInit { selectCard(info) { this.store.dispatch(new SelectLightCard({ selectedCardId: info.event.id })); this.store.dispatch(new LoadCard({ id: info.event.id })); - const dialogConfig = new MatDialogConfig(); - dialogConfig.hasBackdrop = true; - const h = window.innerHeight - 150; - const w = window.innerWidth - 100; - dialogConfig.width = w + 'px'; - dialogConfig.maxWidth = w + 'px'; - dialogConfig.height = h + 'px'; - dialogConfig.position = { top: '120px' }; - this.cardView = this.matDialog.open(FullscreenCardViewComponent, dialogConfig); + const options: NgbModalOptions = { + size: 'fullscreen' + }; + this.modalRef = this.modalService.open(this.cardDetailTemplate, options); } diff --git a/ui/main/src/app/modules/calendar/calendar.module.ts b/ui/main/src/app/modules/calendar/calendar.module.ts index fd97a34bd8..3fddc3649b 100644 --- a/ui/main/src/app/modules/calendar/calendar.module.ts +++ b/ui/main/src/app/modules/calendar/calendar.module.ts @@ -14,20 +14,16 @@ import {CommonModule} from '@angular/common'; import {CalendarComponent} from './calendar.component'; import {FullCalendarModule } from '@fullcalendar/angular'; import {CardsModule} from '../cards/cards.module'; -import {MatDialogModule } from '@angular/material/dialog'; -import {FullscreenCardViewComponent} from './cardView/fullscreen-card-view.component'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @NgModule({ - declarations: [CalendarComponent, FullscreenCardViewComponent], + declarations: [CalendarComponent], imports: [ CommonModule, FullCalendarModule, - MatDialogModule, - CardsModule - ], - entryComponents: [ - FullscreenCardViewComponent, + CardsModule, + NgbModule ] }) export class CalendarModule { } diff --git a/ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.html b/ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.html deleted file mode 100644 index 1c542a7f42..0000000000 --- a/ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - -
- -
- - \ No newline at end of file diff --git a/ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.ts b/ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.ts deleted file mode 100644 index 29d21d61fa..0000000000 --- a/ui/main/src/app/modules/calendar/cardView/fullscreen-card-view.component.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - - -import { Component, OnInit, OnDestroy} from '@angular/core'; -import {MatDialogRef} from '@angular/material'; -import { Subject } from 'rxjs'; -import { takeUntil, skip } from 'rxjs/operators'; -import { selectCurrentUrl } from '@ofStore/selectors/router.selectors'; -import {AppState} from '@ofStore/index'; -import { Store } from '@ngrx/store'; - - -@Component({ - selector: 'of-calendar-card-view', - templateUrl: './fullscreen-card-view.component.html' -}) -export class FullscreenCardViewComponent implements OnInit, OnDestroy { - - private unsubscribe$ = new Subject(); - - constructor( - private dialogRef: MatDialogRef, - private store: Store) { } - - ngOnInit() { - this.closeWhenClickingOnMenuLink(); - } - - private closeWhenClickingOnMenuLink() { - this.store.select(selectCurrentUrl).pipe(takeUntil(this.unsubscribe$), skip(1)).subscribe( () => this.close()); - } - - ngOnDestroy() { - this.unsubscribe$.next(); - this.unsubscribe$.complete(); - } - - close() { - this.dialogRef.close(); - } -} \ No newline at end of file diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index a6bc7643d1..c46b6e88ed 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -71,6 +71,7 @@ html, body { height: 100%; } background-color: var(--opfab-bgcolor); } +// ngbModal configuration .modal-fullscreen{ - max-width: 100vw * 0.8; + max-width: 100vw * 0.9; } From bf8a68ab9404bab756fbccefe9aa15cb77bc12ab Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Tue, 6 Oct 2020 18:01:06 +0200 Subject: [PATCH 35/76] [OC-1156] explains howto check branch regression Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- src/docs/asciidoc/community/workflow.adoc | 25 +++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/docs/asciidoc/community/workflow.adoc b/src/docs/asciidoc/community/workflow.adoc index 30205d2e63..99599c784f 100644 --- a/src/docs/asciidoc/community/workflow.adoc +++ b/src/docs/asciidoc/community/workflow.adoc @@ -337,13 +337,26 @@ image::feature1_PR_autom_merge_OK.png[] As of today, only developers from the `reviewers` group can merge pull requests into `develop`, but this shouldn't stop anyone interested in the topic of a PR to comment and review it. -[[review_checklist]] -**** -include::{gradle-rootdir}/PULL_REQUEST_TEMPLATE.adoc[tag=review_checklist] -**** +==== Before reviewing the code -If the PR doesn't meet some of these criteria, use the GitHub review process to suggest changes and discuss problems -with the PR author. +===== For front-end check + +====== Create and run Docker images + +Compile and run OperatorFabric docker images is the most effective way to check any regression. + +. Pull the submitted branch on a testing machine; +. Run a `docker-compose` with the `${OF_HOME}/src/main/docker/test-environment/docker-compose.yml` file; +. Create `SNAPSHOT` docker images, from the `${OF_HOME}` directory with the following command: `./gradlew clean dockerTagSNAPSHOT`; +. Stop the `test-environment` docker-compose; +. Go to `${OF_HOME}/config/docker`; +. Run the `./docker-compose.sh` script (or use the `docker-compose.yml` with a `docker-compose` command); + +====== Setup front-end test configuration + +. Go to `${OF_HOME}/src/test/utils/karate`; +. Run the following scripts: `./loadBundle.sh && ./setPerimeterForTest.sh && ./postTestCards.sh`; +. Open the front-end in a browser and look for any regression. === Merging a Pull Request From 77c11c779efe60ad3a712f72287fd9367cf51c51 Mon Sep 17 00:00:00 2001 From: bermaki Date: Tue, 6 Oct 2020 18:24:07 +0200 Subject: [PATCH 36/76] [OC-1109] As A user I want to see the lttd countdown on 'simple' cards so that it will be helpfull when the card is used as a reminder --- .../modules/cards/components/card/card.component.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/main/src/app/modules/cards/components/card/card.component.ts b/ui/main/src/app/modules/cards/components/card/card.component.ts index 50e62b6c51..c51a564c05 100644 --- a/ui/main/src/app/modules/cards/components/card/card.component.ts +++ b/ui/main/src/app/modules/cards/components/card/card.component.ts @@ -1,5 +1,4 @@ /* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * Copyright (c) 2020, RTEi (http://www.rte-international.com) * See AUTHORS.txt * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -94,7 +93,15 @@ export class CardComponent implements OnInit, OnDestroy, DoCheck { public isValidatelttd(): boolean { const entityUser = this.userService.getCurrentUserWithPerimeters().userData.entities[0]; - return !this.isArchivePageType() && this.lightCard.entitiesAllowedToRespond.includes(entityUser); + + if (!this.isArchivePageType()) { + if (this.lightCard.severity === 'ACTION') { + return this.lightCard.entitiesAllowedToRespond.includes(entityUser); + } else { + return true; + } + } + return false; } isTimeToStartCountDown(): boolean { From 5b31cafeb427808960ec0b6192f80cf703765fbc Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Wed, 7 Oct 2020 14:15:59 +0200 Subject: [PATCH 37/76] [OC-1156] Re-introduce review checklist --- src/docs/asciidoc/community/workflow.adoc | 44 +++++++++++++++++------ 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/src/docs/asciidoc/community/workflow.adoc b/src/docs/asciidoc/community/workflow.adoc index 99599c784f..7c086e6393 100644 --- a/src/docs/asciidoc/community/workflow.adoc +++ b/src/docs/asciidoc/community/workflow.adoc @@ -304,11 +304,11 @@ Open file `dummy1.txt`: .dummy1.txt ---- -<<<<<<< HEAD -Some content from feature 1. -======= -Some content that has been changed on develop since Feature 1 branched off. ->>>>>>> develop + <<<<<<< HEAD + Some content from feature 1. + ======= + Some content that has been changed on develop since Feature 1 branched off. + >>>>>>> develop ---- Update the content to reflect the changes that you want to keep: @@ -337,11 +337,35 @@ image::feature1_PR_autom_merge_OK.png[] As of today, only developers from the `reviewers` group can merge pull requests into `develop`, but this shouldn't stop anyone interested in the topic of a PR to comment and review it. -==== Before reviewing the code -===== For front-end check -====== Create and run Docker images +==== Reviewer check list + +* The PR comment contains the text to insert in release note. Otherwise, it should say why this development doesn't need +to be on the release notes. +* Check that Travis build is passing (for both branch and PR) +* Check that the base branch (i.e. the branch into which we want to merge changes) is correct: for feature branches +pull requests, this branch should be `develop`. +* Look through changed files to make sure everything is relevant to the PR (no mistakenly added changes, +no secret information, no malicious changes) and to see if you have remarks on the way things are implemented +* Check that the commit(s) message(s) is(are) relevant and follow conventions ([OC-XXX] ... ) +* If there is more than one commit, is it meaningful or do we need to squash ? +* Meaningful and sufficient unit tests for the backend (80% coverage is the threshold) +* Meaningful unit tests for the frontend (Angular tests can be complex to implement, we should focus on testing complex +logic and not the framework itself) +* Check Sonar analysis on SonarCloud to see if Sonar reports any bugs or code smells on the new code +* API testing via Karate has been updated +* Documentation has been updated (especially if configuration is needed) +* Configuration examples have been updated (both for dev and docker) +* Build and run OpFab locally to see the new feature or bug fix at work. In the case of a new feature, it's also a way +of making sure that the configuration documentation is correct and easily understandable. +* Depending on the scope of the PR , build docker images and test in docker mode +* Check that the copyright header has been updated on the changed files if need be, and in the case of a first-time + contributor, make sure they're added to the AUTHORS.txt file. +* Check dependency added to the project to see if there are compliant with opfab licencing. + + +==== Testing environnement for reviewer Compile and run OperatorFabric docker images is the most effective way to check any regression. @@ -351,13 +375,11 @@ Compile and run OperatorFabric docker images is the most effective way to check . Stop the `test-environment` docker-compose; . Go to `${OF_HOME}/config/docker`; . Run the `./docker-compose.sh` script (or use the `docker-compose.yml` with a `docker-compose` command); - -====== Setup front-end test configuration - . Go to `${OF_HOME}/src/test/utils/karate`; . Run the following scripts: `./loadBundle.sh && ./setPerimeterForTest.sh && ./postTestCards.sh`; . Open the front-end in a browser and look for any regression. + === Merging a Pull Request Once the pull request meets all the criteria from the above check list, you can merge it into the `develop` branch. From 307cd18f2e3fc3c14b9ad3225b0b59ddb0145135 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Wed, 7 Oct 2020 16:54:16 +0200 Subject: [PATCH 38/76] [OC-1155] Optimize loading card from the UI Each time we change period of visiblity on UI, we get all the card of the period from the back even if we already have downloaded previously this period. To avoid that we now memorize the period already loaded and load only new period from the back Signed-off-by: freddidierRTE --- .../CardCustomRepositoryImpl.java | 18 ++++++---- ui/main/src/app/services/card.service.ts | 36 +++++++++++++++++-- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepositoryImpl.java b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepositoryImpl.java index 5bb9397bec..33024fd2cc 100644 --- a/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepositoryImpl.java +++ b/services/core/cards-consultation/src/main/java/org/lfenergy/operatorfabric/cards/consultation/repositories/CardCustomRepositoryImpl.java @@ -96,12 +96,18 @@ private Flux findCards(Instant publishFrom, Instant rangeS private Criteria getCriteriaForRange(Instant rangeStart,Instant rangeEnd) { - if (rangeStart==null) return where(END_DATE_FIELD).lt(rangeEnd); - if (rangeEnd==null) return where(START_DATE_FIELD).gt(rangeStart); - return new Criteria().orOperator(where(START_DATE_FIELD).gte(rangeStart).lte(rangeEnd), - where(END_DATE_FIELD).gte(rangeStart).lte(rangeEnd), - new Criteria().andOperator(where(START_DATE_FIELD).lt(rangeStart), new Criteria() - .orOperator(where(END_DATE_FIELD).is(null), where(END_DATE_FIELD).gt(rangeEnd)))); + if (rangeStart==null) return where(END_DATE_FIELD).lte(rangeEnd); + if (rangeEnd==null) return where(START_DATE_FIELD).gte(rangeStart); + return new Criteria().orOperator( + where(START_DATE_FIELD).gte(rangeStart).lte(rangeEnd), + where(END_DATE_FIELD).gte(rangeStart).lte(rangeEnd), + new Criteria().andOperator( + where(START_DATE_FIELD).lte(rangeStart), + new Criteria().orOperator( + where(END_DATE_FIELD).is(null), + where(END_DATE_FIELD).gte(rangeEnd)) + ) + ); } diff --git a/ui/main/src/app/services/card.service.ts b/ui/main/src/app/services/card.service.ts index 7557c1ad04..cf23a0017b 100644 --- a/ui/main/src/app/services/card.service.ts +++ b/ui/main/src/app/services/card.service.ts @@ -51,6 +51,10 @@ export class CardService { private firstSubscriptionInitDone = false; public initSubscription = new Subject(); + private startOfAlreadyLoadedPeriod: number; + private endOfAlreadyLoadedPeriod: number; + + constructor(private httpClient: HttpClient, private notifyService: NotifyService, private guidService: GuidService, @@ -171,12 +175,38 @@ export class CardService { } - public setSubscriptionDates(rangeStart: number, rangeEnd: number) { + public setSubscriptionDates(start: number, end: number) { + console.log(new Date().toISOString(), 'CardService - Set subscription date', new Date(start), ' -', new Date(end)); + if (!this.startOfAlreadyLoadedPeriod) { // First loading , no card loaded yet + this.askCardsForPeriod(start, end); + return; + } + if ((start < this.startOfAlreadyLoadedPeriod) && (end > this.endOfAlreadyLoadedPeriod)) { + this.askCardsForPeriod(start, end); + return; + } + if (start < this.startOfAlreadyLoadedPeriod) { + this.askCardsForPeriod(start, this.startOfAlreadyLoadedPeriod); + return; + } + if (end > this.endOfAlreadyLoadedPeriod) { + this.askCardsForPeriod(this.endOfAlreadyLoadedPeriod, end); + return; + } + console.log(new Date().toISOString(), 'CardService - Card already loaded for the chosen period'); + } - console.log(new Date().toISOString(), 'CardService - Set subscription date', new Date(rangeStart), ' -', new Date(rangeEnd)); + private askCardsForPeriod(start: number, end: number) { + console.log(new Date().toISOString(), 'CardService - Need to load card for period ' + , new Date(start), ' -', new Date(end)); this.httpClient.post( `${this.cardOperationsUrl}`, - {rangeStart: rangeStart, rangeEnd: rangeEnd}).subscribe(); + { rangeStart: start, rangeEnd: end }).subscribe(result => { + if ((!this.startOfAlreadyLoadedPeriod) || (start < this.startOfAlreadyLoadedPeriod)) + this.startOfAlreadyLoadedPeriod = start; + if ((!this.endOfAlreadyLoadedPeriod) || (end > this.endOfAlreadyLoadedPeriod)) this.endOfAlreadyLoadedPeriod = end; + + }); } From 9325f9735c3e7987ee7a6f68826e00b8a113d7a4 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Wed, 7 Oct 2020 17:45:06 +0200 Subject: [PATCH 39/76] [OC-1109] use enitiesAllowedToRespond instead of card severity + modify documentation Signed-off-by: freddidierRTE --- src/docs/asciidoc/reference_doc/card_structure.adoc | 2 +- src/test/utils/karate/cards/post6CardsSeverity.feature | 2 ++ ui/main/src/app/modules/cards/components/card/card.component.ts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/reference_doc/card_structure.adoc b/src/docs/asciidoc/reference_doc/card_structure.adoc index 2657d6a32c..0556779907 100644 --- a/src/docs/asciidoc/reference_doc/card_structure.adoc +++ b/src/docs/asciidoc/reference_doc/card_structure.adoc @@ -102,7 +102,7 @@ OR ==== Last Time to Decide (`lttd`) -Fixes the moment until when a `response` is possible for the card. After this moment, the response button won't be useable. When lttd time is approaching, a clock is visible on the card in the feed with the residual time. +Fixes the moment until when a `response` is possible for the card. After this moment, the response button won't be useable. When lttd time is approaching, a clock is visible on the card in the feed with the residual time. The lttd time can be set for cards that don't expect any response === Business period diff --git a/src/test/utils/karate/cards/post6CardsSeverity.feature b/src/test/utils/karate/cards/post6CardsSeverity.feature index af0c30eca5..27d536e4e3 100644 --- a/src/test/utils/karate/cards/post6CardsSeverity.feature +++ b/src/test/utils/karate/cards/post6CardsSeverity.feature @@ -253,6 +253,7 @@ And match response.count == 1 function() { startDate = new Date().valueOf() + 2*60*60*1000; + lttdDate = new Date().valueOf() + 60*1000*61; startDateTimeSpans = new Date().valueOf() + 24*60*60*1000; endDateTimeSpans = new Date().valueOf() + 26*60*60*1000; @@ -268,6 +269,7 @@ And match response.count == 1 }, "severity" : "ALARM", "startDate" : startDate, + "lttd" : lttdDate, "timeSpans" : [ {"start" : startDateTimeSpans ,"end" : endDateTimeSpans} ], diff --git a/ui/main/src/app/modules/cards/components/card/card.component.ts b/ui/main/src/app/modules/cards/components/card/card.component.ts index c51a564c05..6a3879e344 100644 --- a/ui/main/src/app/modules/cards/components/card/card.component.ts +++ b/ui/main/src/app/modules/cards/components/card/card.component.ts @@ -95,7 +95,7 @@ export class CardComponent implements OnInit, OnDestroy, DoCheck { const entityUser = this.userService.getCurrentUserWithPerimeters().userData.entities[0]; if (!this.isArchivePageType()) { - if (this.lightCard.severity === 'ACTION') { + if (!!this.lightCard.entitiesAllowedToRespond) { return this.lightCard.entitiesAllowedToRespond.includes(entityUser); } else { return true; From d9f11a1f117f9ec02ace717a23df327a9f8eb114 Mon Sep 17 00:00:00 2001 From: bendaoud Date: Thu, 8 Oct 2020 09:57:10 +0200 Subject: [PATCH 40/76] [OC-1152] : fix bug on port 2002 --- ui/main/src/app/modules/admin/admin.module.ts | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ui/main/src/app/modules/admin/admin.module.ts b/ui/main/src/app/modules/admin/admin.module.ts index d6fc6e547a..d83c7eb19c 100644 --- a/ui/main/src/app/modules/admin/admin.module.ts +++ b/ui/main/src/app/modules/admin/admin.module.ts @@ -9,23 +9,19 @@ import { ErrorHandler, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AdminComponent } from './admin.component'; import { PaginationModule } from 'ngx-bootstrap/pagination'; import { AdminRoutingModule } from './admin-rooting.module'; -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { AppErrorHandler } from 'app/common/error/app-error-handler'; import { OfUsersTableComponent } from './components/ngtable/users/ofuserstable.component'; import { OfGroupsTableComponent } from './components/ngtable/groups/of-groups-table/of-groups-table.component'; import { OfEntitiesTableComponent } from './components/ngtable/entities/of-entities-table/of-entities-table.component'; import { OfTableComponent } from './components/ngtable/oftable/oftable.component'; import { Ng2TableModule } from 'ng2-table'; -import { TranslateHttpLoader } from '@ngx-translate/http-loader'; -import { HttpClient } from '@angular/common/http'; -export function HttpLoaderFactory(http: HttpClient) { - return new TranslateHttpLoader(http); -} + @NgModule({ declarations: [ @@ -41,16 +37,10 @@ export function HttpLoaderFactory(http: HttpClient) { , AdminRoutingModule , PaginationModule.forRoot() , CommonModule - , TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useFactory: HttpLoaderFactory, - deps: [HttpClient] - } - }) + , TranslateModule , Ng2TableModule ], - providers: [ { provide: ErrorHandler, useClass: AppErrorHandler }] + providers: [{ provide: ErrorHandler, useClass: AppErrorHandler }] }) export class AdminModule { } From 0e60b7f5683d6b4406832f29ff6a269f908c1025 Mon Sep 17 00:00:00 2001 From: bendaoud Date: Thu, 8 Oct 2020 10:02:56 +0200 Subject: [PATCH 41/76] [OC-1153] : fix bug conf docker --- config/docker/ngnix.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/docker/ngnix.conf b/config/docker/ngnix.conf index 4d600b7332..5bb178d226 100644 --- a/config/docker/ngnix.conf +++ b/config/docker/ngnix.conf @@ -40,6 +40,10 @@ server { proxy_set_header Host $http_host; proxy_pass http://businessconfig:8080; } + location /users { + proxy_set_header Host $http_host; + proxy_pass http://users:8080/users; + } location ~ "^/users/(.*)" { proxy_set_header Host $http_host; proxy_pass http://users:8080/$1; From 47f94983f6accc74a832ef1fa428e220b0248af8 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Thu, 8 Oct 2020 15:07:58 +0200 Subject: [PATCH 42/76] [OC-1157] Colors modifications for day mode Signed-off-by: freddidierRTE --- .../cards/components/card/card.component.html | 6 +- .../cards/components/card/card.component.scss | 10 +- .../components/detail/detail.component.html | 25 ++--- .../components/detail/detail.component.scss | 18 ++++ .../components/detail/detail.component.ts | 3 +- .../components/details/details.component.html | 6 +- .../components/details/details.component.scss | 14 +++ .../src/app/services/global-style.service.ts | 98 +++++++++++++++++-- ui/main/src/assets/styles/styles.scss | 11 +++ ui/main/src/index.html | 45 +-------- 10 files changed, 167 insertions(+), 69 deletions(-) create mode 100644 ui/main/src/app/modules/cards/components/detail/detail.component.scss diff --git a/ui/main/src/app/modules/cards/components/card/card.component.html b/ui/main/src/app/modules/cards/components/card/card.component.html index c7fbe57f5e..f5e8eaaabb 100644 --- a/ui/main/src/app/modules/cards/components/card/card.component.html +++ b/ui/main/src/app/modules/cards/components/card/card.component.html @@ -8,7 +8,7 @@ -
+
@@ -37,11 +37,11 @@
- +
- +
diff --git a/ui/main/src/app/modules/cards/components/card/card.component.scss b/ui/main/src/app/modules/cards/components/card/card.component.scss index 520cbf6409..dfcaa3c0d9 100644 --- a/ui/main/src/app/modules/cards/components/card/card.component.scss +++ b/ui/main/src/app/modules/cards/components/card/card.component.scss @@ -12,6 +12,13 @@ .light-card-detail { background-color: var(--opfab-lightcard-detail-bgcolor); color: var(--opfab-lightcard-detail-textcolor); + border-color: var(--opfab-lightcard-detail-border-color) +} + + +.light-card-detail-selected { + border-color: var(--opfab-lightcard-detail-selected-border-color); + //#f8f9fa } .card { @@ -39,13 +46,12 @@ .lttd-timeleft{ font-size: small; - color:yellow; + color: var(--opfab-light-card-lttd-timeleft); } .lttd-text{ font-size: small; padding-left : 160px; padding-right: 10px; - color:white; } .lttd-icon{ diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.html b/ui/main/src/app/modules/cards/components/detail/detail.component.html index e68a957e1e..debb4f9e5f 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.html +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.html @@ -9,18 +9,21 @@ -
- - - - - -
response.answers : - {{entity.name}} -
+
+
+

+ + + + + +
response.answers : + {{entity.name}} +
+
+
-
-
    -
  • - {{i18nPrefix+detailC.detail.title.key}} +
      +
    • + {{i18nPrefix+detailC.detail.title.key}}
    diff --git a/ui/main/src/app/modules/cards/components/details/details.component.scss b/ui/main/src/app/modules/cards/components/details/details.component.scss index 1b65e86bfe..15a5e1d519 100644 --- a/ui/main/src/app/modules/cards/components/details/details.component.scss +++ b/ui/main/src/app/modules/cards/components/details/details.component.scss @@ -13,3 +13,17 @@ overflow-x: hidden; overflow-y: auto; } + +.opfab-line-undertab{ + border-color:var(--opfab-card-tab-border-color); +} + +.opfab-tab{ + border-color:var(--opfab-card-tab-border-color); + border-radius: 4px; +} + +.opfab-tab-selected { + color: var(--opfab-card-tab-selected-text-color); + background-color: var(--opfab-card-tab-selected-bgcolor); +} \ No newline at end of file diff --git a/ui/main/src/app/services/global-style.service.ts b/ui/main/src/app/services/global-style.service.ts index 7f0b5a415b..e1fbb1557d 100644 --- a/ui/main/src/app/services/global-style.service.ts +++ b/ui/main/src/app/services/global-style.service.ts @@ -25,19 +25,26 @@ export class GlobalStyleService { private static DAY_STYLE = `:root { --opfab-bgcolor: white; --opfab-text-color: black; --opfab-timeline-bgcolor: white; - --opfab-feedbar-bgcolor:#cccccc; - --opfab-feedbar-icon-color: - black; --opfab-feedbar-icon-hover-color:#212529; + --opfab-feedbar-bgcolor:#aaaaaa; + --opfab-feedbar-icon-color: white; + --opfab-feedbar-icon-hover-color:#212529; --opfab-feedbar-icon-hover-bgcolor:white; --opfab-timeline-text-color: #030303; --opfab-timeline-grid-color: #e4e4e5; - --opfab-timeline-realtimebar-color: #808080; + --opfab-timeline-realtimebar-color: #808080; --opfab-timeline-button-bgcolor: #e5e5e5; --opfab-timeline-button-text-color: #49494a; --opfab-timeline-button-selected-bgcolor: #49494a; --opfab-timeline-button-selected-text-color: #fcfdfd; - --opfab-lightcard-detail-bgcolor: white; + --opfab-lightcard-detail-bgcolor: #f2f2f2; --opfab-lightcard-detail-textcolor: black; + --opfab-lightcard-detail-border-color: #cccccc; + --opfab-lightcard-detail-selected-border-color: #555555; + --opfab-light-card-lttd-timeleft: #ff6600; + --opfab-card-tab-selected-bgcolor: #ffffff; + --opfab-card-tab-selected-text-color: black; + --opfab-card-tab-border-color: #dddddd; + --opfab-card-detail-border-color : #dddddd; --opfab-navbar-color: rgba(0,0,0,.55); --opfab-navbar-color-hover:rgba(0,0,0,.7); --opfab-navbar-color-active:rgba(0,0,0,.9); @@ -53,8 +60,85 @@ export class GlobalStyleService { --opfab-timeline-cardlink-bgcolor-hover: #e2e6ea; --opfab-timeline-cardlink-bordercolor-hover: #dae0e5; }`; - private static NIGHT_STYLE = ":root { --opfab-bgcolor: #343a40; --opfab-text-color: white; --opfab-timeline-bgcolor: #343a40; --opfab-feedbar-bgcolor:#525854; --opfab-feedbar-icon-color: white; --opfab-feedbar-icon-hover-color:#212529; --opfab-feedbar-icon-hover-bgcolor:white; --opfab-timeline-text-color: #f8f9fa; --opfab-timeline-grid-color: #505050; --opfab-timeline-realtimebar-color: #f8f9fa; --opfab-timeline-button-bgcolor: rgb(221, 221, 221); --opfab-timeline-button-text-color: black; --opfab-timeline-button-selected-bgcolor: black; --opfab-timeline-button-selected-text-color: white; --opfab-lightcard-detail-bgcolor: #2e353c; --opfab-lightcard-detail-textcolor: #f8f9fa; --opfab-navbar-color: rgba(255,255,255,.55); --opfab-navbar-color-hover:rgba(255,255,255,.75); --opfab-navbar-color-active:white; --opfab-navbar-toggler-icon: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255,255,255, 0.55)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\"); --opfab-navbar-toggler-border-color: rgba(255,255,255,.1) ; --opfab-navbar-info-block-color: white; --opfab-navbar-menu-link-color: #343a40; --opfab-navbar-menu-link-hover-color: #121416; --opfab-navbar-menu-bgcolor: white; --opfab-navbar-menu-bgcolor-item-active: #007bff; --opfab-navbar-menu-bgcolor-item-hover: #f8f9fa; --opfab-timeline-cardlink: white; --opfab-timeline-cardlink-bgcolor-hover: #23272b; --opfab-timeline-cardlink-bordercolor-hover: #1d2124;}"; - private static LEGACY_STYLE = ":root { --opfab-bgcolor: #343a40; --opfab-text-color: white; --opfab-timeline-bgcolor: #f8f9fa; --opfab-feedbar-bgcolor:#525854; --opfab-feedbar-icon-color: white; --opfab-feedbar-icon-hover-color:white; --opfab-feedbar-icon-hover-bgcolor:#212529; --opfab-timeline-text-color: #030303; --opfab-timeline-grid-color: #e4e4e5; --opfab-timeline-realtimebar-color: #808080; --opfab-timeline-button-bgcolor: #e5e5e5; --opfab-timeline-button-text-color: #49494a; --opfab-timeline-button-selected-bgcolor: #49494a; --opfab-timeline-button-selected-text-color: #fcfdfd; --opfab-lightcard-detail-bgcolor: #2e353c; --opfab-lightcard-detail-textcolor: #f8f9fa; --opfab-navbar-color: rgba(255,255,255,.55); --opfab-navbar-color-hover:rgba(255,255,255,.75); --opfab-navbar-color-active:white; --opfab-navbar-toggler-icon: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255,255,255, 0.55)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\"); --opfab-navbar-toggler-border-color: rgba(255,255,255,.1) ; --opfab-navbar-info-block-color: white; --opfab-navbar-menu-link-color: #343a40; --opfab-navbar-menu-link-hover-color: #121416; --opfab-navbar-menu-bgcolor: white; --opfab-navbar-menu-bgcolor-item-active: #007bff; --opfab-navbar-menu-bgcolor-item-hover: #f8f9fa; --opfab-timeline-cardlink: white; --opfab-timeline-cardlink-bgcolor-hover: #23272b; --opfab-timeline-cardlink-bordercolor-hover: #1d2124;}"; + + private static NIGHT_STYLE = `:root { + --opfab-bgcolor: #343a40; + --opfab-text-color: white; + --opfab-timeline-bgcolor: #343a40; + --opfab-feedbar-bgcolor:#525854; + --opfab-feedbar-icon-color: white; + --opfab-feedbar-icon-hover-color:#212529; + --opfab-feedbar-icon-hover-bgcolor:white; + --opfab-timeline-text-color: #f8f9fa; + --opfab-timeline-grid-color: #505050; + --opfab-timeline-realtimebar-color: #f8f9fa; + --opfab-timeline-button-bgcolor: rgb(221, 221, 221); + --opfab-timeline-button-text-color: black; + --opfab-timeline-button-selected-bgcolor: black; + --opfab-timeline-button-selected-text-color: white; + --opfab-lightcard-detail-bgcolor: #2e353c; + --opfab-lightcard-detail-textcolor: #f8f9fa; + --opfab-lightcard-detail-border-color: #282e35; + --opfab-lightcard-detail-selected-border-color: #f8f9fa; + --opfab-light-card-lttd-timeleft: yellow; + --opfab-card-tab-selected-bgcolor: white; + --opfab-card-tab-selected-text-color: #444444; + --opfab-card-tab-border-color: white; + --opfab-card-detail-border-color : #343a40 ; + --opfab-navbar-color: rgba(255,255,255,.55); + --opfab-navbar-color-hover:rgba(255,255,255,.75); + --opfab-navbar-color-active:white; + --opfab-navbar-toggler-icon: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255,255,255, 0.55)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\"); + --opfab-navbar-toggler-border-color: rgba(255,255,255,.1) ; + --opfab-navbar-info-block-color: white; + --opfab-navbar-menu-link-color: #343a40; + --opfab-navbar-menu-link-hover-color: #121416; + --opfab-navbar-menu-bgcolor: white; + --opfab-navbar-menu-bgcolor-item-active: #007bff; + --opfab-navbar-menu-bgcolor-item-hover: #f8f9fa; + --opfab-timeline-cardlink: white; + --opfab-timeline-cardlink-bgcolor-hover: #23272b; + --opfab-timeline-cardlink-bordercolor-hover: #1d2124;}`; + + + private static LEGACY_STYLE = `:root { + --opfab-bgcolor: #343a40; + --opfab-text-color: white; + --opfab-timeline-bgcolor: #f8f9fa; + --opfab-feedbar-bgcolor:#525854; + --opfab-feedbar-icon-color: white; + --opfab-feedbar-icon-hover-color:white; + --opfab-feedbar-icon-hover-bgcolor:#212529; + --opfab-timeline-text-color: #030303; + --opfab-timeline-grid-color: #e4e4e5; + --opfab-timeline-realtimebar-color: #808080; + --opfab-timeline-button-bgcolor: #e5e5e5; + --opfab-timeline-button-text-color: #49494a; + --opfab-timeline-button-selected-bgcolor: #49494a; + --opfab-timeline-button-selected-text-color: #fcfdfd; + --opfab-lightcard-detail-bgcolor: #2e353c; + --opfab-lightcard-detail-textcolor: #f8f9fa; + --opfab-lightcard-detail-border-color: #282e35; + --opfab-lightcard-detail-selected-border-color: #f8f9fa; + --opfab-light-card-lttd-timeleft: yellow; + --opfab-card-tab-selected-bgcolor: white; + --opfab-card-tab-selected-text-color: #444444; + --opfab-card-tab-border-color: white; + --opfab-card-detail-border-color : #343a40 ; + --opfab-navbar-color: rgba(255,255,255,.55); + --opfab-navbar-color-hover:rgba(255,255,255,.75); + --opfab-navbar-color-active:white; + --opfab-navbar-toggler-icon: url(\"data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255,255,255, 0.55)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e\"); + --opfab-navbar-toggler-border-color: rgba(255,255,255,.1) ; + --opfab-navbar-info-block-color: white; + --opfab-navbar-menu-link-color: #343a40; + --opfab-navbar-menu-link-hover-color: #121416; + --opfab-navbar-menu-bgcolor: white; + --opfab-navbar-menu-bgcolor-item-active: #007bff; + --opfab-navbar-menu-bgcolor-item-hover: #f8f9fa; + --opfab-timeline-cardlink: white; + --opfab-timeline-cardlink-bgcolor-hover: #23272b; + --opfab-timeline-cardlink-bordercolor-hover: #1d2124;}`; constructor(private store: Store) { const len = document.styleSheets.length; diff --git a/ui/main/src/assets/styles/styles.scss b/ui/main/src/assets/styles/styles.scss index c46b6e88ed..9eae4487c6 100644 --- a/ui/main/src/assets/styles/styles.scss +++ b/ui/main/src/assets/styles/styles.scss @@ -75,3 +75,14 @@ html, body { height: 100%; } .modal-fullscreen{ max-width: 100vw * 0.9; } + +// Global colors + +.opfab-colors { + background-color: var(--opfab-bgcolor); + color: var(--opfab-text-color); +} + +.opfab-timeline-bgcolor { + background-color: var(--opfab-timeline-bgcolor); +} diff --git a/ui/main/src/index.html b/ui/main/src/index.html index f88a8689aa..4b4e256203 100644 --- a/ui/main/src/index.html +++ b/ui/main/src/index.html @@ -23,11 +23,11 @@ /** Style parameters is define using css variables --params -The default style is black background and white timeline (historical configuration) +Just two variables are set here , the complete style is set by the navbar.component.ts using global-style.service.ts. -This style can be override by the navbar.component.ts using global-style.service.ts +This two values are used when navbar is not yet loaded -These parameters are place in this file as the style should have a title parameter (it 's not possible to give a name for the style in the angular.json file). +These two parameters are place in this file as the style should have a title parameter (it 's not possible to give a name for the style in the angular.json file). */ @@ -35,45 +35,6 @@ :root { --opfab-bgcolor: #343a40; --opfab-text-color: white; - --opfab-timeline-bgcolor: #f8f9fa; - --opfab-feedbar-bgcolor:#525854; - --opfab-feedbar-icon-color: white; - --opfab-feedbar-icon-hover-color:white; - --opfab-feedbar-icon-hover-bgcolor:#212529; - --opfab-timeline-text-color: #030303; - --opfab-timeline-grid-color: #e4e4e5; - --opfab-timeline-realtimebar-color: #808080; - --opfab-timeline-button-bgcolor: #e5e5e5; - --opfab-timeline-button-text-color: #49494a; - --opfab-timeline-button-selected-bgcolor: #49494a; - --opfab-timeline-button-selected-text-color: #fcfdfd; - --opfab-lightcard-detail-bgcolor: #2e353c; - --opfab-lightcard-detail-textcolor: #f8f9fa; - --opfab-navbar-color: rgba(255,255,255,.55); - --opfab-navbar-color-hover:rgba(255,255,255,.75); - --opfab-navbar-color-active:white; - --opfab-navbar-toggler-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255,255,255, 0.55)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e"); - --opfab-navbar-toggler-border-color: rgba(255,255,255,.1) ; - --opfab-navbar-info-block-color: white; - --opfab-navbar-menu-link-color: #343a40; - --opfab-navbar-menu-link-hover-color: #121416; - --opfab-navbar-menu-bgcolor : white; - --opfab-navbar-menu-bgcolor-item-active : #007bff; - --opfab-navbar-menu-bgcolor-item-hover : #f8f9fa; - --opfab-timeline-cardlink: white; - --opfab-timeline-cardlink-bgcolor-hover: #23272b; - --opfab-timeline-cardlink-bordercolor-hover: #1d2124; - -} - - -.opfab-colors { - background-color: var(--opfab-bgcolor); - color: var(--opfab-text-color); -} - -.opfab-timeline-bgcolor { - background-color: var(--opfab-timeline-bgcolor); } From 35d93c13e7c247887f4af295f88392734876bce6 Mon Sep 17 00:00:00 2001 From: Giovanni Ferrari Date: Mon, 5 Oct 2020 09:10:54 +0200 Subject: [PATCH 43/76] [OC-1117] Remove template and css arrays in bundle defintion. Signed-off-by: Giovanni Ferrari --- .../FreeMessageExample/1/config.json | 6 --- .../FreeMessageExample/2/config.json | 6 --- .../FreeMessageExample/config.json | 6 --- .../businessconfig-storage/TEST/1/config.json | 14 ------ .../businessconfig-storage/TEST/config.json | 14 ------ .../first/0.1/config.json | 7 --- .../businessconfig-storage/first/config.json | 7 --- .../first/v1/config.json | 7 --- .../businessconfig/model/ProcessData.java | 4 -- .../services/ProcessesService.java | 49 +++++-------------- .../src/main/modeling/swagger.yaml | 18 ------- .../test/data/bundles/second/2.0/config.json | 6 --- .../test/data/bundles/second/2.1/config.json | 6 --- .../deletetest/2.1/config.json | 6 --- .../deletetest/config.json | 6 --- .../first/0.1/config.json | 8 --- .../first/0.5/config.json | 8 --- .../businessconfig-storage/first/config.json | 7 --- .../first/v1/config.json | 7 --- src/docs/asciidoc/getting_started/index.adoc | 6 +-- .../reference_doc/process_definition.adoc | 9 ++-- .../reference_doc/response_cards.adoc | 6 --- .../asciidoc/resources/migration_guide.adoc | 28 ----------- .../resources/bundle_api_test/config.json | 2 - .../bundle_api_test_apogee/config.json | 10 ---- .../resources/bundle_api_test_v2/config.json | 2 - .../resources/bundle_test_action/config.json | 6 --- .../karate/businessconfig/security.feature | 27 ++++++++++ .../api/karate/launchAllBusinessconfig.sh | 3 +- .../bundle_defaultProcess/config.json | 16 +----- .../bundle_defaultProcess_V0.1/config.json | 5 -- .../bundle_userCardExamples/config.json | 8 --- .../bundles/bundle_message/config.json | 2 - .../bundles/bundle_message_v2/config.json | 2 - ui/main/src/app/model/processes.model.ts | 4 +- .../app/services/processes.service.spec.ts | 4 +- ui/main/src/tests/helpers.ts | 2 - 37 files changed, 49 insertions(+), 285 deletions(-) create mode 100644 src/test/api/karate/businessconfig/security.feature diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/1/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/1/config.json index 7959709d19..1d168c4d4e 100644 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/1/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/1/config.json @@ -2,12 +2,6 @@ "id": "UserCardExample", "version": "1", "name": "process.label", - "templates": [ - "template1", - "template2" - ], - "csses": [ - ], "states": { "firstState": { "name": "firstState.label", diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/2/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/2/config.json index 32c5ada473..4381688f36 100644 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/2/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/2/config.json @@ -2,12 +2,6 @@ "id": "UserCardExample", "version": "2", "name": "process.label", - "templates": [ - "template1", - "template2" - ], - "csses": [ - ], "states": { "firstState": { "name": "firstState.label", diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/config.json index fbc850f131..6908645c90 100644 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/FreeMessageExample/config.json @@ -2,12 +2,6 @@ "id": "UserCardExample", "version": "2", "name": "process.label", - "templates": [ - "template1", - "template2" - ], - "csses": [ - ], "states": { "firstState": { "name": "firstState.label", diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json index 549cd8b7a1..ed9bf5144e 100755 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/1/config.json @@ -8,20 +8,6 @@ }, "name": "process.label", "defaultLocale": "fr", - "templates": [ - "security", - "unschedulledPeriodicOp", - "operation", - "template1", - "template2" - ], - "csses": [ - "tabs", - "accordions", - "filter", - "operations", - "security" - ], "menuLabel": "menu.label", "menuEntries": [ { diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json index 549cd8b7a1..ed9bf5144e 100755 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/TEST/config.json @@ -8,20 +8,6 @@ }, "name": "process.label", "defaultLocale": "fr", - "templates": [ - "security", - "unschedulledPeriodicOp", - "operation", - "template1", - "template2" - ], - "csses": [ - "tabs", - "accordions", - "filter", - "operations", - "security" - ], "menuLabel": "menu.label", "menuEntries": [ { diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/0.1/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/0.1/config.json index b4edfca084..cdaa60d5a1 100755 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/0.1/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/0.1/config.json @@ -6,13 +6,6 @@ "logging": true, "calendar": true }, - "templates": [ - "template", - "template1" - ], - "csses": [ - "style1" - ], "medias": { "bidon": { "name": "bidon", diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json index cd6bdf6b50..78ec584493 100755 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/config.json @@ -7,16 +7,9 @@ "calendar": true }, "name":"process.label", - "templates": [ - "template1" - ], "menuEntries": [ {"id": "uid test 0","url": "https://opfab.github.io/","label": "menu.first", "linkType": "BOTH"} ], - "csses": [ - "style1", - "style2" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json index cd6bdf6b50..78ec584493 100755 --- a/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json +++ b/services/core/businessconfig/src/main/docker/volume/businessconfig-storage/first/v1/config.json @@ -7,16 +7,9 @@ "calendar": true }, "name":"process.label", - "templates": [ - "template1" - ], "menuEntries": [ {"id": "uid test 0","url": "https://opfab.github.io/","label": "menu.first", "linkType": "BOTH"} ], - "csses": [ - "style1", - "style2" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessData.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessData.java index 5b4ec03348..8a57afd2f6 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessData.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/model/ProcessData.java @@ -35,10 +35,6 @@ public class ProcessData implements Process { private String id; private String name; private String version; - @Singular - private List templates; - @Singular - private List csses; private String menuLabel; @Singular("menuEntryData") @JsonIgnore diff --git a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java index 9df690e272..5eae82e10b 100644 --- a/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java +++ b/services/core/businessconfig/src/main/java/org/lfenergy/operatorfabric/businessconfig/services/ProcessesService.java @@ -228,13 +228,12 @@ public Resource fetchResource(String processId, ResourceTypeEnum type, String ve if (process == null) throw new FileNotFoundException("Unknown version (" + finalVersion + ") for " + processId); - validateResourceParameters(processId, type, name, finalVersion, locale); - String finalName; - if (type == ResourceTypeEnum.I18N) { - finalName = locale; - } else { - finalName = name; - } + + if (type.isLocalized() && locale == null) + throw new FileNotFoundException("Unable to determine resource for undefined locale"); + + String finalName = (type == ResourceTypeEnum.I18N) ? locale : name; + String resourcePath = PATH_PREFIX + storagePath + File.separator + @@ -246,39 +245,13 @@ public Resource fetchResource(String processId, ResourceTypeEnum type, String ve File.separator + (type.isLocalized() && !type.equals(ResourceTypeEnum.I18N) ? (locale + File.separator) : "") + finalName + type.getSuffix(); - log.info("loading resource: {}", resourcePath); - return this.resourceLoader.getResource(resourcePath); - } - /** - * Validates resource existence - * - * @param processId process id - * @param type resource type - * @param name resource name - * @param version module version - * @param locale resource locale - * @throws FileNotFoundException when resource does not exist - */ - private void validateResourceParameters(String processId, ResourceTypeEnum type, String name, String version, - String locale) throws FileNotFoundException { - Process process = completeCache.get(processId,version); - if (type.isLocalized() && locale == null) - throw new FileNotFoundException("Unable to determine resource for undefined locale"); - switch (type) { - case CSS: - if (!process.getCsses().contains(name)) - throw new FileNotFoundException("Unknown css resource for " + processId + ":" + version); - break; - case I18N: - break; - case TEMPLATE: - if (!process.getTemplates().contains(name)) - throw new FileNotFoundException("Unknown template " + name + " for " + processId + ":" + version); - break; - default: - throw new FileNotFoundException("Unable to find resource for unknown resource type"); + log.info("loading resource: {}", resourcePath); + Resource resource = this.resourceLoader.getResource(resourcePath); + if (!resource.exists()) { + throw new FileNotFoundException("Unknown " + type + " resource for " + processId + ":" + version); } + return resource; } /** diff --git a/services/core/businessconfig/src/main/modeling/swagger.yaml b/services/core/businessconfig/src/main/modeling/swagger.yaml index d422a45c56..102e5554d4 100755 --- a/services/core/businessconfig/src/main/modeling/swagger.yaml +++ b/services/core/businessconfig/src/main/modeling/swagger.yaml @@ -414,18 +414,6 @@ definitions: version: type: string description: Process configuration version - templates: - type: array - description: List of templates name (without extension) - example: '"emergency", "security"' - items: - type: string - csses: - type: array - description: List of css file names (without extension) - example: tab-style - items: - type: string states: type: object additionalProperties: @@ -480,12 +468,6 @@ definitions: id: some_business_process name: some_business_process.label version: v1.0 - templates: - - "emergency" - - "info" - csses: - - "tab-style" - - "content-style" menuLabel: some_business_process.menu.label menuEntries: - id: website diff --git a/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json b/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json index c014577730..0613c9b9d0 100755 --- a/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json +++ b/services/core/businessconfig/src/test/data/bundles/second/2.0/config.json @@ -2,12 +2,6 @@ "id": "second", "name": "process.title", "version": "2.0", - "templates": [ - "template" - ], - "csses": [ - "dastyle" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json b/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json index 2073bdb220..225fe319ff 100755 --- a/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json +++ b/services/core/businessconfig/src/test/data/bundles/second/2.1/config.json @@ -2,12 +2,6 @@ "id": "second", "name": "process.title", "version": "2.1", - "templates": [ - "template" - ], - "csses": [ - "dastyle","nostyle" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/2.1/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/2.1/config.json index 5aca970b7e..a392da5506 100755 --- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/2.1/config.json +++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/2.1/config.json @@ -1,12 +1,6 @@ { "id": "deletetest", "version": "2.1", - "templates": [ - "template" - ], - "csses": [ - "dastyle","nostyle" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/config.json index 5aca970b7e..a392da5506 100755 --- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/config.json +++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/deletetest/config.json @@ -1,12 +1,6 @@ { "id": "deletetest", "version": "2.1", - "templates": [ - "template" - ], - "csses": [ - "dastyle","nostyle" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.1/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.1/config.json index 2ce7fcb616..d43397497e 100755 --- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.1/config.json +++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.1/config.json @@ -1,14 +1,6 @@ { "id": "first", "version": "0.1", - "templates": [ - "template", - "template1", - "templateIO" - ], - "csses": [ - "style1" - ], "medias": { "bidon": { "name": "bidon", diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.5/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.5/config.json index 35a136d7f5..bfa288b279 100755 --- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.5/config.json +++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/0.5/config.json @@ -1,14 +1,6 @@ { "id": "first", "version": "0.5", - "templates": [ - "template", - "template0.5", - "templateIO" - ], - "csses": [ - "style0.5" - ], "medias": { "bidon": { "name": "bidon", diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json index a38518dbdb..186a356c8a 100755 --- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json +++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/config.json @@ -1,13 +1,6 @@ { "id": "first", "version": "v1", - "templates": [ - "template1" - ], - "csses": [ - "style1", - "style2" - ], "locales": [ "fr", "en" diff --git a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/v1/config.json b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/v1/config.json index aeb2af5759..22616ac5f7 100755 --- a/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/v1/config.json +++ b/services/core/businessconfig/src/test/docker/volume/businessconfig-storage/first/v1/config.json @@ -2,13 +2,6 @@ "id": "first", "version": "v1", "defaultLocale": "fr", - "templates": [ - "template1" - ], - "csses": [ - "style1", - "style2" - ], "locales": [ "fr", "en" diff --git a/src/docs/asciidoc/getting_started/index.adoc b/src/docs/asciidoc/getting_started/index.adoc index 2edad760bb..83ece864b2 100644 --- a/src/docs/asciidoc/getting_started/index.adoc +++ b/src/docs/asciidoc/getting_started/index.adoc @@ -196,8 +196,6 @@ The global configuration is defined in config.json : { "id":"defaultProcess", "version":"2", - "templates":["template"], - "csses":["style"], "states":{ "messageState" : { "details" : [{ @@ -261,7 +259,7 @@ You should received the following JSON in response, describing your bundle. [source,JSON] ---- -{"statesData":{"messageState":{"detailsData":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"responseData":null,"acknowledgementAllowed":null,"color":null,"name":null,"details":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"response":null,"acknowledgmentAllowed":null}},"id":"defaultProcess","name":null,"version":"2","templates":["template"],"csses":["style"],"menuLabel":null,"states":{"messageState":{"detailsData":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"responseData":null,"acknowledgementAllowed":null,"color":null,"name":null,"details":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"response":null,"acknowledgmentAllowed":null}},"menuEntries":null} +{"statesData":{"messageState":{"detailsData":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"responseData":null,"acknowledgementAllowed":null,"color":null,"name":null,"details":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"response":null,"acknowledgmentAllowed":null}},"id":"defaultProcess","name":null,"version":"2","menuLabel":null,"states":{"messageState":{"detailsData":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"responseData":null,"acknowledgementAllowed":null,"color":null,"name":null,"details":[{"title":{"key":"defaultProcess.title","parameters":null},"titleStyle":null,"templateName":"template","styles":["style"]}],"response":null,"acknowledgmentAllowed":null}},"menuEntries":null} ---- ==== Send a card @@ -319,8 +317,6 @@ of the bundle: { "id":"criticalSituation", "version":"1", - "templates":["criticalSituationTemplate","endCriticalSituationTemplate"], - "csses":["style"], "states":{ "criticalSituation-begin" : { "details" : [{ diff --git a/src/docs/asciidoc/reference_doc/process_definition.adoc b/src/docs/asciidoc/reference_doc/process_definition.adoc index 3bac873b51..ff3db05f07 100644 --- a/src/docs/asciidoc/reference_doc/process_definition.adoc +++ b/src/docs/asciidoc/reference_doc/process_definition.adoc @@ -64,7 +64,6 @@ include::../../../../services/core/businessconfig/src/main/docker/volume/busines - version: enable the correct display, even the old ones as all versions are stored by the server. Your *card* has a version field that will be matched to businessconfig configuration for correct rendering ; - states : list the available states; actions and templates are associated to states, in the same way is the possibility of making the cards enabled for being acknowledged by user; -- css file template list as `csses`; - menuLabel in the main bar menu as `i18nLabelKey`: optional, used if the businessconfig service add one or several entry in the OperatorFabric main menu bar, see the ifdef::single-page-doc[<>] @@ -291,7 +290,10 @@ As above, all parts of files irrelevant for our example are symbolised by a `… .... { … - "csses":["bundleTest"] + "states" : { + "state1" : { + … + "styles":["bundleTest"] … } .... @@ -359,9 +361,6 @@ These command line should return a `200 http status` response with the details "id":"BUNDLE_TEST" "name": "BUNDLE_TEST", "version": "1", - "csses": [ - "bundleTest" - ], "i18nLabelKey": "businessconfig-name-in-menu-bar", "menuEntries": [ { diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index c41cd376df..9d7b14631c 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -53,12 +53,6 @@ A card can have a response only if it's in a process/state that is configured fo "id": "defaultProcess", "name": "Test", "version": "1", - "templates": [ - "question" - ], - "csses": [ - "style" - ], "states": { "questionState": { "name": "question.title", diff --git a/src/docs/asciidoc/resources/migration_guide.adoc b/src/docs/asciidoc/resources/migration_guide.adoc index 103080a79a..b7aceb0c5d 100644 --- a/src/docs/asciidoc/resources/migration_guide.adoc +++ b/src/docs/asciidoc/resources/migration_guide.adoc @@ -85,20 +85,6 @@ Here is an example of a simple config.json file: "name": "TEST", "version": "1", "defaultLocale": "fr", - "templates": [ - "security", - "unschedulledPeriodicOp", - "operation", - "template1", - "template2" - ], - "csses": [ - "tabs", - "accordions", - "filter", - "operations", - "security" - ], "menuEntries": [ {"id": "uid test 0","url": "https://opfab.github.io/","label": "menu.first"}, {"id": "uid test 1","url": "https://www.la-rache.com","label": "menu.second"} @@ -131,20 +117,6 @@ Here is an example of a simple config.json file: "version": "1", "name": "process.label", "defaultLocale": "fr", - "templates": [ - "security", - "unschedulledPeriodicOp", - "operation", - "template1", - "template2" - ], - "csses": [ - "tabs", - "accordions", - "filter", - "operations", - "security" - ], "menuLabel": "menu.label", "menuEntries": [ {"id": "uid test 0","url": "https://opfab.github.io/","label": "menu.first"}, diff --git a/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json b/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json index ce8a9cd680..316c052fa0 100644 --- a/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json +++ b/src/test/api/karate/businessconfig/resources/bundle_api_test/config.json @@ -6,8 +6,6 @@ "logging": true, "calendar": true }, - "templates":["template"], - "csses":["style"], "states":{ "messageState" : { "details" : [{ diff --git a/src/test/api/karate/businessconfig/resources/bundle_api_test_apogee/config.json b/src/test/api/karate/businessconfig/resources/bundle_api_test_apogee/config.json index 5d1a10d705..b1baec5184 100644 --- a/src/test/api/karate/businessconfig/resources/bundle_api_test_apogee/config.json +++ b/src/test/api/karate/businessconfig/resources/bundle_api_test_apogee/config.json @@ -6,16 +6,6 @@ "fr", "en" ], - "templates": [ - "template1", - "template-tab1", - "template-tab2", - "template-tab3", - "template-tab4", - "template-tab5", - "template-tab6" - ], - "csses": ["apogee-sea"], "i18nLabelKey": "businessconfig.label", "states": { "APOGEESEA": { diff --git a/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json b/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json index e26a709760..fee4199b3f 100644 --- a/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json +++ b/src/test/api/karate/businessconfig/resources/bundle_api_test_v2/config.json @@ -6,8 +6,6 @@ "logging": true, "calendar": true }, - "templates":["template"], - "csses":["style"], "states":{ "messageState" : { "details" : [{ diff --git a/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json b/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json index 2a738e9485..e42a817a9f 100755 --- a/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json +++ b/src/test/api/karate/businessconfig/resources/bundle_test_action/config.json @@ -2,12 +2,6 @@ "id": "processAction", "version": "1", "defaultLocale": "fr", - "templates": [ - "template1", - "long-card" - ], - "csses": [ - ], "menuEntries": [ ], "states": { diff --git a/src/test/api/karate/businessconfig/security.feature b/src/test/api/karate/businessconfig/security.feature new file mode 100644 index 0000000000..d291642a0e --- /dev/null +++ b/src/test/api/karate/businessconfig/security.feature @@ -0,0 +1,27 @@ +Feature: Security + + Background: + #Getting token for admin and tso1-operator user calling getToken.feature + * def signInAsTSO = call read('../common/getToken.feature') { username: 'tso1-operator'} + * def authTokenAsTSO = signInAsTSO.authToken + * def process = 'api_test' + * def templateName = 'template' + * def wrongTemplateName = '..%2Ftemplate' + * def templateVersion = 2 + * def templateLanguage = 'en' + + +Scenario: Check template name with forbidden characters + + # Check template +Given url opfabUrl + '/businessconfig/processes/'+ process +'/templates/' + templateName + '?locale=' + templateLanguage + '&version='+ templateVersion +And header Authorization = 'Bearer ' + authTokenAsTSO +When method GET +Then status 200 + + # Check template +Given url opfabUrl + '/businessconfig/processes/'+ process +'/templates/' + wrongTemplateName + '?locale=' + templateLanguage + '&version='+ templateVersion +And header Authorization = 'Bearer ' + authTokenAsTSO +When method GET +Then status 401 +And print response diff --git a/src/test/api/karate/launchAllBusinessconfig.sh b/src/test/api/karate/launchAllBusinessconfig.sh index e4b9c4d331..ee1579b641 100755 --- a/src/test/api/karate/launchAllBusinessconfig.sh +++ b/src/test/api/karate/launchAllBusinessconfig.sh @@ -28,4 +28,5 @@ java -jar karate.jar \ businessconfig/getBusinessconfig.feature \ businessconfig/getBusinessconfigTemplate.feature \ businessconfig/getProcessGroups.feature \ - businessconfig/uploadProcessGroupsFile.feature + businessconfig/uploadProcessGroupsFile.feature \ + businessconfig/security.feature diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json index 6d0a174525..dd37f0e168 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess/config.json @@ -7,21 +7,7 @@ "logging": true, "calendar": true }, - "templates": [ - "template", - "chart", - "chart-line", - "process", - "question", - "contingencies", - "response", - "usercard_message", - "usercard_process" - ], - "csses": [ - "style", - "contingencies" - ], "menuLabel": "menu.label", + "menuLabel": "menu.label", "menuEntries": [ { "id": "uid test 0", diff --git a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json index 1fc611de68..26c47b0ca3 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_defaultProcess_V0.1/config.json @@ -2,11 +2,6 @@ "id": "defaultProcess", "name": "Test api", "version": "0.1", - "templates": [ - "template" - ], - "csses": [ - ], "states": { "messageState": { "name": "defaultProcess.title", diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json index b8ebd199ad..33d61b5180 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/config.json @@ -7,14 +7,6 @@ "logging": true, "calendar": true }, - "templates": [ - "message", - "usercard_message", - "conference", - "usercard_conference" - ], - "csses": [ - ], "states": { "messageState": { "name": "message.title", diff --git a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json index 862abd506f..befa7fe825 100755 --- a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json +++ b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message/config.json @@ -1,8 +1,6 @@ { "id":"message-publisher", "version":"1", - "templates":["template"], - "csses":["style"], "states":{ "messageState" : { "details" : [{ diff --git a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json index 99215adf52..13765f110a 100644 --- a/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json +++ b/src/test/utils/karate/operatorfabric-getting-started/resources/bundles/bundle_message_v2/config.json @@ -1,8 +1,6 @@ { "id":"message-publisher", "version":"2", - "templates":["template"], - "csses":["style"], "states":{ "messageState" : { "details" : [{ diff --git a/ui/main/src/app/model/processes.model.ts b/ui/main/src/app/model/processes.model.ts index 7fa1cc021b..53f0710937 100644 --- a/ui/main/src/app/model/processes.model.ts +++ b/ui/main/src/app/model/processes.model.ts @@ -18,8 +18,6 @@ export class Process { readonly id: string, readonly version: string, readonly name?: string, - readonly templates?: string[], - readonly csses?: string[], readonly locales?: string[], readonly menuLabel?: string, readonly menuEntries?: MenuEntry[], @@ -38,7 +36,7 @@ export class Process { } export const unfouundProcess: Process = new Process('', '', 'process.not-found', - [], [], [], '', [], null, null); + [], '', [], null, null); export class MenuEntry { diff --git a/ui/main/src/app/services/processes.service.spec.ts b/ui/main/src/app/services/processes.service.spec.ts index d00f7394a4..53dd671446 100644 --- a/ui/main/src/app/services/processes.service.spec.ts +++ b/ui/main/src/app/services/processes.service.spec.ts @@ -108,12 +108,12 @@ describe('Processes Services', () => { expect(calls.length).toEqual(1); calls[0].flush([ new Process( - 'process1', '1', 'process1.label', [], [], [], 'process1.menu.label', + 'process1', '1', 'process1.label', [], 'process1.menu.label', [new MenuEntry('id1', 'label1', 'link1', MenuEntryLinkTypeEnum.BOTH), new MenuEntry('id2', 'label2', 'link2', MenuEntryLinkTypeEnum.BOTH)] ), new Process( - 'process2', '1', 'process2.label', [], [], [], 'process2.menu.label', + 'process2', '1', 'process2.label', [], 'process2.menu.label', [new MenuEntry('id3', 'label3', 'link3', MenuEntryLinkTypeEnum.BOTH)] ) ]); diff --git a/ui/main/src/tests/helpers.ts b/ui/main/src/tests/helpers.ts index e1e942c0ca..a41adbae65 100644 --- a/ui/main/src/tests/helpers.ts +++ b/ui/main/src/tests/helpers.ts @@ -95,8 +95,6 @@ export function getOneRandomProcess(processTemplate?:any): Process { processTemplate.id?processTemplate.id:getRandomAlphanumericValue(3,10), processTemplate.version?processTemplate.version:getRandomAlphanumericValue(3,10), processTemplate.name?processTemplate.name:getRandomAlphanumericValue(3,10), - processTemplate.templates?processTemplate.templates:undefined, - processTemplate.csses?processTemplate.csses:undefined, processTemplate.locales?processTemplate.locales:undefined, processTemplate.menuLabel?processTemplate.menuLabel:undefined, processTemplate.menuEntries?processTemplate.menuEntries:entries, From 0e6ee204b46dc318647076b342f52c1f75dfead7 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Fri, 9 Oct 2020 11:53:15 +0200 Subject: [PATCH 44/76] [OC-1158] Add the option to view usercard in agenda Signed-off-by: freddidierRTE --- .../template/en/usercard_conference.handlebars | 3 ++- .../template/fr/usercard_conference.handlebars | 3 ++- ui/main/src/app/model/card.model.ts | 10 +++++++++- ui/main/src/app/modules/usercard/usercard.component.ts | 6 +++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars index bf137aaa92..b8e09a8f18 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/en/usercard_conference.handlebars @@ -67,7 +67,8 @@ }; return { valid: true, - card: card + card: card, + viewCardInAgenda: true }; } diff --git a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars index 8607b45c35..cfac44c3be 100644 --- a/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars +++ b/src/test/utils/karate/businessconfig/resources/bundle_userCardExamples/template/fr/usercard_conference.handlebars @@ -67,7 +67,8 @@ }; return { valid: true, - card: card + card: card, + viewCardInAgenda: true }; } diff --git a/ui/main/src/app/model/card.model.ts b/ui/main/src/app/model/card.model.ts index 5ab345d449..845b41b3e4 100644 --- a/ui/main/src/app/model/card.model.ts +++ b/ui/main/src/app/model/card.model.ts @@ -37,7 +37,8 @@ export class Card { readonly externalRecipients?: string[], readonly entitiesAllowedToRespond?: string[], readonly recipient?: Recipient, - readonly parentCardUid?: string + readonly parentCardUid?: string, + readonly timeSpans?: TimeSpan[] ) { } } @@ -77,6 +78,13 @@ export class CardData { ) {} } +export class TimeSpan { + constructor( + readonly start: number, + readonly end?: number + ) { } +} + export function fromCardToLightCard(card: Card): LightCard { return new LightCard(card.uid, card.id, card.publisher, card.processVersion, card.publishDate, card.startDate , card.endDate, card.severity, card.hasBeenAcknowledged, card.hasBeenRead, card.processInstanceId diff --git a/ui/main/src/app/modules/usercard/usercard.component.ts b/ui/main/src/app/modules/usercard/usercard.component.ts index 41a01eefb2..c398c1612f 100644 --- a/ui/main/src/app/modules/usercard/usercard.component.ts +++ b/ui/main/src/app/modules/usercard/usercard.component.ts @@ -18,7 +18,7 @@ import { I18n } from '@ofModel/i18n.model'; import { Subject } from 'rxjs'; import { Process } from '@ofModel/processes.model'; import { TimeService } from '@ofServices/time.service'; -import { Severity } from '@ofModel/light-card.model'; +import { Severity, TimeSpan } from '@ofModel/light-card.model'; import { Guid } from 'guid-typescript'; import { NgbModal, NgbModalOptions } from '@ng-bootstrap/ng-bootstrap'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'; @@ -293,6 +293,9 @@ export class UserCardComponent implements OnDestroy, OnInit { const title = (!!specificInformation.card.title) ? specificInformation.card.title : 'UNDEFINED'; const summary = (!!specificInformation.card.summary) ? specificInformation.card.summary : 'UNDEFINED'; + let timeSpans = {}; + if (!!specificInformation.viewCardInAgenda) timeSpans = [new TimeSpan(startDate , endDate )]; + const generatedId = Guid.create().toString(); @@ -314,6 +317,7 @@ export class UserCardComponent implements OnDestroy, OnInit { externalRecipients: null, title: title, summary: summary, + timeSpans : timeSpans, data: specificInformation.card.data, } as Card; From 5a21fe31658174b59464f5ea6f40c59820edd989 Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Tue, 6 Oct 2020 11:27:45 +0200 Subject: [PATCH 45/76] [OC-1092] Delete a card from the UI --- .../controllers/CardController.java | 31 ++- .../services/CardProcessingService.java | 48 +++- .../services/CardRepositoryService.java | 4 +- .../src/main/modeling/swagger.yaml | 4 +- ...ontrollerProcessAcknowledgementShould.java | 1 + .../controllers/CardControllerShould.java | 13 + .../CardControllerUserCardShould.java | 64 +++++ .../repositories/CardRepositoryForTest.java | 2 + .../services/CardProcessServiceShould.java | 131 +++++++++ .../api/karate/cards/deleteUserCard.feature | 256 ++++++++++++++++++ src/test/api/karate/launchAllCards.sh | 3 +- ui/main/src/app/model/card.model.ts | 5 +- .../components/detail/detail.component.html | 43 ++- .../components/detail/detail.component.scss | 15 + .../components/detail/detail.component.ts | 98 ++++++- ui/main/src/app/services/card.service.ts | 6 + ui/main/src/assets/i18n/en.json | 12 +- ui/main/src/assets/i18n/fr.json | 12 +- 18 files changed, 723 insertions(+), 25 deletions(-) create mode 100644 services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerUserCardShould.java create mode 100644 src/test/api/karate/cards/deleteUserCard.feature diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java index a1815638f6..8029fd22e8 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardController.java @@ -15,6 +15,7 @@ import org.lfenergy.operatorfabric.cards.publication.model.CardPublicationData; import org.lfenergy.operatorfabric.cards.publication.model.PublisherTypeEnum; import org.lfenergy.operatorfabric.cards.publication.services.CardProcessingService; +import org.lfenergy.operatorfabric.cards.publication.services.CardRepositoryService; import org.lfenergy.operatorfabric.springtools.configuration.oauth.OpFabJwtAuthenticationToken; import org.lfenergy.operatorfabric.users.model.CurrentUserWithPerimeters; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,8 @@ public class CardController { @Autowired private CardProcessingService cardProcessingService; + @Autowired + private CardRepositoryService cardRepositoryService; /** @@ -62,13 +65,35 @@ public class CardController { card.setPublisherType(PublisherTypeEnum.ENTITY); return card; }), user); + } + + @DeleteMapping("/userCard/{id}") + @ResponseStatus(HttpStatus.OK) + public Mono deleteUserCard(@PathVariable String id, ServerHttpResponse response, Principal principal) { + + OpFabJwtAuthenticationToken jwtPrincipal = (OpFabJwtAuthenticationToken) principal; + CurrentUserWithPerimeters user = (CurrentUserWithPerimeters) jwtPrincipal.getPrincipal(); + + try { + Optional deletedCard = cardProcessingService.deleteUserCard(id, user); + return Mono.just(deletedCard).doOnNext(dc -> { + if (!dc.isPresent()) { + response.setStatusCode(HttpStatus.NOT_FOUND); + } + }).then(); + } + catch (Exception e) { + return Mono.just(Mono.empty()).doOnNext(dc -> + response.setStatusCode(HttpStatus.FORBIDDEN) + ).then(); + } } - @DeleteMapping("/{processInstanceId}") + @DeleteMapping("/{id}") @ResponseStatus(HttpStatus.OK) - public Mono deleteCards(@PathVariable String processInstanceId, ServerHttpResponse response) { - Optional deletedCard = cardProcessingService.deleteCard(processInstanceId); + public Mono deleteCards(@PathVariable String id, ServerHttpResponse response) { + Optional deletedCard = cardProcessingService.deleteCard(id); return Mono.just(deletedCard).doOnNext(dc -> { if (!dc.isPresent()) { response.setStatusCode(HttpStatus.NOT_FOUND); diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java index ad773c8fa0..b27a555775 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessingService.java @@ -17,11 +17,17 @@ import org.lfenergy.operatorfabric.cards.publication.model.ArchivedCardPublicationData; import org.lfenergy.operatorfabric.cards.publication.model.CardCreationReportData; import org.lfenergy.operatorfabric.cards.publication.model.CardPublicationData; +import org.lfenergy.operatorfabric.cards.publication.model.PublisherTypeEnum; import org.lfenergy.operatorfabric.cards.publication.services.clients.impl.ExternalAppClientImpl; import org.lfenergy.operatorfabric.cards.publication.services.processors.UserCardProcessor; +import org.lfenergy.operatorfabric.springtools.error.model.ApiError; +import org.lfenergy.operatorfabric.springtools.error.model.ApiErrorException; +import org.lfenergy.operatorfabric.users.model.ComputedPerimeter; import org.lfenergy.operatorfabric.users.model.CurrentUserWithPerimeters; +import org.lfenergy.operatorfabric.users.model.RightsEnum; import org.lfenergy.operatorfabric.users.model.User; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import reactor.core.publisher.Flux; @@ -231,8 +237,27 @@ public void deleteCards(List cardPublicationData) { cardPublicationData.forEach(x->deleteCard(x.getId())); } - public Optional deleteCard(String processInstanceId) { - CardPublicationData cardToDelete = cardRepositoryService.findCardById(processInstanceId); + public Optional deleteCard(String id) { + CardPublicationData cardToDelete = cardRepositoryService.findCardById(id); + return deleteCard0(cardToDelete); + } + + public Optional deleteUserCard(String id, CurrentUserWithPerimeters user) { + CardPublicationData cardToDelete = cardRepositoryService.findCardById(id); + if (cardToDelete == null) + return Optional.empty(); + if (isUserAllowedToDeleteThisCard(cardToDelete, user)){ + return deleteCard0(cardToDelete); + } + else { + throw new ApiErrorException(ApiError.builder() + .status(HttpStatus.FORBIDDEN) + .message("User not allowed to delete this card") + .build()); + } + } + + public Optional deleteCard0(CardPublicationData cardToDelete) { Optional deletedCard = Optional.ofNullable(cardToDelete); if (null != cardToDelete) { cardNotificationService.notifyOneCard(cardToDelete, CardOperationTypeEnum.DELETE); @@ -245,6 +270,25 @@ public Optional deleteCard(String processInstanceId) { return deletedCard; } + /* 1st check : card.publisherType == ENTITY + 2nd check : the card has been sent by an entity of the user connected + 3rd check : the user has the Write access to the process/state of the card */ + public boolean isUserAllowedToDeleteThisCard(CardPublicationData card, CurrentUserWithPerimeters user) { + List perimetersOfTheUserList = user.getComputedPerimeters(); + List entitiesOfTheUserList = user.getUserData().getEntities(); + + if ((card.getPublisherType() == PublisherTypeEnum.ENTITY) && + (entitiesOfTheUserList.contains(card.getPublisher()))){ + + for (ComputedPerimeter perimeter : perimetersOfTheUserList) { + if ((perimeter.getProcess().equals(card.getProcess())) && + (perimeter.getState().equals(card.getState())) && + ((perimeter.getRights() == RightsEnum.WRITE) || (perimeter.getRights() == RightsEnum.RECEIVEANDWRITE))) + return true; + } + } + return false; + } public Mono processUserAcknowledgement(Mono cardUid, User user) { return cardUid.map(uid -> cardRepositoryService.addUserAck(user, uid)); diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardRepositoryService.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardRepositoryService.java index 2779c5a2e5..9f0c349ff5 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardRepositoryService.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/CardRepositoryService.java @@ -59,14 +59,14 @@ public void deleteCard(CardPublicationData cardToDelete) { - public CardPublicationData findCardById(String processInstanceId) { + public CardPublicationData findCardById(String id) { /** * Uses a projection instead the default 'findById' method. This projection * excludes data which can be unpredictably huge depending on publisher needs. */ Query findCardByIdWithoutDataField = new Query(); findCardByIdWithoutDataField.fields().exclude("data"); - findCardByIdWithoutDataField.addCriteria(Criteria.where("Id").is(processInstanceId)); + findCardByIdWithoutDataField.addCriteria(Criteria.where("Id").is(id)); return this.template.findOne(findCardByIdWithoutDataField, CardPublicationData.class); } diff --git a/services/core/cards-publication/src/main/modeling/swagger.yaml b/services/core/cards-publication/src/main/modeling/swagger.yaml index 6a9d6ae873..e1b3b587a9 100755 --- a/services/core/cards-publication/src/main/modeling/swagger.yaml +++ b/services/core/cards-publication/src/main/modeling/swagger.yaml @@ -908,8 +908,8 @@ paths: tags: - cards - deletion - summary: delete current card - description: delete current card for process id + summary: delete card + description: delete a card responses: '200': description: OK diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerProcessAcknowledgementShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerProcessAcknowledgementShould.java index 304a6e1d68..bd649dd015 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerProcessAcknowledgementShould.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerProcessAcknowledgementShould.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.lfenergy.operatorfabric.cards.publication.CardPublicationApplication; import org.lfenergy.operatorfabric.cards.publication.model.CardPublicationData; +import org.lfenergy.operatorfabric.cards.publication.model.PublisherTypeEnum; import org.lfenergy.operatorfabric.cards.publication.services.CardProcessingService; import org.lfenergy.operatorfabric.springtools.configuration.test.WithMockOpFabUser; import org.springframework.beans.factory.annotation.Autowired; diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerShould.java index 646a13f331..ea67f39cd7 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerShould.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerShould.java @@ -133,6 +133,19 @@ void keepTheCardRepository_Untouched_when_ARandomId_isGiven() { } + @Test + void deleteUserCardWithUnauthenticatedUser() throws Exception { + + EasyRandom randomGenerator = instantiateEasyRandom(); + + int numberOfCards = 1; + List cardsInRepository = instantiateCardPublicationData(randomGenerator, numberOfCards); + cardRepository.saveAll(cardsInRepository).subscribe(); + + String existingId = cardsInRepository.get(0).getId(); + + webTestClient.delete().uri("/cards/userCard/" + existingId).exchange().expectStatus().isUnauthorized(); + } } diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerUserCardShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerUserCardShould.java new file mode 100644 index 0000000000..20e6506bf7 --- /dev/null +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/controllers/CardControllerUserCardShould.java @@ -0,0 +1,64 @@ +package org.lfenergy.operatorfabric.cards.publication.controllers; + +import lombok.extern.slf4j.Slf4j; +import org.assertj.core.api.Assertions; +import org.jeasy.random.EasyRandom; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.TestInstance.Lifecycle; +import org.junit.jupiter.api.extension.ExtendWith; +import org.lfenergy.operatorfabric.cards.publication.CardPublicationApplication; +import org.lfenergy.operatorfabric.cards.publication.model.CardPublicationData; +import org.lfenergy.operatorfabric.cards.publication.model.PublisherTypeEnum; +import org.lfenergy.operatorfabric.springtools.configuration.test.WithMockOpFabUser; +import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import reactor.test.StepVerifier; + +import java.util.List; + +@ExtendWith(SpringExtension.class) +@SpringBootTest(classes = CardPublicationApplication.class) +@AutoConfigureWebTestClient(timeout = "100000")//100 seconds +@ActiveProfiles(profiles = { "native", "test" }) +@Slf4j +@Tag("end-to-end") +@Tag("mongo") +@WithMockOpFabUser(login = "someUser", roles = { "AROLE" }) +@TestInstance(Lifecycle.PER_CLASS) +public class CardControllerUserCardShould extends CardControllerShouldBase { + + String cardUid; + int cardNumber = 2; + + + @BeforeAll + void setup() { + EasyRandom randomGenerator = instantiateEasyRandom(); + List cardsInRepository = instantiateCardPublicationData(randomGenerator, cardNumber); + cardUid = cardsInRepository.get(0).getUid(); + StepVerifier.create(cardRepository.saveAll(cardsInRepository)) + .expectNextCount(cardNumber).verifyComplete(); + } + + @AfterAll + void clean() { + cardRepository.deleteAll().subscribe(); + } + + @Test + void deleteNonExistingUserCard() throws Exception { + String cardId = "NotExistingCardId"; + CardPublicationData card = cardRepository.findById(cardId).block(); + Assertions.assertThat(card).isNull(); + webTestClient.delete().uri("/cards/userCard/" + cardId).exchange().expectStatus().isNotFound().expectBody().isEmpty(); + } + + @Test + void deleteUserCardWithForbiddenError() throws Exception { + CardPublicationData card = cardRepository.findByUid(cardUid).block(); + Assertions.assertThat(card.getPublisherType()).isNotEqualTo(PublisherTypeEnum.ENTITY); + webTestClient.delete().uri("/cards/userCard/" + card.getId()).exchange().expectStatus().isForbidden().expectBody().isEmpty(); + } +} diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/repositories/CardRepositoryForTest.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/repositories/CardRepositoryForTest.java index c81afa6723..623635f08d 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/repositories/CardRepositoryForTest.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/repositories/CardRepositoryForTest.java @@ -26,4 +26,6 @@ public interface CardRepositoryForTest extends ReactiveMongoRepository findByProcessInstanceId(String processInstanceId); public Mono findByUid(String Uid); + + public Mono findById(String id); } diff --git a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java index 2b820e711a..6222e83f6b 100644 --- a/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java +++ b/services/core/cards-publication/src/test/java/org/lfenergy/operatorfabric/cards/publication/services/CardProcessServiceShould.java @@ -141,11 +141,21 @@ public CardProcessServiceShould() { currentUserWithPerimeters = new CurrentUserWithPerimeters(); currentUserWithPerimeters.setUserData(user); ComputedPerimeter c1 = new ComputedPerimeter(); + ComputedPerimeter c2 = new ComputedPerimeter(); + ComputedPerimeter c3 = new ComputedPerimeter(); c1.setProcess("PROCESS_CARD_USER") ; c1.setState("STATE1"); c1.setRights(RightsEnum.RECEIVEANDWRITE); + c2.setProcess("PROCESS_CARD_USER") ; + c2.setState("STATE2"); + c2.setRights(RightsEnum.RECEIVE); + c3.setProcess("PROCESS_CARD_USER") ; + c3.setState("STATE3"); + c3.setRights(RightsEnum.WRITE); List list=new ArrayList(); list.add(c1); + list.add(c2); + list.add(c3); currentUserWithPerimeters.setComputedPerimeters(list); } @@ -755,4 +765,125 @@ void validate_noParentCardUid_processOk() { cardProcessingService.validate(card); } + + @Test + void isUserAllowedToDeleteThisCard() { + CardPublicationData cardExternal1 = CardPublicationData.builder() //false because publisherType not ENTITY + .publisher("PUBLISHER_1") + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("process1") + .state("state1") + .build(); + + CardPublicationData cardExternal2 = CardPublicationData.builder() //false because publisherType not ENTITY + .publisher("entity2") + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("process1") + .state("state1") + .build(); + + CardPublicationData cardFromAnEntity1 = CardPublicationData.builder() // false because publisher not an entity of the user + .publisher("entity3") + .publisherType(PublisherTypeEnum.ENTITY) + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("process1") + .state("state1") + .build(); + + CardPublicationData cardFromAnEntity2 = CardPublicationData.builder() // false because not process/state in the perimeter of the user + .publisher("entity2") + .publisherType(PublisherTypeEnum.ENTITY) + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("PROCESS_NOT_IN_PERIMETER") + .state("STATE_NOT_IN_PERIMETER") + .build(); + + CardPublicationData cardFromAnEntity3 = CardPublicationData.builder() // false because not write access for the user + .publisher("entity2") + .publisherType(PublisherTypeEnum.ENTITY) + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("PROCESS_CARD_USER") + .state("STATE2") + .build(); + + CardPublicationData cardFromAnEntity4 = CardPublicationData.builder() // true + .publisher("entity2") + .publisherType(PublisherTypeEnum.ENTITY) + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("PROCESS_CARD_USER") + .state("STATE1") + .build(); + + CardPublicationData cardFromAnEntity5 = CardPublicationData.builder() // true + .publisher("entity2") + .publisherType(PublisherTypeEnum.ENTITY) + .processVersion("O") + .process("PROCESS_1") + .processInstanceId("PROCESS_1") + .severity(SeverityEnum.ALARM) + .title(I18nPublicationData.builder().key("title").build()) + .summary(I18nPublicationData.builder().key("summary").build()) + .startDate(Instant.now()) + .timeSpan(TimeSpanPublicationData.builder() + .start(Instant.ofEpochMilli(123l)).build()) + .process("PROCESS_CARD_USER") + .state("STATE3") + .build(); + + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardExternal1, currentUserWithPerimeters)).isFalse(); + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardExternal2, currentUserWithPerimeters)).isFalse(); + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity1, currentUserWithPerimeters)).isFalse(); + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity2, currentUserWithPerimeters)).isFalse(); + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity3, currentUserWithPerimeters)).isFalse(); + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity4, currentUserWithPerimeters)).isTrue(); + assertThat(cardProcessingService.isUserAllowedToDeleteThisCard(cardFromAnEntity5, currentUserWithPerimeters)).isTrue(); + } } diff --git a/src/test/api/karate/cards/deleteUserCard.feature b/src/test/api/karate/cards/deleteUserCard.feature new file mode 100644 index 0000000000..de0046d2f8 --- /dev/null +++ b/src/test/api/karate/cards/deleteUserCard.feature @@ -0,0 +1,256 @@ +Feature: deleteUserCards tests + + Background: + #Getting token for admin and tso1-operator user calling getToken.feature + * def signIn = call read('../common/getToken.feature') { username: 'admin'} + * def authToken = signIn.authToken + * def signInAsTSO = call read('../common/getToken.feature') { username: 'tso1-operator'} + * def authTokenAsTSO = signInAsTSO.authToken + + * def groupKarate = +""" +{ + "id" : "groupKarateDeleteUserCards", + "name" : "groupKarate name", + "description" : "groupKarate description" +} +""" + + + * def perimeter = +""" +{ + "id" : "perimeterKarateDeleteUserCards", + "process" : "processDeleteUserCard", + "stateRights" : [ + { + "state" : "state1", + "right" : "ReceiveAndWrite" + }, + { + "state" : "state2", + "right" : "Receive" + } + ] +} +""" + + * def tso1operatorArray = +""" +[ "tso1-operator" +] +""" + * def groupArray = +""" +[ "groupKarateDeleteUserCards" +] +""" + + Scenario: Create groupKarate + Given url opfabUrl + 'users/groups' + And header Authorization = 'Bearer ' + authToken + And request groupKarate + When method post + Then match response.description == groupKarate.description + And match response.name == groupKarate.name + And match response.id == groupKarate.id + + + Scenario: Add tso1-operator to groupKarate + Given url opfabUrl + 'users/groups/' + groupKarate.id + '/users' + And header Authorization = 'Bearer ' + authToken + And request tso1operatorArray + When method patch + And status 200 + + + Scenario: Create perimeter + Given url opfabUrl + 'users/perimeters' + And header Authorization = 'Bearer ' + authToken + And request perimeter + When method post + + + Scenario: Put groupKarate for perimeter + Given url opfabUrl + 'users/perimeters/'+ perimeter.id + '/groups' + And header Authorization = 'Bearer ' + authToken + And request groupArray + When method put + Then status 200 + + + Scenario: Push user card + * def cardForDeleteOk = +""" +{ + "publisher" : "ENTITY1", + "publisherType" : "ENTITY", + "processVersion" : "1", + "process" :"processDeleteUserCard", + "processInstanceId" : "processDeleteUserCardOk", + "state": "state1", + "severity" : "INFORMATION", + "startDate" : 1553186770681, + "summary" : {"key" : "defaultProcess.summary"}, + "title" : {"key" : "defaultProcess.title"}, + "data" : {"message":"a message"}, + "entityRecipients" : ["ENTITY1"] +} +""" + + * def cardForDeleteForbidden1 = +""" +{ + "publisher" : "publisherKarate", + "publisherType" : "EXTERNAL", + "processVersion" : "1", + "process" :"processDeleteUserCard", + "processInstanceId" : "processDeleteUserCardForbidden1", + "state": "state1", + "severity" : "INFORMATION", + "startDate" : 1553186770681, + "summary" : {"key" : "defaultProcess.summary"}, + "title" : {"key" : "defaultProcess.title"}, + "data" : {"message":"a message"}, + "entityRecipients" : ["ENTITY1"] +} +""" + + * def cardForDeleteForbidden2 = +""" +{ + "publisher" : "ENTITY2", + "publisherType" : "ENTITY", + "processVersion" : "1", + "process" :"processDeleteUserCard", + "processInstanceId" : "processDeleteUserCardForbidden2", + "state": "state1", + "severity" : "INFORMATION", + "startDate" : 1553186770681, + "summary" : {"key" : "defaultProcess.summary"}, + "title" : {"key" : "defaultProcess.title"}, + "data" : {"message":"a message"}, + "entityRecipients" : ["ENTITY1"] +} +""" + + * def cardForDeleteForbidden3 = +""" +{ + "publisher" : "ENTITY1", + "publisherType" : "ENTITY", + "processVersion" : "1", + "process" :"processDeleteUserCard", + "processInstanceId" : "processDeleteUserCardForbidden3", + "state": "state2", + "severity" : "INFORMATION", + "startDate" : 1553186770681, + "summary" : {"key" : "defaultProcess.summary"}, + "title" : {"key" : "defaultProcess.title"}, + "data" : {"message":"a message"}, + "entityRecipients" : ["ENTITY1"] +} +""" + +# Push cardForDeleteOk + Given url opfabPublishCardUrl + 'cards' + And request cardForDeleteOk + When method post + Then status 201 + And match response.count == 1 + + +# Push cardForDeleteForbidden1 + Given url opfabPublishCardUrl + 'cards' + And request cardForDeleteForbidden1 + When method post + Then status 201 + And match response.count == 1 + +# Push cardForDeleteForbidden2 + Given url opfabPublishCardUrl + 'cards' + And request cardForDeleteForbidden2 + When method post + Then status 201 + And match response.count == 1 + + +# Push cardForDeleteForbidden3 + Given url opfabPublishCardUrl + 'cards' + And request cardForDeleteForbidden3 + When method post + Then status 201 + And match response.count == 1 + + + Scenario: delete user card with no authentication, expected response 401 + Given url opfabPublishCardUrl + 'cards/userCard/processDeleteUserCard.processDeleteUserCardOk' + When method delete + Then status 401 + + + Scenario: Delete user card for a non-existent card, expected response 404 + Given url opfabPublishCardUrl + 'cards/userCard/NonExistentUserCard' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method delete + Then status 404 + + + Scenario: delete card not published by an entity, expected response 403 + Given url opfabPublishCardUrl + 'cards/userCard/processDeleteUserCard.processDeleteUserCardForbidden1' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method delete + Then status 403 + + + Scenario: delete user card not published by an entity of the user, expected response 403 + Given url opfabPublishCardUrl + 'cards/userCard/processDeleteUserCard.processDeleteUserCardForbidden2' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method delete + Then status 403 + + + Scenario: delete user card with no Write access for process/state for the user, expected response 403 + Given url opfabPublishCardUrl + 'cards/userCard/processDeleteUserCard.processDeleteUserCardForbidden3' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method delete + Then status 403 + + + Scenario: delete user card, expected response 200 + Given url opfabPublishCardUrl + 'cards/userCard/processDeleteUserCard.processDeleteUserCardOk' + And header Authorization = 'Bearer ' + authTokenAsTSO + When method delete + Then status 200 + + + Scenario: delete the perimeter previously created + Given url opfabUrl + 'users/perimeters/' + perimeter.id + And header Authorization = 'Bearer ' + authToken + When method delete + Then status 200 + + + Scenario: delete the group previously created + Given url opfabUrl + 'users/groups/' + groupKarate.id + And header Authorization = 'Bearer ' + authToken + When method delete + Then status 200 + + + Scenario: delete cardForDeleteForbidden1 + Given url opfabPublishCardUrl + 'cards/processDeleteUserCard.processDeleteUserCardForbidden1' + When method delete + Then status 200 + + + Scenario: delete cardForDeleteForbidden2 + Given url opfabPublishCardUrl + 'cards/processDeleteUserCard.processDeleteUserCardForbidden2' + When method delete + Then status 200 + + + Scenario: delete cardForDeleteForbidden3 + Given url opfabPublishCardUrl + 'cards/processDeleteUserCard.processDeleteUserCardForbidden3' + When method delete + Then status 200 \ No newline at end of file diff --git a/src/test/api/karate/launchAllCards.sh b/src/test/api/karate/launchAllCards.sh index afe38723a6..5bc993e7cc 100755 --- a/src/test/api/karate/launchAllCards.sh +++ b/src/test/api/karate/launchAllCards.sh @@ -27,7 +27,8 @@ java -jar karate.jar \ cards/post1CardThenUpdateThenDelete.feature \ cards/getArchive.feature \ cards/post2CardsGroupRouting.feature \ - cards/post1BigCards.feature + cards/post1BigCards.feature \ + cards/deleteUserCard.feature #cards/updateCardSubscription.feature #cards/delete3BigCards.feature diff --git a/ui/main/src/app/model/card.model.ts b/ui/main/src/app/model/card.model.ts index 5ab345d449..0b65925036 100644 --- a/ui/main/src/app/model/card.model.ts +++ b/ui/main/src/app/model/card.model.ts @@ -9,7 +9,7 @@ -import {LightCard, Severity} from '@ofModel/light-card.model'; +import {LightCard, PublisherType, Severity} from '@ofModel/light-card.model'; import {I18n} from '@ofModel/i18n.model'; export class Card { @@ -37,7 +37,8 @@ export class Card { readonly externalRecipients?: string[], readonly entitiesAllowedToRespond?: string[], readonly recipient?: Recipient, - readonly parentCardUid?: string + readonly parentCardUid?: string, + readonly publisherType?: PublisherType | string ) { } } diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.html b/ui/main/src/app/modules/cards/components/detail/detail.component.html index debb4f9e5f..04b552a2ee 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.html +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.html @@ -38,7 +38,48 @@ + + +
    -
\ No newline at end of file + + +
+

userCard.deleteCard.doYouReallyWant

+ +
+
+ + +
+ + + +
+

userCard.deleteCard.cardDeletedWithNoError

+ +
+
+ +
+ + + +
+

userCard.deleteCard.error.impossibleToDeleteCard

+ +
+
+ +
+ +
diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.scss b/ui/main/src/app/modules/cards/components/detail/detail.component.scss index f5d16036fa..2219ef504b 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.scss +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.scss @@ -16,3 +16,18 @@ border-top-width: 0px; border-radius : 5px; } + +.modal-body{ + background-color: var(--opfab-lightcard-detail-bgcolor); + color: var(--opfab-lightcard-detail-textcolor); +} + + +.modal-header{ + background-color: var(--opfab-lightcard-detail-bgcolor); + color: var(--opfab-lightcard-detail-textcolor); +} + +.btn{ + color: var(--opfab-lightcard-detail-textcolor); +} diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index 86136aea8a..56fe7d46ce 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -8,7 +8,17 @@ */ -import { AfterViewChecked, DoCheck, Component, ElementRef, Input, OnChanges, OnDestroy, OnInit } from '@angular/core'; +import { + AfterViewChecked, + DoCheck, + Component, + ElementRef, + Input, + OnChanges, + OnDestroy, + OnInit, + ViewChild, TemplateRef +} from '@angular/core'; import { Card, Detail } from '@ofModel/card.model'; import { ProcessesService } from '@ofServices/processes.service'; import { HandlebarsService } from '../../services/handlebars.service'; @@ -33,6 +43,8 @@ import { UpdateALightCard } from '@ofStore/actions/light-card.actions'; import { UserService } from '@ofServices/user.service'; import { EntitiesService } from '@ofServices/entities.service'; import { Entity } from '@ofModel/entity.model'; +import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; +import {NgbModalRef} from "@ng-bootstrap/ng-bootstrap/modal/modal-ref"; declare const templateGateway: any; @@ -94,10 +106,13 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC @Input() user: User; @Input() currentPath: string; + @ViewChild('cardDeletedWithNoErrorPopup', null) cardDeletedWithNoErrorPopupRef: TemplateRef; + @ViewChild('impossibleToDeleteCardPopup', null) impossibleToDeleteCardPopupRef: TemplateRef; + public active = false; public isActionEnabled = false; public lttdExpiredIsTrue: boolean; - + public isDeleteCardAllowed = false; unsubscribe$: Subject = new Subject(); readonly hrefsOfCssLink = new Array(); @@ -109,11 +124,20 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC private _acknowledgementAllowed: boolean; message: Message = {display: false, text: undefined, color: undefined}; - constructor(private element: ElementRef, private businessconfigService: ProcessesService, - private handlebars: HandlebarsService, private sanitizer: DomSanitizer, - private store: Store, private cardService: CardService, - private _appService: AppService, private userService: UserService, - private entitiesService: EntitiesService) { + modalRef: NgbModalRef; + + public displayDeleteResult = false; + + constructor(private element: ElementRef, + private businessconfigService: ProcessesService, + private handlebars: HandlebarsService, + private sanitizer: DomSanitizer, + private store: Store, + private cardService: CardService, + private _appService: AppService, + private userService: UserService, + private entitiesService: EntitiesService, + private modalService: NgbModal) { this.store.select(selectAuthenticationState).subscribe(authState => { this._userContext = new UserContext( @@ -126,6 +150,10 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC this.reloadTemplateWhenGlobalStyleChange(); } + open(content) { + this.modalRef = this.modalService.open(content); + } + // -------------------------- [OC-980] -------------------------- // adaptTemplateSize() { const cardTemplate = document.getElementById('div-card-template'); @@ -254,6 +282,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC id: null, publishDate: null, publisher: this.user.entities[0], + publisherType: 'ENTITY', processVersion: this.card.processVersion, process: this.card.process, processInstanceId: `${this.card.processInstanceId}_${this.user.entities[0]}`, @@ -372,6 +401,7 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC this.initializeHrefsOfCssLink(); this.initializeHandlebarsTemplates(); this.markAsReadIfNecessary(); + this.setIsDeleteCardAllowed(); this.message = {display: false, text: undefined, color: undefined}; if (this._responseData != null && this._responseData !== undefined) { this.setEntitiesToRespond(); @@ -394,7 +424,11 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } private setIsActionEnabled() { - this.isActionEnabled = (this.isUserInEntityAllowedToRespond() && this.doesTheUserHavePermissionToRespond()); + this.isActionEnabled = (this.isUserInEntityAllowedToRespond() && this.doesTheUserHavePermissionToRespond()); + } + + private setIsDeleteCardAllowed() { + this.isDeleteCardAllowed = this.doesTheUserHavePermissionToDeleteCard(); } private isUserInEntityAllowedToRespond(): boolean { @@ -416,6 +450,27 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC return permission; } + /* 1st check : card.publisherType == ENTITY + 2nd check : the card has been sent by an entity of the user connected + 3rd check : the user has the Write access to the process/state of the card */ + private doesTheUserHavePermissionToDeleteCard(): boolean { + let permission = false; + const userWithPerimeters = this.userService.getCurrentUserWithPerimeters(); + + if ((this.card.publisherType === 'ENTITY') && (userWithPerimeters.userData.entities.includes(this.card.publisher))) { + userWithPerimeters.computedPerimeters.forEach(perim => { + if ((perim.process === this.card.process) && + (perim.state === this.card.state) + && (this.compareRightAction(perim.rights, RightsEnum.Write) + || this.compareRightAction(perim.rights, RightsEnum.ReceiveAndWrite))) { + permission = true; + return true; + } + }); + } + return permission; + } + private compareRightAction(userRights: RightsEnum, rightsAction: RightsEnum): boolean { return (userRight(userRights) - userRight(rightsAction)) === 0; } @@ -488,6 +543,33 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } } + confirmDeleteCard(): void { + this.cardService.deleteCard(this.card) + .subscribe( + resp => { + const status = resp.status; + + this.modalRef.close(); + if (status === 200) { + this.closeDetails(); + this.open(this.cardDeletedWithNoErrorPopupRef); + } else { + console.log('Impossible to delete card , error status from service : ', status); + this.open(this.impossibleToDeleteCardPopupRef); + } + }, + err => { + console.error('Error when deleting card :', err); + this.modalRef.close(); + this.open(this.impossibleToDeleteCardPopupRef); + } + ); + } + + declineDeleteCard(): void { + this.modalRef.dismiss(); + } + ngOnDestroy() { this.unsubscribe$.next(); this.unsubscribe$.complete(); diff --git a/ui/main/src/app/services/card.service.ts b/ui/main/src/app/services/card.service.ts index 7557c1ad04..958a194a36 100644 --- a/ui/main/src/app/services/card.service.ts +++ b/ui/main/src/app/services/card.service.ts @@ -47,6 +47,7 @@ export class CardService { readonly cardsPubUrl: string; readonly userAckUrl: string; readonly userCardReadUrl: string; + readonly userCardUrl: string; private lastHeardBeatDate: number; private firstSubscriptionInitDone = false; public initSubscription = new Subject(); @@ -64,6 +65,7 @@ export class CardService { this.cardsPubUrl = `${environment.urls.cardspub}/cards`; this.userAckUrl = `${environment.urls.cardspub}/cards/userAcknowledgement`; this.userCardReadUrl = `${environment.urls.cardspub}/cards/userCardRead`; + this.userCardUrl = `${environment.urls.cardspub}/cards/userCard`; } loadCard(id: string): Observable { @@ -209,6 +211,10 @@ export class CardService { return this.httpClient.delete(`${this.userAckUrl}/${card.uid}`, {observe: 'response'}); } + deleteCard(card: Card): Observable> { + return this.httpClient.delete(`${this.userCardUrl}/${card.id}`, {observe: 'response'}); + } + postUserCardRead(card: Card): Observable> { return this.httpClient.post(`${this.userCardReadUrl}/${card.uid}`, null, {observe: 'response'}); } diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 826766096d..7381e2dd2c 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -144,7 +144,8 @@ "button": { "ok": "OK", "cancel": "Cancel", - "reset": "Reset" + "reset": "Reset", + "delete": "Delete" }, "userCard": { "title": "Create a new card", @@ -177,7 +178,14 @@ "processInstanceId": "Id", "state": "State", "send-another-one": "Send another Card", - "cardSendWithNoError": "Card sent" + "cardSendWithNoError": "Card sent", + "deleteCard": { + "doYouReallyWant": "Do you really want to delete this card ?", + "cardDeletedWithNoError": "Card deleted", + "error": { + "impossibleToDeleteCard": "Impossible to delete card for technical reasons" + } + } }, "response": { "btnTitle": "VALIDATE ANSWERS", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index 88ee1d5cb6..b415801c16 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -144,7 +144,8 @@ "button": { "ok": "OK", "cancel": "Annuler", - "reset": "Effacer" + "reset": "Effacer", + "delete": "Supprimer" }, "userCard": { "title": "Création d'une nouvelle carte", @@ -177,7 +178,14 @@ "processInstanceId": "Identifiant", "state": "État", "send-another-one": "Envoyer une autre carte", - "cardSendWithNoError": "Carte envoyée" + "cardSendWithNoError": "Carte envoyée", + "deleteCard": { + "doYouReallyWant": "Voulez-vous vraiment supprimer cette carte ?", + "cardDeletedWithNoError": "Carte supprimée", + "error": { + "impossibleToDeleteCard": "Impossible de supprimer la carte pour des raisons techniques" + } + } }, "response": { "btnTitle": "VALIDER REPONSES", From 94ccf73755f1f7b1f278612e0a06e3a04fff9e9c Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Mon, 12 Oct 2020 15:44:29 +0200 Subject: [PATCH 46/76] [OC-1169] Set business log as optionnal --- config/dev/common-dev.yml | 1 + config/docker/common-docker.yml | 2 +- .../cards-publication/src/test/resources/application.yml | 1 + .../asciidoc/deployment/configuration/configuration.adoc | 8 ++++++++ .../aop/process/UserAcknowledgmentActionTraceAspect.java | 6 ++++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/config/dev/common-dev.yml b/config/dev/common-dev.yml index 1aa67d4480..f7a9424c8a 100644 --- a/config/dev/common-dev.yml +++ b/config/dev/common-dev.yml @@ -27,6 +27,7 @@ operatorfabric: jwt: login-claim: preferred_username expire-claim: exp + businessLogActivated: true ### activate the folLowing if you want the entities of the user to came from the token and not mongoDB ### entitiesIdClaim is the name of the field in the token diff --git a/config/docker/common-docker.yml b/config/docker/common-docker.yml index 424c81b4c5..61ce860cab 100644 --- a/config/docker/common-docker.yml +++ b/config/docker/common-docker.yml @@ -28,4 +28,4 @@ operatorfabric: jwt: login-claim: preferred_username expire-claim: exp - + businessLogActivated: false diff --git a/services/core/cards-publication/src/test/resources/application.yml b/services/core/cards-publication/src/test/resources/application.yml index beea1e8024..37de1a2666 100755 --- a/services/core/cards-publication/src/test/resources/application.yml +++ b/services/core/cards-publication/src/test/resources/application.yml @@ -16,6 +16,7 @@ operatorfabric: card-notification.window: size: 100 timeout: 1000 + businessLogActivated: true externalRecipients-url: "{\ api_test_externalRecipient1: \"http://localhost:8090/test\", \ api_test_externalRecipient2: \"http://localhost:8090/test\" \ diff --git a/src/docs/asciidoc/deployment/configuration/configuration.adoc b/src/docs/asciidoc/deployment/configuration/configuration.adoc index f5270ac3ae..4a7283a206 100644 --- a/src/docs/asciidoc/deployment/configuration/configuration.adoc +++ b/src/docs/asciidoc/deployment/configuration/configuration.adoc @@ -37,6 +37,14 @@ while the *docker* sub-directory is a specific configuration meant for use in a The configuration shared by all business services is in a yaml file, you can find an example with the file /config/docker/common-docker.yml. +In this file you will find, among others, the parameters below : + +|=== +|name|default|mandatory?|Description + +|operatorfabric.businessLogActivated|false|no|Indicates whether or not operatorfabric should record business logs + +|=== === Business service specific configurations diff --git a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java index c5ac7e698c..f4a08deb72 100644 --- a/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java +++ b/tools/spring/aop-process/src/main/java/org/lfenergy/operatorfabric/aop/process/UserAcknowledgmentActionTraceAspect.java @@ -14,6 +14,7 @@ import org.aspectj.lang.annotation.Aspect; import org.lfenergy.operatorfabric.aop.process.mongo.models.UserActionTraceData; import org.lfenergy.operatorfabric.users.model.User; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import java.time.Instant; @@ -24,19 +25,20 @@ @Slf4j public class UserAcknowledgmentActionTraceAspect extends MongoActionTraceAspect { + @Value("${operatorfabric.businessLogActivated:false}") boolean isBusinessLogActivated; @AfterReturning(pointcut="execution(* org.lfenergy.operatorfabric.cards.publication.services.CardRepositoryService.addUserAck(..))", returning = "result") public void after(JoinPoint joinPoint,Object result) { - if (result.hashCode() == Objects.hash(true, true)) { + if ((isBusinessLogActivated) && (result.hashCode() == Objects.hash(true, true))) { UserActionTraceData input = new UserActionTraceData(AopTraceType.ACK.getAction()); User user = (User) joinPoint.getArgs()[0]; input.setUserName(user.getLogin()); input.setEntities(user.getEntities()); input.setCardUid((String) joinPoint.getArgs()[1]); input.setActionDate(Instant.now()); - log.info("AOP TRACING : ==> "+input.toString()); + log.debug("AOP TRACING : ==> "+input.toString()); trace(input); } } From eaf5bc646af3c9a3529fbc1b25c8b5f953395576 Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Fri, 9 Oct 2020 15:40:05 +0200 Subject: [PATCH 47/76] [OC-1145] Add new multi-filter component to logging screen --- .../logging-filters.component.html | 19 +++--- .../logging-filters.component.spec.ts | 62 ------------------- .../logging-filters.component.ts | 30 ++++++--- .../app/modules/logging/logging.component.ts | 9 ++- .../src/app/modules/logging/logging.module.ts | 7 ++- .../monitoring-filters.component.ts | 1 - ui/main/src/assets/i18n/en.json | 2 +- ui/main/src/assets/i18n/fr.json | 2 +- 8 files changed, 43 insertions(+), 89 deletions(-) delete mode 100644 ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.spec.ts diff --git a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html index 3405c54130..e267f8e869 100644 --- a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html +++ b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.html @@ -5,18 +5,19 @@ -
+
-
-
- -
-
+
{ - let component: LoggingFiltersComponent; - let fixture: ComponentFixture; - let store: Store; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [StoreModule.forRoot(appReducer, storeConfig), - ServicesModule, - HttpClientModule, - TranslateModule.forRoot(), - FormsModule, - ReactiveFormsModule, - DatetimeFilterModule, - MultiFilterModule, - CardsModule], - declarations: [LoggingFiltersComponent], - providers: [ - {provide: Store, useClass: Store} - ], - schemas: [ NO_ERRORS_SCHEMA ] - }) - .compileComponents(); - })); - - beforeEach(() => { - store = TestBed.get(Store); - spyOn(store, 'dispatch').and.callThrough(); - fixture = TestBed.createComponent(LoggingFiltersComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts index 711cb30f94..9b2161026e 100644 --- a/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts +++ b/ui/main/src/app/modules/logging/components/logging-filters/logging-filters.component.ts @@ -29,26 +29,39 @@ export class LoggingFiltersComponent implements OnInit { size = 10; loggingForm: FormGroup; + + dropdownList = []; + dropdownSettings = {}; + public submittedOnce = false; @Input() public processData: []; constructor(private store: Store, private timeService: TimeService, private configService: ConfigService) { + + } + + ngOnInit() { + this.size = this.configService.getConfigValue('archive.filters.page.size', 10); this.loggingForm = new FormGroup( { - process: new FormControl(''), + process: new FormControl([]), publishDateFrom: new FormControl(''), publishDateTo: new FormControl(''), activeFrom: new FormControl(''), activeTo: new FormControl('') } ); + this.dropdownList = this.processData; - } - - ngOnInit() { - this.size = this.configService.getConfigValue('archive.filters.page.size', 10); + this.dropdownSettings = { + text: 'Select a Process', + selectAllText: 'Select All', + unSelectAllText: 'UnSelect All', + enableSearchFilter: true, + classes: 'custom-class-example' + }; } sendQuery() { @@ -79,14 +92,13 @@ export class LoggingFiltersComponent implements OnInit { } } else { if (element.length) { - params.set(key, element); + const idProcessArray = []; + element.forEach(val => idProcessArray.push(val.id)); + params.set(key, idProcessArray); } } } }); return params; } - - - } diff --git a/ui/main/src/app/modules/logging/logging.component.ts b/ui/main/src/app/modules/logging/logging.component.ts index 45f3ee10a8..12d8ccd8c5 100644 --- a/ui/main/src/app/modules/logging/logging.component.ts +++ b/ui/main/src/app/modules/logging/logging.component.ts @@ -16,7 +16,6 @@ import {selectLinesOfLoggingResult} from '@ofSelectors/logging.selectors'; import {map, takeUntil} from 'rxjs/operators'; import {LoggingFiltersComponent} from './components/logging-filters/logging-filters.component'; import { ProcessesService } from '@ofServices/processes.service'; -import { I18n } from '@ofModel/i18n.model'; @Component({ selector: 'of-logging', @@ -37,8 +36,12 @@ export class LoggingComponent implements AfterViewInit, OnDestroy { constructor(private store: Store, private processesService: ProcessesService) { processesService.getAllProcesses().forEach( (process) => { const id = process.id; - if (process.uiVisibility && !!process.uiVisibility.logging) { - this.processValueForFilter.push({value: id, label: new I18n(process.name), i18nPrefix: `${process.id}.${process.version}` }); + if (!!process.uiVisibility && !!process.uiVisibility.logging) { + let itemName = process.name; + if (!itemName) { + itemName = id; + } + this.processValueForFilter.push({id: id, itemName: itemName, i18nPrefix: `${process.id}.${process.version}` }); } }); } diff --git a/ui/main/src/app/modules/logging/logging.module.ts b/ui/main/src/app/modules/logging/logging.module.ts index 52f9ff9a57..c6c41f2c05 100644 --- a/ui/main/src/app/modules/logging/logging.module.ts +++ b/ui/main/src/app/modules/logging/logging.module.ts @@ -19,6 +19,7 @@ import {LoggingFiltersComponent} from './components/logging-filters/logging-filt import {DatetimeFilterModule} from '../../components/share/datetime-filter/datetime-filter.module'; import {MultiFilterModule} from '../../components/share/multi-filter/multi-filter.module'; import {LoggingPageComponent} from './components/logging-table/logging-page/logging-page.component'; +import {MultiFilter2Module} from '../../components/share/multi-filter-2/multi-filter-2.module'; @NgModule({ @@ -28,9 +29,9 @@ import {LoggingPageComponent} from './components/logging-table/logging-page/logg ReactiveFormsModule, CardsModule, TranslateModule, - NgbModule - , DatetimeFilterModule - , MultiFilterModule + NgbModule, + DatetimeFilterModule, + MultiFilter2Module ], declarations: [ LoggingComponent, diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts index 08e551c4c6..97b5a23cf6 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-filters/monitoring-filters.component.ts @@ -59,7 +59,6 @@ export class MonitoringFiltersComponent implements OnInit{ enableSearchFilter: true, classes: 'custom-class-example' }; - } sendQuery() { diff --git a/ui/main/src/assets/i18n/en.json b/ui/main/src/assets/i18n/en.json index 7381e2dd2c..84d24e3d93 100755 --- a/ui/main/src/assets/i18n/en.json +++ b/ui/main/src/assets/i18n/en.json @@ -118,7 +118,7 @@ }, "logging": { "filters": { - "process": "Service" + "process": "Process" }, "cardType": "Card Type", "timeOfAction": "Time of Action", diff --git a/ui/main/src/assets/i18n/fr.json b/ui/main/src/assets/i18n/fr.json index b415801c16..8340d5ff29 100755 --- a/ui/main/src/assets/i18n/fr.json +++ b/ui/main/src/assets/i18n/fr.json @@ -118,7 +118,7 @@ }, "logging": { "filters": { - "process": "Service" + "process": "Processus" }, "cardType": "Type de Carte", "timeOfAction": "Moment de l'action", From f9746c14f4e34c8a930dbc0cb6a656407b492052 Mon Sep 17 00:00:00 2001 From: freddidierRTE Date: Tue, 13 Oct 2020 08:38:53 +0200 Subject: [PATCH 48/76] [OC-1175] Correct bug in datePicker After opening the calendar, when clicking outside the calendar shall disappear Signed-off-by: freddidierRTE --- .../share/datetime-filter/datetime-filter.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.html b/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.html index 9dead51b85..776562cefc 100644 --- a/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.html +++ b/ui/main/src/app/components/share/datetime-filter/datetime-filter.component.html @@ -17,7 +17,7 @@ #nsd="ngbDatepicker" id="date" formControlName="date" - (focus)="nsd.toggle()" + (click)="nsd.toggle()" placeholder="YYYY-MM-DD"/>
From 19f64804ac8fe33685f7a67c7025078da0ba71e1 Mon Sep 17 00:00:00 2001 From: Sami Chehade Date: Tue, 13 Oct 2020 11:53:51 +0200 Subject: [PATCH 49/76] [OC-1162] For the archives result, the tags and the processes chosen are not considered --- .../karate/cards/post6CardsSeverity.feature | 5 +- ui/main/package.json | 2 +- .../multi-filter/multi-filter.component.html | 2 +- .../multi-filter.component.spec.ts | 67 ------------------- .../multi-filter/multi-filter.component.ts | 3 - .../components/detail/detail.component.html | 7 +- 6 files changed, 9 insertions(+), 77 deletions(-) delete mode 100644 ui/main/src/app/components/share/multi-filter/multi-filter.component.spec.ts diff --git a/src/test/utils/karate/cards/post6CardsSeverity.feature b/src/test/utils/karate/cards/post6CardsSeverity.feature index 27d536e4e3..fdab43aee9 100644 --- a/src/test/utils/karate/cards/post6CardsSeverity.feature +++ b/src/test/utils/karate/cards/post6CardsSeverity.feature @@ -22,7 +22,7 @@ Scenario: Post 6 Cards (2 INFORMATION, 1 COMPLIANT, 1 ACTION, 2 ALARM) "process" :"defaultProcess", "processInstanceId" : "process1", "state": "messageState", - "tags":["test","test2"], + "tags":["tag1"], "recipient" : { "type" : "GROUP", "identity" : "TSO1" @@ -76,7 +76,7 @@ And match response.count == 1 "process" :"defaultProcess", "processInstanceId" : "process2", "state": "chartState", - "tags" : ["test2"], + "tags" : ["tag2"], "recipient" : { "type" : "GROUP", "identity" : "TSO1" @@ -127,6 +127,7 @@ And match response.count == 1 "process" :"defaultProcess", "processInstanceId" : "process3", "state": "processState", + "tags":["tag1", "tag2"], "recipient" : { "type" : "GROUP", "identity" : "TSO1" diff --git a/ui/main/package.json b/ui/main/package.json index b1b777b9ff..cc917ab4f0 100755 --- a/ui/main/package.json +++ b/ui/main/package.json @@ -1,7 +1,7 @@ { "name": "operatorfabric-ui-main", "version": "0.0.1", -"scripts": { + "scripts": { "ng": "ng", "start": "ng serve", "build": "ng build", diff --git a/ui/main/src/app/components/share/multi-filter/multi-filter.component.html b/ui/main/src/app/components/share/multi-filter/multi-filter.component.html index b536ede73a..f4574d450a 100644 --- a/ui/main/src/app/components/share/multi-filter/multi-filter.component.html +++ b/ui/main/src/app/components/share/multi-filter/multi-filter.component.html @@ -12,6 +12,6 @@
diff --git a/ui/main/src/app/components/share/multi-filter/multi-filter.component.spec.ts b/ui/main/src/app/components/share/multi-filter/multi-filter.component.spec.ts deleted file mode 100644 index 2da00e6248..0000000000 --- a/ui/main/src/app/components/share/multi-filter/multi-filter.component.spec.ts +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (c) 2018-2020, RTE (http://www.rte-france.com) - * See AUTHORS.txt - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * SPDX-License-Identifier: MPL-2.0 - * This file is part of the OperatorFabric project. - */ - - -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { MultiFilterComponent } from './multi-filter.component'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; -import { HttpClientModule } from '@angular/common/http'; -import { zip } from 'rxjs'; - -describe('MultiFilterComponent', () => { - let component: MultiFilterComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - FormsModule, - HttpClientModule, - TranslateModule.forRoot() - ], - declarations: [ MultiFilterComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(MultiFilterComponent); - component = fixture.componentInstance; - }); - - it('should create multi-filter component', () => { - fixture.detectChanges(); - expect(component).toBeTruthy(); - }); - it('should compute correct value/label list : string', (done) => { - component.values = ['new-value', 'new-value2']; - component.preparedList = []; - fixture.detectChanges(); - expect(component.preparedList[0].value).toEqual('new-value'); - expect(component.preparedList[1].value).toEqual('new-value2'); - zip(component.preparedList[0].label, component.preparedList[1].label).subscribe(([l1, l2]) => { - expect(l2).toEqual('new-value2'); - done(); - }); - }); - it('should compute correct value/label list : string ', (done) => { - component.values = ['new-value', 'new-value2']; - component.preparedList = []; - fixture.detectChanges(); - expect(component.preparedList[0].value).toEqual('new-value'); - expect(component.preparedList[1].value).toEqual('new-value2'); - zip(component.preparedList[0].label, component.preparedList[1].label).subscribe(([l1, l2]) => { - expect(l1).toEqual('new-value'); - done(); - }); - }); -}); diff --git a/ui/main/src/app/components/share/multi-filter/multi-filter.component.ts b/ui/main/src/app/components/share/multi-filter/multi-filter.component.ts index 028cef115f..d056b48455 100644 --- a/ui/main/src/app/components/share/multi-filter/multi-filter.component.ts +++ b/ui/main/src/app/components/share/multi-filter/multi-filter.component.ts @@ -34,9 +34,6 @@ export class MultiFilterComponent implements OnInit { } ngOnInit() { - this.parentForm = new FormGroup({ - [this.filterPath]: new FormControl() - }); this.preparedList = []; if (!this.valuesInObservable && this.values) { diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.html b/ui/main/src/app/modules/cards/components/detail/detail.component.html index 04b552a2ee..ec3222dc90 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.html +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.html @@ -26,9 +26,10 @@
- - \ No newline at end of file + diff --git a/ui/main/src/app/services/app.service.ts b/ui/main/src/app/services/app.service.ts index 22cae648f3..82a62dbca9 100644 --- a/ui/main/src/app/services/app.service.ts +++ b/ui/main/src/app/services/app.service.ts @@ -14,33 +14,37 @@ import {AppState} from '@ofStore/index'; import {ClearLightCardSelection} from '@ofStore/actions/light-card.actions'; export enum PageType { - FEED, ARCHIVE, THIRPARTY, SETTING, ABOUT, CALENDAR + UNKNOWN, FEED, ARCHIVE, THIRPARTY, SETTING, ABOUT, CALENDAR, MONITORING } @Injectable() export class AppService { - constructor(private store: Store, private _router: Router) {} + private pageConf = new Map([ + ['feed', PageType.FEED] + , ['archives', PageType.ARCHIVE] + , ['businessconfigparty', PageType.THIRPARTY] + , ['setting', PageType.SETTING] + , ['about', PageType.ABOUT] + , ['calendar', PageType.CALENDAR] + , ['monitoring', PageType.MONITORING] - get pageType(): PageType { + ]); + + + constructor(private store: Store, private _router: Router) { + } - if ( this._router.routerState.snapshot.url.startsWith("/feed") ) { - return PageType.FEED; - } else if ( this._router.routerState.snapshot.url.startsWith("/archives") ) { - return PageType.ARCHIVE; - } else if ( this._router.routerState.snapshot.url.startsWith("/businessconfigparty") ) { - return PageType.THIRPARTY; - } else if ( this._router.routerState.snapshot.url.startsWith("/setting") ) { - return PageType.SETTING; - } else if ( this._router.routerState.snapshot.url.startsWith("/about") ) { - return PageType.ABOUT; - } else if ( this._router.routerState.snapshot.url.startsWith("/calendar") ) { - return PageType.CALENDAR; - } + get pageType(): PageType { + const UrlElements = this._router.routerState.snapshot.url.split('/'); + const PAGE_NAME_INDEX = 1; + const pageName = UrlElements[PAGE_NAME_INDEX]; + const currentPageType = this.pageConf.get(pageName); + return (!!currentPageType) ? currentPageType : PageType.UNKNOWN; } closeDetails(currentPath: string) { this.store.dispatch(new ClearLightCardSelection()); this._router.navigate(['/' + currentPath, 'cards']); } -} \ No newline at end of file +} From 58bf1f851aa9d90252ef96db0bf56d497b559e71 Mon Sep 17 00:00:00 2001 From: LONGA Valerie Date: Tue, 13 Oct 2020 22:22:41 +0200 Subject: [PATCH 57/76] [OC-1173] Add the possibility to not check for user perimeter when sending child card --- config/dev/cards-publication-dev.yml | 3 +++ config/dev/web-ui-test.json | 1 + config/dev/web-ui.json | 1 + config/docker/cards-publication-docker.yml | 5 ++++- config/docker/web-ui.json | 1 + .../processors/impl/UserCardProcessorImpl.java | 6 +++++- .../src/test/resources/application.yml | 4 +++- .../deployment/configuration/configuration.adoc | 12 ++++++++++++ .../configuration/web-ui_configuration.adoc | 1 + src/docs/asciidoc/reference_doc/response_cards.adoc | 4 +++- .../cards/components/detail/detail.component.ts | 11 +++++++++-- 11 files changed, 43 insertions(+), 6 deletions(-) diff --git a/config/dev/cards-publication-dev.yml b/config/dev/cards-publication-dev.yml index d4a46c6352..da2f507acb 100755 --- a/config/dev/cards-publication-dev.yml +++ b/config/dev/cards-publication-dev.yml @@ -14,3 +14,6 @@ externalRecipients-url: "{\ api_test_externalRecipient1: \"http://localhost:8090/test\", \ api_test_externalRecipient2: \"http://localhost:8090/test\" \ }" + +# WARNING : If you set this parameter to false , all users have the rights to respond to all cards +checkPerimeterForResponseCard: true diff --git a/config/dev/web-ui-test.json b/config/dev/web-ui-test.json index 5d3de3ef43..8f132f6a85 100644 --- a/config/dev/web-ui-test.json +++ b/config/dev/web-ui-test.json @@ -1,5 +1,6 @@ { "title": "OperatorFabric (Test)", + "checkPerimeterForResponseCard": true, "logo": { "base64" : "PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPGcgZmlsbD0iZ3JlZW4iPgogICAgPHBhdGggY2xhc3M9InN0MiIgZD0iTTI0Ljg3MSA0Ny4zMTNjLjQ1MS0xLjEyOC4yMjYtMi40MjUtLjY3Ny0zLjI3bC00LjIyOS00LjI4NmEzLjA1IDMuMDUgMCAwIDAtMy4yNy0uNjc3bC01LjAxOSAyLjA4Ni0yLjI1NSAxMy40MiAxMy40Mi0yLjI1NXpNNDEuMTY3IDExLjY3NWwtMi4wODYgNS4wMTljLS40NTEgMS4xMjgtLjIyNiAyLjQyNS42NzYgMy4yN2w0LjI4NiA0LjI4NmEzLjA1IDMuMDUgMCAwIDAgMy4yNy42NzdsNS4wMTktMi4wODcgMi4yNTUtMTMuNDJ6TTM3Ljc4NCA0Ny44MmMtLjQ1MS0xLjEyOC0xLjU3OS0xLjg2LTIuNzYzLTEuODZoLTYuMDljLTEuMjQgMC0yLjMxMi43MzItMi43NjMgMS44NmwtMi4wODYgNS4wNzUgNy44OTQgMTEuMTA4aC4wNTZsNy44OTUtMTEuMTA4ek01Mi44NCAyNC4xMzdsLTUuMDE5IDIuMDg3Yy0xLjEyOC40NS0xLjg2IDEuNTc4LTEuODYgMi43NjN2Ni4wMzNjMCAxLjI0LjczMiAyLjMxMiAxLjg2IDIuNzYzbDUuMDc1IDIuMDg2IDExLjEwOC03Ljg5NHpNNDcuMzEzIDM5LjA4Yy0xLjEyNy0uNDUxLTIuNDI0LS4yMjYtMy4yNy42NzdsLTQuMjg2IDQuMjg1YTMuMDUgMy4wNSAwIDAgMC0uNjc2IDMuMjdsMi4wODYgNS4wNzYgMTMuNDIgMi4yNTUtMi4yNTUtMTMuNDJ6TTExLjYyIDIyLjg0bDUuMDE4IDIuMDg3YzEuMTI4LjQ1IDIuNDI1LjIyNSAzLjI3MS0uNjc3bDQuMjg1LTQuMjg2YTMuMDUgMy4wNSAwIDAgMCAuNjc3LTMuMjdsLTIuMDg2LTUuMDE5TDkuMzY1IDkuNDJ6TTE2LjEzMSAzNy44NGMxLjEyOC0uNDUyIDEuODYtMS41OCAxLjg2LTIuNzY0di02LjA5YzAtMS4yNC0uNzMyLTIuMzExLTEuODYtMi43NjJsLTUuMDE5LTIuMDg3TC4wMDQgMzIuMDMxbDExLjEwOCA3Ljg5NXpNMjQuMDgyIDExLjExMmwyLjA4NiA1LjAxOGMuNDUxIDEuMTI4IDEuNTc5IDEuODYgMi43NjMgMS44Nmg2LjAzNGMxLjI0IDAgMi4zMTEtLjczMiAyLjc2My0xLjg2bDIuMDg2LTUuMDE4TDMxLjkyLjAwM3oiLz4KICA8L2c+CiAgPGcgZmlsbD0iIzc0NzNjMCI+CiAgICA8cGF0aCBjbGFzcz0ic3QzIiBkPSJNOS4zNjQgNTQuNjQzbDUuNjQgNS42MzkuMDU2LjA1NmMxLjUyMiAxLjUyMyA0LjA2Ljk1OSA0Ljg0OS0xLjAxNWwyLjg3Ni02LjkzNXpNNTQuNTg3IDkuNDJMNDguOTUgMy43MjVsLS4wNTctLjA1N2MtMS41MjItMS41MjItNC4wNi0uOTU4LTQuODQ5IDEuMDE1bC0yLjg3NiA2Ljk5MnpNMzkuODcgNTIuODk1bC03Ljg5NCAxMS4xMDhoOC4wNjNjMi4xNDMgMCAzLjU1My0yLjE5OSAyLjcwNy00LjE3MnpNNjMuOTQ4IDI0LjAyNGMwLTIuMTQyLTIuMi0zLjYwOC00LjE3My0yLjc2M2wtNi45MzYgMi44NzYgMTEuMTA5IDcuODk0ek01OS4yNjggNDQuMDQybC02LjkzNi0yLjg3NiAyLjI1NSAxMy40MiA1LjY0LTUuNjM4LjA1Ni0uMDU3YzEuNTIyLTEuNDY2Ljk1OC00LjAwMy0xLjAxNS00Ljg0OXpNNC42ODQgMTkuOTY0bDYuOTM2IDIuODc2TDkuMzY0IDkuNDJsLTUuNjM4IDUuNjM5LS4wNTcuMDU2Yy0xLjQ2NiAxLjQ2Ni0uOTU4IDQuMDA0IDEuMDE1IDQuODV6TTQuMTc3IDQyLjgwMmw2LjkzNS0yLjg3NkwuMDA0IDMyLjAzdjguMDY0YzAgMi4wODYgMi4yIDMuNDk2IDQuMTczIDIuNzA3ek0yNC4wODIgMTEuMTEyTDMxLjk3Ni4wMDNoLTguMDYzYy0yLjE0MyAwLTMuNTUzIDIuMi0yLjcwNyA0LjE3M3oiLz4KICA8L2c+CiAgPHBhdGggY2xhc3M9InN0NCIgZD0iTTQuNjg0IDQ0LjA0MmMtMS45NzMuNzktMi40OCAzLjM4My0xLjAxNSA0Ljg1bC4wNTcuMDU2IDUuNjM4IDUuNjM5IDIuMjU2LTEzLjQyek01MS45OTQgMjIuODRsNi44NzktMi44NzZjMS45NzQtLjc4OSAyLjQ4MS0zLjM4MyAxLjAxNS00Ljg0OWwtLjA1Ni0uMDU2LTUuNjQtNS42Mzl6TTIxLjA5MyA1OS44M2MtLjc5IDEuOTc0LjYyIDQuMTczIDIuNzA3IDQuMTczaDguMDA3bC03Ljg5NC0xMS4xMDh6TTU5LjM4IDQyLjgwMmMxLjk3NC43ODkgNC4xMTctLjYyIDQuMTE3LTIuNzA3di04LjA2NEw1Mi41IDM5LjkyNnpNNDMuNzYxIDU5LjI2N2MuNzkgMS45NzMgMy4zMjcgMi41MzcgNC44NSAxLjAxNWwuMDU2LS4wNTcgNS41ODItNS42MzgtMTMuMzA3LTIuMjU2ek0yMi42NzIgMTEuNjc1TDE5Ljc5NiA0Ljc0Yy0uNzktMS45NzQtMy4zMjctMi41MzgtNC44NS0xLjAxNWwtLjA1Ni4wNTZMOS4yNTIgOS40MnpNNC4xMiAyMS4yNjFjLTEuOTE3LS44NDUtNC4xMTYuNTY0LTQuMTE2IDIuNzA3djguMDYzbDExLjA1Mi03Ljg5NHpNMzkuNTg4IDExLjE2OGwyLjg3Ni02LjkzNmMuNzktMS45NzMtLjYyLTQuMTcyLTIuNzA3LTQuMTcySDMxLjc1eiIgZmlsbD0iI2ZmNjQ3ZCIvPgo8L3N2Zz4=", "height":50, diff --git a/config/dev/web-ui.json b/config/dev/web-ui.json index a4da393b31..d9a5feee00 100644 --- a/config/dev/web-ui.json +++ b/config/dev/web-ui.json @@ -1,5 +1,6 @@ { "title": "OperatorFabric (Dev Mode)", + "checkPerimeterForResponseCard": true, "archive": { "filters": { "page": { diff --git a/config/docker/cards-publication-docker.yml b/config/docker/cards-publication-docker.yml index 70cb35c094..3dd720858d 100644 --- a/config/docker/cards-publication-docker.yml +++ b/config/docker/cards-publication-docker.yml @@ -13,4 +13,7 @@ externalRecipients-url: "{\ processAction: \"http://localhost:8090/test\", \ api_test_externalRecipient1: \"http://localhost:8090/test\", \ api_test_externalRecipient2: \"http://localhost:8090/test\" \ - }" \ No newline at end of file + }" + +# WARNING : If you set this parameter to false , all users have the rights to respond to all cards +checkPerimeterForResponseCard: true diff --git a/config/docker/web-ui.json b/config/docker/web-ui.json index f31d8a59ad..445a620a00 100644 --- a/config/docker/web-ui.json +++ b/config/docker/web-ui.json @@ -1,4 +1,5 @@ { + "checkPerimeterForResponseCard": true, "archive": { "filters": { "page": { diff --git a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java index 42bec2bc6f..b455947340 100644 --- a/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java +++ b/services/core/cards-publication/src/main/java/org/lfenergy/operatorfabric/cards/publication/services/processors/impl/UserCardProcessorImpl.java @@ -5,6 +5,7 @@ import org.lfenergy.operatorfabric.users.model.ComputedPerimeter; import org.lfenergy.operatorfabric.users.model.CurrentUserWithPerimeters; import org.lfenergy.operatorfabric.users.model.RightsEnum; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.AccessDeniedException; import org.springframework.stereotype.Component; @@ -14,9 +15,12 @@ @Component public class UserCardProcessorImpl implements UserCardProcessor { + @Value("${checkPerimeterForResponseCard:true}") + private boolean checkPerimeterForResponseCard; + public String processPublisher(CardPublicationData card, CurrentUserWithPerimeters user) { - if(!isAuthorizedCard(card,user)){ + if ((checkPerimeterForResponseCard) && (!isAuthorizedCard(card,user))){ throw new AccessDeniedException("user not authorized, the card is rejected"); } diff --git a/services/core/cards-publication/src/test/resources/application.yml b/services/core/cards-publication/src/test/resources/application.yml index 37de1a2666..b085ce08ca 100755 --- a/services/core/cards-publication/src/test/resources/application.yml +++ b/services/core/cards-publication/src/test/resources/application.yml @@ -20,4 +20,6 @@ operatorfabric: externalRecipients-url: "{\ api_test_externalRecipient1: \"http://localhost:8090/test\", \ api_test_externalRecipient2: \"http://localhost:8090/test\" \ - }" \ No newline at end of file + }" +# WARNING : If you set this parameter to false , all users have the rights to respond to all cards +checkPerimeterForResponseCard: true \ No newline at end of file diff --git a/src/docs/asciidoc/deployment/configuration/configuration.adoc b/src/docs/asciidoc/deployment/configuration/configuration.adoc index 4a7283a206..361e06f172 100644 --- a/src/docs/asciidoc/deployment/configuration/configuration.adoc +++ b/src/docs/asciidoc/deployment/configuration/configuration.adoc @@ -95,6 +95,18 @@ The user service has these specific properties : |=== +==== Cards-publication service + +The cards-publication service has this specific property : + +|=== +|name|default|mandatory?|Description + +|checkPerimeterForResponseCard|true|no|If false, OperatorFabric will not check that a user has write rights on a process/state to respond to a card + +|=== + + include::web-ui_configuration.adoc[leveloffset=+1] diff --git a/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc b/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc index 419f6c0dc9..f53cb16134 100644 --- a/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc +++ b/src/docs/asciidoc/deployment/configuration/web-ui_configuration.adoc @@ -135,6 +135,7 @@ There will be two new routes with the release of the `[OC-936]`: - `logging`; - `monitoring`. +|checkPerimeterForResponseCard|true|no|If false, OperatorFabric will not check that a user has write rights on a process/state to respond to a card. |=== diff --git a/src/docs/asciidoc/reference_doc/response_cards.adoc b/src/docs/asciidoc/reference_doc/response_cards.adoc index 9d7b14631c..6d764aebda 100644 --- a/src/docs/asciidoc/reference_doc/response_cards.adoc +++ b/src/docs/asciidoc/reference_doc/response_cards.adoc @@ -124,9 +124,11 @@ To configure it in OperatorFabric , you need to make a POST of this json file to To add it to a group name for example "mygroup", you need to make a PATCH request to end point 'users/groups/mygroup/perimeters' with payload ["perimeterQuestion"] +NOTE: If you don't want OperatorFabric to check for user perimeter when responding to a card, you can add the variable "checkPerimeterForResponseCard" and set it to false, in the config file of cards-publication and in web-ui.json. + == Send a question card -The question card is like a usual card except that you have a the field "entitiesAllowedToRespond" to set with the entities allowed to respond to the card . If the user is not in the entity , he will not be able to respond . +The question card is like a usual card except that you have the field "entitiesAllowedToRespond" to set with the entities allowed to respond to the card. If the user is not in the entity, he will not be able to respond. .... ... diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.ts b/ui/main/src/app/modules/cards/components/detail/detail.component.ts index 56fe7d46ce..d50705e351 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.ts +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.ts @@ -45,6 +45,7 @@ import { EntitiesService } from '@ofServices/entities.service'; import { Entity } from '@ofModel/entity.model'; import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; import {NgbModalRef} from "@ng-bootstrap/ng-bootstrap/modal/modal-ref"; +import {ConfigService} from "@ofServices/config.service"; declare const templateGateway: any; @@ -137,7 +138,8 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC private _appService: AppService, private userService: UserService, private entitiesService: EntitiesService, - private modalService: NgbModal) { + private modalService: NgbModal, + private configService: ConfigService) { this.store.select(selectAuthenticationState).subscribe(authState => { this._userContext = new UserContext( @@ -424,7 +426,12 @@ export class DetailComponent implements OnChanges, OnInit, OnDestroy, AfterViewC } private setIsActionEnabled() { - this.isActionEnabled = (this.isUserInEntityAllowedToRespond() && this.doesTheUserHavePermissionToRespond()); + const checkPerimeterForResponseCard = this.configService.getConfigValue('checkPerimeterForResponseCard'); + + if (checkPerimeterForResponseCard === false) + this.isActionEnabled = this.isUserInEntityAllowedToRespond(); + else + this.isActionEnabled = (this.isUserInEntityAllowedToRespond() && this.doesTheUserHavePermissionToRespond()); } private setIsDeleteCardAllowed() { From 3b5720fc443bed48594d1c7a09dd7a40ba2376ba Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Wed, 14 Oct 2020 11:19:15 +0200 Subject: [PATCH 58/76] [OC-1184] cleans imports from unused ones Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- .../card-list/card-list.component.ts | 28 +++++++++---------- .../monitoring-table.component.ts | 24 ++++++++-------- .../card-preview/card-preview.component.ts | 26 ++++++++--------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts b/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts index 781dbe2f17..726a428b81 100644 --- a/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts +++ b/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts @@ -8,28 +8,28 @@ */ - import {Component, Input, OnInit} from '@angular/core'; import {LightCard} from '@ofModel/light-card.model'; import {Observable} from 'rxjs'; -import { ResizableComponent } from 'app/modules/utilities/components/resizable/resizable.component'; -import { Store } from '@ngrx/store'; -import { AppState } from '@ofStore/index'; -import { selectCurrentUrl } from '@ofStore/selectors/router.selectors'; +import {ResizableComponent} from 'app/modules/utilities/components/resizable/resizable.component'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; +import {selectCurrentUrl} from '@ofStore/selectors/router.selectors'; @Component({ - selector: 'of-card-list', - templateUrl: './card-list.component.html', - styleUrls: ['./card-list.component.scss'] + selector: 'of-card-list', + templateUrl: './card-list.component.html', + styleUrls: ['./card-list.component.scss'] }) export class CardListComponent extends ResizableComponent implements OnInit { - @Input() public lightCards: LightCard[]; - @Input() public selection: Observable; + @Input() public lightCards: LightCard[]; + @Input() public selection: Observable; - constructor() { - super(); - } + constructor() { + super(); + } - ngOnInit(): void { } + ngOnInit(): void { + } } diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts index 9ee7ad737a..ed69d5f7b5 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts @@ -8,22 +8,22 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnInit, OnDestroy, ViewChild, ElementRef} from '@angular/core'; -import { LineOfMonitoringResult } from '@ofModel/line-of-monitoring-result.model'; -import { TimeService } from '@ofServices/time.service'; -import { Moment } from 'moment-timezone'; -import { TranslateService } from '@ngx-translate/core'; -import { ExportService } from '@ofServices/export.service'; +import {Component, Input, OnDestroy} from '@angular/core'; +import {LineOfMonitoringResult} from '@ofModel/line-of-monitoring-result.model'; +import {TimeService} from '@ofServices/time.service'; +import {Moment} from 'moment-timezone'; +import {TranslateService} from '@ngx-translate/core'; +import {ExportService} from '@ofServices/export.service'; -import { takeUntil } from 'rxjs/operators'; -import { Subject } from 'rxjs'; +import {takeUntil} from 'rxjs/operators'; +import {Subject} from 'rxjs'; @Component({ selector: 'of-monitoring-table', templateUrl: './monitoring-table.component.html', styleUrls: ['./monitoring-table.component.scss'] }) -export class MonitoringTableComponent implements OnDestroy{ +export class MonitoringTableComponent implements OnDestroy { @Input() result: LineOfMonitoringResult[]; exportMonitoringData: Array = []; @@ -47,7 +47,7 @@ export class MonitoringTableComponent implements OnDestroy{ this.exportMonitoringData = []; let time: string, businessPeriod: string, processName: any, title: any, summary: any, status: any; - this.result.forEach( (line: LineOfMonitoringResult) => { + this.result.forEach((line: LineOfMonitoringResult) => { if (typeof line !== undefined) { time = this.displayTime(line.creationDateTime); businessPeriod = this.displayTime(line.beginningOfBusinessPeriod).concat(this.displayTime(line.endOfBusinessPeriod)); @@ -78,7 +78,9 @@ export class MonitoringTableComponent implements OnDestroy{ this.translate.get(key, interpolateParams) .pipe(takeUntil(this.unsubscribe$)) - .subscribe((translate) => { translatedColomn = translate; }); + .subscribe((translate) => { + translatedColomn = translate; + }); return translatedColomn; } diff --git a/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts b/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts index 47a8c551fd..5874c2c390 100644 --- a/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts +++ b/ui/main/src/app/modules/usercard/components/card-preview/card-preview.component.ts @@ -22,8 +22,6 @@ import {UserContext} from '@ofModel/user-context.model'; import {skip, switchMap, takeUntil} from 'rxjs/operators'; import {Subject} from 'rxjs'; -import {User} from '@ofModel/user.model'; - @Component({ selector: 'of-card-preview', @@ -43,8 +41,8 @@ export class CardPreviewComponent implements OnInit, OnDestroy { constructor(private element: ElementRef, private businessconfigService: ProcessesService, - private handlebars: HandlebarsService, private sanitizer: DomSanitizer, - private store: Store) { + private handlebars: HandlebarsService, private sanitizer: DomSanitizer, + private store: Store) { this.store.select(selectAuthenticationState).subscribe(authState => { this._userContext = new UserContext( @@ -66,18 +64,18 @@ export class CardPreviewComponent implements OnInit, OnDestroy { this.businessconfigService.queryProcess(this.card.process, this.card.processVersion) .pipe(takeUntil(this.unsubscribe$)) .subscribe(businessconfig => { - if (!!businessconfig) { - const state = businessconfig.extractState(this.card); - if (!!state) { - // Take the first detail, new card preview only compatible with one detail per card - this.detail = state.details[0]; + if (!!businessconfig) { + const state = businessconfig.extractState(this.card); + if (!!state) { + // Take the first detail, new card preview only compatible with one detail per card + this.detail = state.details[0]; + } + this.initializeHrefsOfCssLink(); + this.initializeHandlebarsTemplates(); } - this.initializeHrefsOfCssLink(); - this.initializeHandlebarsTemplates(); - } - }, + }, error => console.log(`something went wrong while trying to fetch process for ${this.card.process}` - + ` with ${this.card.processVersion} version.`) + + ` with ${this.card.processVersion} version.`) ); } From cee24e63d98afb5a2c9a6dc93121bfbf9fbe3e95 Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Wed, 14 Oct 2020 13:31:43 +0200 Subject: [PATCH 59/76] [OC-1187] removes unused injection Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- .../modules/feed/components/card-list/card-list.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts b/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts index 726a428b81..ad063b8da6 100644 --- a/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts +++ b/ui/main/src/app/modules/feed/components/card-list/card-list.component.ts @@ -12,9 +12,6 @@ import {Component, Input, OnInit} from '@angular/core'; import {LightCard} from '@ofModel/light-card.model'; import {Observable} from 'rxjs'; import {ResizableComponent} from 'app/modules/utilities/components/resizable/resizable.component'; -import {Store} from '@ngrx/store'; -import {AppState} from '@ofStore/index'; -import {selectCurrentUrl} from '@ofStore/selectors/router.selectors'; @Component({ selector: 'of-card-list', From e0ad928d77038861293f44528e667ac603308937 Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Tue, 13 Oct 2020 18:15:23 +0200 Subject: [PATCH 60/76] [OC-1077] applys card-detail modal in monitoring Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- .../monitoring-table.component.html | 20 ++++++++++++++- .../monitoring-table.component.scss | 17 ++++++++++++- .../monitoring-table.component.ts | 25 +++++++++++++++++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html index 5450d8282b..dbf0d9f245 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html @@ -35,7 +35,12 @@ [ngStyle]="{'background-color': line.coordinationStatusColor, 'color': line.coordinationStatusColor}"> .

- monitoring.seeDetails + + + + + @@ -45,3 +50,16 @@ fileName="monitoringResults" translate> monitoring.ExportTOExcel
+ + +
+ +
+
+
+ +
+
+ diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss index c7fdad8327..bd8f5353df 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.scss @@ -21,7 +21,7 @@ table { clip-path: circle(); } -// not displayed by still read by VoiceOver +// not displayed but still read by VoiceOver .hidden-caption { visibility: collapse; } @@ -36,3 +36,18 @@ table { .export-btn { float: right; } + +.modal-body{ + background-color: var(--opfab-lightcard-detail-bgcolor); + color: var(--opfab-lightcard-detail-textcolor); +} + + +.modal-header{ + background-color: var(--opfab-lightcard-detail-bgcolor); + color: var(--opfab-lightcard-detail-textcolor); +} + +.btn{ + color: var(--opfab-lightcard-detail-textcolor); +} diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts index ed69d5f7b5..5ef5f3b5f9 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.ts @@ -8,7 +8,7 @@ * This file is part of the OperatorFabric project. */ -import {Component, Input, OnDestroy} from '@angular/core'; +import {Component, ElementRef, Input, OnDestroy, ViewChild} from '@angular/core'; import {LineOfMonitoringResult} from '@ofModel/line-of-monitoring-result.model'; import {TimeService} from '@ofServices/time.service'; import {Moment} from 'moment-timezone'; @@ -17,6 +17,11 @@ import {ExportService} from '@ofServices/export.service'; import {takeUntil} from 'rxjs/operators'; import {Subject} from 'rxjs'; +import {SelectLightCard} from '@ofActions/light-card.actions'; +import {LoadCard} from '@ofActions/card.actions'; +import {NgbModal, NgbModalOptions, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; +import {Store} from '@ngrx/store'; +import {AppState} from '@ofStore/index'; @Component({ selector: 'of-monitoring-table', @@ -25,12 +30,19 @@ import {Subject} from 'rxjs'; }) export class MonitoringTableComponent implements OnDestroy { + @ViewChild('cardDetail', null) cardDetailTemplate: ElementRef; @Input() result: LineOfMonitoringResult[]; exportMonitoringData: Array = []; unsubscribe$: Subject = new Subject(); + modalRef: NgbModalRef; - constructor(readonly timeService: TimeService, private translate: TranslateService, private exportService: ExportService) { + constructor(readonly timeService: TimeService + , private translate: TranslateService + , private exportService: ExportService + , private store: Store + , private modalService: NgbModal + ) { } @@ -90,5 +102,14 @@ export class MonitoringTableComponent implements OnDestroy { this.unsubscribe$.complete(); } + selectCard(info) { + this.store.dispatch(new SelectLightCard({ selectedCardId: info })); + this.store.dispatch(new LoadCard({ id: info })); + const options: NgbModalOptions = { + size: 'fullscreen' + }; + this.modalRef = this.modalService.open(this.cardDetailTemplate, options); + + } } From db8c05e3afb2d9320226d6178c313af78d02a4f3 Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Wed, 14 Oct 2020 16:30:32 +0200 Subject: [PATCH 61/76] [OC-1077] removes useless comment Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- .../components/monitoring-table/monitoring-table.component.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html index dbf0d9f245..324534a949 100644 --- a/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html +++ b/ui/main/src/app/modules/monitoring/components/monitoring-table/monitoring-table.component.html @@ -38,8 +38,6 @@ - - From 8e511f0f4bfda0063e1b9dc02e7a606ae23e2e4c Mon Sep 17 00:00:00 2001 From: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> Date: Wed, 14 Oct 2020 18:38:05 +0200 Subject: [PATCH 62/76] hides actions in details for Monitoring and Calendar pages Signed-off-by: LE-GALL Ronan Ext <43667786+rlg-rte@users.noreply.github.com> --- .../components/detail/detail.component.html | 2 +- .../components/detail/detail.component.ts | 78 +++++++++++-------- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/ui/main/src/app/modules/cards/components/detail/detail.component.html b/ui/main/src/app/modules/cards/components/detail/detail.component.html index ec3222dc90..a62db5689d 100644 --- a/ui/main/src/app/modules/cards/components/detail/detail.component.html +++ b/ui/main/src/app/modules/cards/components/detail/detail.component.html @@ -25,7 +25,7 @@
-
+