NVSHAS-9986: Process profile rules and File access rules cannot be edited and removed in Federated policy group view

Author: xingzhang-suse

admin/webapp/websrc/app/common/services/file-access-rules.service.ts

@@ -37,21 +37,6 @@ export class FileAccessRulesService {
       },
     ];
     const filterPrefix = [
-      {
-        headerName: this.translate.instant('group.GROUP'),
-        // headerCheckboxSelection: function(params) {
-        //     console.log("Header: ", $scope.selectedGroup, params);
-        //     return $scope.isWriteRuleAuthorized && $scope.selectedGroup;
-        // },
-        // headerCheckboxSelectionFilteredOnly: true,
-        // checkboxSelection: function(params) {
-        //     console.log("Rows: ", $scope.selectedGroup);
-        //     return $scope.isWriteRuleAuthorized && $scope.selectedGroup;
-        // },
-        field: 'group',
-        filter: 'agTextColumnFilter',
-        hide: source === GlobalConstant.NAV_SOURCE.GROUP,
-      },
       ...filterColumn,
       {
         headerName: this.translate.instant('service.gridHeader.RECURSIVE'),

admin/webapp/websrc/app/common/services/process-profile-rules.service.ts

@@ -31,13 +31,13 @@ export class ProcessProfileRulesService {
     source: string,
     isScoreImprovement: boolean = false
   ) {
+    const groupConfigurableCfgTypes = source === GlobalConstant.NAV_SOURCE.GROUP?
+    [
+      GlobalConstant.CFG_TYPE.CUSTOMER,
+      GlobalConstant.CFG_TYPE.LEARNED,
+    ] :
+    [GlobalConstant.CFG_TYPE.FED];
     let columnDefs = [
-      {
-        headerName: this.translate.instant('group.GROUP'),
-        field: 'group',
-        filter: 'agTextColumnFilter',
-        hide: source === GlobalConstant.NAV_SOURCE.GROUP,
-      },
       {
         headerComponent: ProcessProfileRuleNameHeaderComponent,
         headerCheckboxSelection: params => {
@@ -48,27 +48,15 @@ export class ProcessProfileRulesService {
           return (
             isWriteGroupAuthorized &&
             isWriteProcessProfileRuleAuthorized &&
-            [
-              GlobalConstant.CFG_TYPE.CUSTOMER,
-              GlobalConstant.CFG_TYPE.LEARNED,
-            ].includes(params.data.cfg_type)
+            groupConfigurableCfgTypes.includes(params.data.cfg_type)
           );
         },
         field: 'name',
         hide: !(
-          source === GlobalConstant.NAV_SOURCE.GROUP &&
           isWriteGroupAuthorized &&
           isWriteProcessProfileRuleAuthorized
         ),
       },
-      {
-        headerComponent: ProcessProfileRuleNameHeaderComponent,
-        field: 'name',
-        hide:
-          source === GlobalConstant.NAV_SOURCE.GROUP &&
-          isWriteGroupAuthorized &&
-          isWriteProcessProfileRuleAuthorized,
-      },
       {
         headerName: this.translate.instant('service.gridHeader.PATH'),
         field: 'path',

admin/webapp/websrc/app/routes/components/file-access-rules/file-access-rules.component.ts

@@ -248,9 +248,7 @@ export class FileAccessRulesComponent implements OnInit, OnChanges {
           return this.fileAccessRulesService.updateFileAccessRuleList(
             GlobalConstant.CRUD.D,
             this.selectedFileAccessRules,
-            this.source === GlobalConstant.NAV_SOURCE.FED_POLICY
-              ? data.group
-              : this.groupName
+            this.groupName
           );
         })
       )

admin/webapp/websrc/app/routes/components/process-profile-rules/partial/add-edit-process-profile-rule-modal/add-edit-process-profile-rule-modal.component.ts

@@ -79,10 +79,7 @@ export class AddEditProcessProfileRuleModalComponent implements OnInit {
     if (this.type === GlobalConstant.MODAL_OP.ADD) {
       this.processProfileRuleForm.reset();
     } else {
-      this.oldData =
-        this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
-          ? this.data.oldData
-          : this.data.oldData[0];
+      this.oldData = this.data.oldData[0];
       Object.keys(this.oldData).forEach((key: string) => {
         if (this.processProfileRuleForm.get(key)) {
           this.processProfileRuleForm

admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.html

@@ -232,8 +232,8 @@
       [groupName]="groupName"
       [resizableHeight]="height"
       [useQuickFilterService]="true"
-      (getSelectedFileAccessRules)="getSelectedFileAccessRules($event)"
       (getRemoveProfile)="getRemoveProfile($event)"
+      (getSelectedProcessProfileRules)="getSelectedProcessProfileRules($event)"
       (getEditProfile)="getEditProfile($event)"
       (getAddProfile)="getAddProfile($event)"
       (getShowPredefinedRules)="getShowPredefinedRules($event)"
@@ -251,7 +251,7 @@
       [groupName]="groupName"
       [resizableHeight]="height"
       [useQuickFilterService]="true"
-      (getSelectedProcessProfileRules)="getSelectedProcessProfileRules($event)"
+      (getSelectedFileAccessRules)="getSelectedFileAccessRules($event)"
       (getRemoveProfile)="getRemoveProfile($event)"
       (getEditProfile)="getEditProfile($event)"
       (getAddProfile)="getAddProfile($event)"