ci_latest

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"

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"

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)

VERSION

@@ -1 +1 @@
-1.6.0.RELEASE
+1.7.0.RELEASE

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 )"

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

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 )"

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]}"

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 )"

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 {

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;
 
 /**

config/dev/cards-publication-dev.yml

@@ -12,5 +12,10 @@ users:
 externalRecipients-url: "{\
            processAction: \"http://localhost:8090/test\", \
            api_test_externalRecipient1: \"http://localhost:8090/test\", \
-           api_test_externalRecipient2: \"http://localhost:8090/test\" \
+           api_test_externalRecipient2: \"http://localhost:8090/test\", \
+           externalRecipient1: \"http://localhost:8090/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

config/dev/common-dev.yml

@@ -21,6 +21,7 @@ security:
     enabled: false
 
 operatorfabric:
+  businessLogActivated: true
   security:
     oauth2:
       client-id: opfab-client

config/dev/docker-compose.yml

@@ -26,7 +26,7 @@ services:
       - "89:8080"
       - "90:9990"
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:1.6.0.RELEASE"
+    image: "lfeoperatorfabric/of-web-ui:1.7.0.RELEASE"
     #user: ${USER_ID}:${USER_GID}
     ports:
       - "2002:80"

config/dev/users-dev.yml

@@ -66,3 +66,6 @@ operatorfabric.users.default:
   user-settings:
     - login: rte-operator
       description: Da Operator Rulez
+#logging:
+#  level:
+#    ROOT: DEBUG

config/dev/web-ui-test.json

@@ -1,5 +1,6 @@
 {
   "title": "OperatorFabric (Test)",
+  "checkPerimeterForResponseCard": true,
   "logo": { 
     "base64" : "PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPGcgZmlsbD0iZ3JlZW4iPgogICAgPHBhdGggY2xhc3M9InN0MiIgZD0iTTI0Ljg3MSA0Ny4zMTNjLjQ1MS0xLjEyOC4yMjYtMi40MjUtLjY3Ny0zLjI3bC00LjIyOS00LjI4NmEzLjA1IDMuMDUgMCAwIDAtMy4yNy0uNjc3bC01LjAxOSAyLjA4Ni0yLjI1NSAxMy40MiAxMy40Mi0yLjI1NXpNNDEuMTY3IDExLjY3NWwtMi4wODYgNS4wMTljLS40NTEgMS4xMjgtLjIyNiAyLjQyNS42NzYgMy4yN2w0LjI4NiA0LjI4NmEzLjA1IDMuMDUgMCAwIDAgMy4yNy42NzdsNS4wMTktMi4wODcgMi4yNTUtMTMuNDJ6TTM3Ljc4NCA0Ny44MmMtLjQ1MS0xLjEyOC0xLjU3OS0xLjg2LTIuNzYzLTEuODZoLTYuMDljLTEuMjQgMC0yLjMxMi43MzItMi43NjMgMS44NmwtMi4wODYgNS4wNzUgNy44OTQgMTEuMTA4aC4wNTZsNy44OTUtMTEuMTA4ek01Mi44NCAyNC4xMzdsLTUuMDE5IDIuMDg3Yy0xLjEyOC40NS0xLjg2IDEuNTc4LTEuODYgMi43NjN2Ni4wMzNjMCAxLjI0LjczMiAyLjMxMiAxLjg2IDIuNzYzbDUuMDc1IDIuMDg2IDExLjEwOC03Ljg5NHpNNDcuMzEzIDM5LjA4Yy0xLjEyNy0uNDUxLTIuNDI0LS4yMjYtMy4yNy42NzdsLTQuMjg2IDQuMjg1YTMuMDUgMy4wNSAwIDAgMC0uNjc2IDMuMjdsMi4wODYgNS4wNzYgMTMuNDIgMi4yNTUtMi4yNTUtMTMuNDJ6TTExLjYyIDIyLjg0bDUuMDE4IDIuMDg3YzEuMTI4LjQ1IDIuNDI1LjIyNSAzLjI3MS0uNjc3bDQuMjg1LTQuMjg2YTMuMDUgMy4wNSAwIDAgMCAuNjc3LTMuMjdsLTIuMDg2LTUuMDE5TDkuMzY1IDkuNDJ6TTE2LjEzMSAzNy44NGMxLjEyOC0uNDUyIDEuODYtMS41OCAxLjg2LTIuNzY0di02LjA5YzAtMS4yNC0uNzMyLTIuMzExLTEuODYtMi43NjJsLTUuMDE5LTIuMDg3TC4wMDQgMzIuMDMxbDExLjEwOCA3Ljg5NXpNMjQuMDgyIDExLjExMmwyLjA4NiA1LjAxOGMuNDUxIDEuMTI4IDEuNTc5IDEuODYgMi43NjMgMS44Nmg2LjAzNGMxLjI0IDAgMi4zMTEtLjczMiAyLjc2My0xLjg2bDIuMDg2LTUuMDE4TDMxLjkyLjAwM3oiLz4KICA8L2c+CiAgPGcgZmlsbD0iIzc0NzNjMCI+CiAgICA8cGF0aCBjbGFzcz0ic3QzIiBkPSJNOS4zNjQgNTQuNjQzbDUuNjQgNS42MzkuMDU2LjA1NmMxLjUyMiAxLjUyMyA0LjA2Ljk1OSA0Ljg0OS0xLjAxNWwyLjg3Ni02LjkzNXpNNTQuNTg3IDkuNDJMNDguOTUgMy43MjVsLS4wNTctLjA1N2MtMS41MjItMS41MjItNC4wNi0uOTU4LTQuODQ5IDEuMDE1bC0yLjg3NiA2Ljk5MnpNMzkuODcgNTIuODk1bC03Ljg5NCAxMS4xMDhoOC4wNjNjMi4xNDMgMCAzLjU1My0yLjE5OSAyLjcwNy00LjE3MnpNNjMuOTQ4IDI0LjAyNGMwLTIuMTQyLTIuMi0zLjYwOC00LjE3My0yLjc2M2wtNi45MzYgMi44NzYgMTEuMTA5IDcuODk0ek01OS4yNjggNDQuMDQybC02LjkzNi0yLjg3NiAyLjI1NSAxMy40MiA1LjY0LTUuNjM4LjA1Ni0uMDU3YzEuNTIyLTEuNDY2Ljk1OC00LjAwMy0xLjAxNS00Ljg0OXpNNC42ODQgMTkuOTY0bDYuOTM2IDIuODc2TDkuMzY0IDkuNDJsLTUuNjM4IDUuNjM5LS4wNTcuMDU2Yy0xLjQ2NiAxLjQ2Ni0uOTU4IDQuMDA0IDEuMDE1IDQuODV6TTQuMTc3IDQyLjgwMmw2LjkzNS0yLjg3NkwuMDA0IDMyLjAzdjguMDY0YzAgMi4wODYgMi4yIDMuNDk2IDQuMTczIDIuNzA3ek0yNC4wODIgMTEuMTEyTDMxLjk3Ni4wMDNoLTguMDYzYy0yLjE0MyAwLTMuNTUzIDIuMi0yLjcwNyA0LjE3M3oiLz4KICA8L2c+CiAgPHBhdGggY2xhc3M9InN0NCIgZD0iTTQuNjg0IDQ0LjA0MmMtMS45NzMuNzktMi40OCAzLjM4My0xLjAxNSA0Ljg1bC4wNTcuMDU2IDUuNjM4IDUuNjM5IDIuMjU2LTEzLjQyek01MS45OTQgMjIuODRsNi44NzktMi44NzZjMS45NzQtLjc4OSAyLjQ4MS0zLjM4MyAxLjAxNS00Ljg0OWwtLjA1Ni0uMDU2LTUuNjQtNS42Mzl6TTIxLjA5MyA1OS44M2MtLjc5IDEuOTc0LjYyIDQuMTczIDIuNzA3IDQuMTczaDguMDA3bC03Ljg5NC0xMS4xMDh6TTU5LjM4IDQyLjgwMmMxLjk3NC43ODkgNC4xMTctLjYyIDQuMTE3LTIuNzA3di04LjA2NEw1Mi41IDM5LjkyNnpNNDMuNzYxIDU5LjI2N2MuNzkgMS45NzMgMy4zMjcgMi41MzcgNC44NSAxLjAxNWwuMDU2LS4wNTcgNS41ODItNS42MzgtMTMuMzA3LTIuMjU2ek0yMi42NzIgMTEuNjc1TDE5Ljc5NiA0Ljc0Yy0uNzktMS45NzQtMy4zMjctMi41MzgtNC44NS0xLjAxNWwtLjA1Ni4wNTZMOS4yNTIgOS40MnpNNC4xMiAyMS4yNjFjLTEuOTE3LS44NDUtNC4xMTYuNTY0LTQuMTE2IDIuNzA3djguMDYzbDExLjA1Mi03Ljg5NHpNMzkuNTg4IDExLjE2OGwyLjg3Ni02LjkzNmMuNzktMS45NzMtLjYyLTQuMTcyLTIuNzA3LTQuMTcySDMxLjc1eiIgZmlsbD0iI2ZmNjQ3ZCIvPgo8L3N2Zz4=",
     "height":50,

config/dev/web-ui.json

@@ -1,5 +1,6 @@
 {
   "title": "OperatorFabric (Dev Mode)",
+  "checkPerimeterForResponseCard": true,
   "archive": {
     "filters": {
       "page": {
@@ -34,7 +35,7 @@
         "display": "BUSINESS"
       },
       "hideAckFilter": false,
-      "secondsBeforeLttdForClockDisplay": 180
+      "secondsBeforeLttdForClockDisplay": 3700
     },
     "notify": false,
     "timeline": {
@@ -132,5 +133,8 @@
   "navbar": {
     "hidden": [],
     "businessmenus" : {"type":"BOTH"}
+  },
+  "admin": {
+    "hidden": false
   }
 }

config/docker/cards-publication-docker.yml

@@ -12,5 +12,10 @@ users:
 externalRecipients-url: "{\
            processAction: \"http://localhost:8090/test\", \
            api_test_externalRecipient1: \"http://localhost:8090/test\", \
-           api_test_externalRecipient2: \"http://localhost:8090/test\" \
-           }"
+           api_test_externalRecipient2: \"http://localhost:8090/test\", \
+           externalRecipient1: \"http://localhost:8090/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

config/docker/common-docker.yml

@@ -28,4 +28,4 @@ operatorfabric:
     jwt:
       login-claim: preferred_username
       expire-claim: exp
-
+  businessLogActivated: false

config/docker/docker-compose.yml

@@ -28,7 +28,7 @@ services:
 #    - "90:9990"
   users:
     container_name: users
-    image: "lfeoperatorfabric/of-users-business-service:1.6.0.RELEASE"
+    image: "lfeoperatorfabric/of-users-business-service:1.7.0.RELEASE"
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2103:8080"
@@ -40,7 +40,7 @@ services:
     - "./common-docker.yml:/config/common-docker.yml"
   businessconfig:
     container_name: businessconfig
-    image: "lfeoperatorfabric/of-businessconfig-business-service:1.6.0.RELEASE"
+    image: "lfeoperatorfabric/of-businessconfig-business-service:1.7.0.RELEASE"
     depends_on:
       - mongodb
     user: ${USER_ID}:${USER_GID}
@@ -55,7 +55,7 @@ services:
      - "./businessconfig-docker.yml:/config/application-docker.yml"
   cards-publication:
     container_name: cards-publication
-    image: "lfeoperatorfabric/of-cards-publication-business-service:1.6.0.RELEASE"
+    image: "lfeoperatorfabric/of-cards-publication-business-service:1.7.0.RELEASE"
     depends_on:
       - mongodb
     user: ${USER_ID}:${USER_GID}
@@ -69,7 +69,7 @@ services:
       - "./cards-publication-docker.yml:/config/application-docker.yml"
   cards-consultation:
     container_name: cards-consultation
-    image: "lfeoperatorfabric/of-cards-consultation-business-service:1.6.0.RELEASE"
+    image: "lfeoperatorfabric/of-cards-consultation-business-service:1.7.0.RELEASE"
     user: ${USER_ID}:${USER_GID}
     ports:
      - "2104:8080"
@@ -80,7 +80,7 @@ services:
       - "./common-docker.yml:/config/common-docker.yml"
       - "./cards-consultation-docker.yml:/config/application-docker.yml"
   web-ui:
-    image: "lfeoperatorfabric/of-web-ui:1.6.0.RELEASE"
+    image: "lfeoperatorfabric/of-web-ui:1.7.0.RELEASE"
     ports:
     - "2002:80"
     depends_on:

config/docker/nginx-cors-permissive.conf

@@ -95,6 +95,23 @@ server {
     proxy_pass http://users:8080/$1;
   }
 
+  location /users {
+    # enables `ng serve` mode
+    if ($request_method = 'OPTIONS') {
+      add_header 'Access-Control-Allow-Origin' '*';
+      add_header 'Access-Control-Allow-Credentials' 'true';
+      add_header 'Access-Control-Allow-Methods' '*';
+      add_header 'Access-Control-Allow-Headers' '*';
+      add_header 'Content-Length' 0;
+      add_header 'Vary' 'Origin';
+      add_header 'Vary' 'Access-Control-Request-Method' ;
+      add_header 'Vary' 'Access-Control-Request-Headers';
+      return 204;
+    }
+    proxy_set_header Host $http_host;
+    proxy_pass http://users:8080/users;
+  }
+
  location /groups {
     # enables `ng serve` mode
     if ($request_method = 'OPTIONS') {
@@ -195,6 +212,22 @@ server {
     proxy_set_header Host $http_host;
     proxy_pass http://cards-publication:8080/cards/userCard;
   }
+  location /cardspub/cards/userAcknowledgement {
+    # enables `ng serve` mode
+    if ($request_method = 'OPTIONS') {
+      add_header 'Access-Control-Allow-Origin' '*';
+      add_header 'Access-Control-Allow-Credentials' 'true';
+      add_header 'Access-Control-Allow-Methods' '*';
+      add_header 'Access-Control-Allow-Headers' '*';
+      add_header 'Content-Length' 0;
+      add_header 'Vary' 'Origin';
+      add_header 'Vary' 'Access-Control-Request-Method' ;
+      add_header 'Vary' 'Access-Control-Request-Headers';
+      return 204;
+    }
+    proxy_set_header Host $http_host;
+    proxy_pass http://cards-publication:8080/cards/userAcknowledgement;
+  }
   location /archives {
     # enables `ng serve` mode
     if ($request_method = 'OPTIONS') {

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;

config/docker/web-ui.json

@@ -1,4 +1,5 @@
 {
+  "checkPerimeterForResponseCard": true,
   "archive": {
     "filters": {
       "page": {
@@ -33,7 +34,7 @@
         "display": "BUSINESS"
       },
       "hideAckFilter": false,
-      "secondsBeforeLttdForClockDisplay": 180
+      "secondsBeforeLttdForClockDisplay": 3700
     },
     "notify": false,
     "timeline": {
@@ -131,5 +132,8 @@
   "navbar": {
     "hidden": ["calendar","logging","monitoring","usercard"],
     "businessmenus" : {"type":"BOTH"}
+  },
+  "admin": {
+    "hidden": false
   }
 }