Merge pull request #11 from catenax-ng/TRACEFOSS-939-channel

TRACEFOSS-939: reactived isFromSender after be update

Author: fbedarf

angular.json

@@ -99,6 +99,14 @@
                 }
               ]
             },
+            "localBackendNoAuth": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.localBackendNoAuth.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
@@ -154,6 +162,9 @@
             "localBackend": {
               "browserTarget": "trace-x:build:dev,localBackend"
             },
+            "localBackendNoAuth": {
+              "browserTarget": "trace-x:build:dev,localBackendNoAuth"
+            },
             "production": {
               "browserTarget": "trace-x:build:production"
             },

package.json

@@ -17,6 +17,8 @@
     "start:auth": "ng serve --configuration=dev,auth",
     "start:auth:mock": "ng serve --configuration=authMock",
     "start:auth:local": "ng serve --configuration=authLocal",
+    "start:auth:localBe": "ng serve --configuration=localBackend",
+    "start:noAuth:localBe": "ng serve --configuration=localBackendNoAuth",
     "env:mock": "docker-compose up",
     "test": "ng test",
     "test:ci": "ng test --no-watch --no-progress --browsers=ChromeHeadless",

src/app/modules/page/investigations/core/investigation-helper.service.ts

@@ -56,24 +56,24 @@ export class InvestigationHelperService {
   }
 
   public showApproveButton({ status, isFromSender } = {} as Notification): boolean {
-    return /*isFromSender &&*/ status === NotificationStatus.CREATED && this.roleService.isAtLeastSupervisor();
+    return isFromSender && status === NotificationStatus.CREATED && this.roleService.isAtLeastSupervisor();
   }
 
   public showCancelButton({ status, isFromSender } = {} as Notification): boolean {
-    return /*isFromSender &&*/ status === NotificationStatus.CREATED && this.roleService.isAtLeastSupervisor();
+    return isFromSender && status === NotificationStatus.CREATED && this.roleService.isAtLeastSupervisor();
   }
 
   public showCloseButton({ status, isFromSender } = {} as Notification): boolean {
     const disallowedStatus = [NotificationStatus.CREATED, NotificationStatus.CLOSED, NotificationStatus.CANCELED];
-    return /*isFromSender &&*/ !disallowedStatus.includes(status) && this.roleService.isAtLeastSupervisor();
+    return isFromSender && !disallowedStatus.includes(status) && this.roleService.isAtLeastSupervisor();
   }
   public showAcknowledgeButton({ status, isFromSender } = {} as Notification): boolean {
-    return /*!isFromSender &&*/ status === NotificationStatus.RECEIVED && this.roleService.isAtLeastSupervisor();
+    return !isFromSender && status === NotificationStatus.RECEIVED && this.roleService.isAtLeastSupervisor();
   }
   public showAcceptButton({ status, isFromSender } = {} as Notification): boolean {
-    return /*!isFromSender &&*/ status === NotificationStatus.ACKNOWLEDGED && this.roleService.isAtLeastSupervisor();
+    return !isFromSender && status === NotificationStatus.ACKNOWLEDGED && this.roleService.isAtLeastSupervisor();
   }
   public showDeclineButton({ status, isFromSender } = {} as Notification): boolean {
-    return /*!isFromSender &&*/ status === NotificationStatus.ACKNOWLEDGED && this.roleService.isAtLeastSupervisor();
+    return !isFromSender && status === NotificationStatus.ACKNOWLEDGED && this.roleService.isAtLeastSupervisor();
   }
 }

src/environments/environment.localBackend.ts

@@ -27,7 +27,7 @@ export const environment = {
   authDisabled: false,
   mockService: false,
   keycloakUrl: 'https://centralidp.dev.demo.catena-x.net/auth',
-  clientId: 'Cl10-CX-Part',
+  clientId: 'Cl17-CX-Part',
   defaultRealm: 'CX-Central',
   apiUrl: 'http://localhost:8080/api',
 };

src/environments/environment.localBackendNoAuth.ts

@@ -0,0 +1,29 @@
+/********************************************************************************
+ * Copyright (c) 2022, 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * Copyright (c) 2022, 2023 ZF Friedrichshafen AG
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+import { _environment } from './_environment.base';
+
+export const environment = {
+  ..._environment,
+  authDisabled: true,
+  mockService: false,
+  apiUrl: 'http://localhost:8080/api',
+};