UI-API integration for web UI key (#6387)

* lint fixes Signed-off-by: Abdul-Az <aazeez@progress.com> * Added integration code Signed-off-by: Chaitali Mane <cmane@progress.com> Co-authored-by: Abdul-Az <aazeez@progress.com>
chef · Apr 22, 2022 · 971c9d1 · 971c9d1
1 parent 2fc3d6a
commit 971c9d1
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 39 deletions.
diff --git a/.../automate-ui/src/app/modules/infra-proxy/chef-servers-list/chef-servers-list.component.ts b/.../automate-ui/src/app/modules/infra-proxy/chef-servers-list/chef-servers-list.component.ts
@@ -70,9 +70,7 @@ export class ChefServersListComponent implements OnInit, OnDestroy {
       ]]
     });
     this.webUIKeyForm = this.fb.group({
-      webui_key: ['', [Validators.required,
-        Validators.pattern(Regex.patterns.NON_BLANK)
-      ]]
+      webui_key: ['', [Validators.required]]
     });
   }
 

diff --git a/...pp/modules/infra-proxy/create-chef-server-slider/create-chef-server-slider.component.html b/...pp/modules/infra-proxy/create-chef-server-slider/create-chef-server-slider.component.html
@@ -151,22 +151,23 @@ <h2 slot="title">Add Chef Infra Server </h2>
                 (keyup)="handleInput($event)"
                 autofocus></textarea>
             </label>
-            <chef-error class="textarea-error"
-              *ngIf="webUIKeyForm.get('webui_key').hasError('required') && webUIKeyForm.get('webui_key').dirty">
-              WEB UI KEY is required.
+            <chef-error
+            *ngIf="(webUIKeyForm.get('webui_key').hasError('required') || webUIKeyForm.get('webui_key').hasError('pattern')) && webUIKeyForm.get('webui_key').dirty">
+            WEB UI KEY is required.
             </chef-error>
+            <span class="note_text">Note: A web UI Key is located <a href=''>Here</a>(Need Better Help Text).</span>
           </chef-form-field>
         </div>
-        <span class="note_text">Note: A web UI Key is located <span>Here</span>(Need Better Help Text).</span>
-       <div id="button-bar">
+        <div id="button-bar">
           <chef-button id="cancel-server-popup" tertiary [disabled]="creating" (click)="closeSeverSlider()">Cancel</chef-button>
-          <chef-button [disabled]="!createForm?.valid || webUIKeyForm?.valid || creating || conflictError || (selected === 'fqdn') ? !fqdnForm?.valid : !ipForm?.valid"
-            primaryt
+          <chef-button
+            [disabled]="!createForm?.valid || !webUIKeyForm?.valid || creating || conflictError || ((selected === 'fqdn') ? !fqdnForm?.valid : !ipForm?.valid)"
+            primary
             data-cy="add-button"
             id="create-button-object-modal"
             (click)="createChefServer()">
             <chef-loading-spinner *ngIf="creating"></chef-loading-spinner>
-            <span *ngIf="!creating">Add</span>
+            <span *ngIf="!creating">Add Chef Infra Server</span>
             <span *ngIf="creating">Adding Chef Infra Server ...</span>
           </chef-button>
         </div>

diff --git a/...modules/infra-proxy/create-chef-server-slider/create-chef-server-slider.component.spec.ts b/...modules/infra-proxy/create-chef-server-slider/create-chef-server-slider.component.spec.ts
@@ -87,7 +87,7 @@ describe('CreateChefServerSliderComponent', () => {
         expect(createForm.valid).toBeFalsy();
         expect(fqdnForm.valid).toBeFalsy();
         expect(ipForm.valid).toBeFalsy();
-        expect(webUIKeyForm).toBeFalsy();
+        expect(webUIKeyForm.valid).toBeFalsy();
       });
 
       it('when name is missing', () => {

diff --git a/...omate-ui/src/app/modules/infra-proxy/policy-groups-list/policy-groups-list.component.html b/...omate-ui/src/app/modules/infra-proxy/policy-groups-list/policy-groups-list.component.html
@@ -13,7 +13,10 @@
             'organizations', orgId, 'policyGroups', policyGroup.policy_group]">{{policyGroup.policy_group}}</a>
           </app-authorized>
         </chef-td>
-        <chef-td>{{policyGroup.occurrence}}</chef-td>
+        <chef-td>
+          <app-authorized [allOf]="['/api/v0/infra/servers/{server_id}/orgs/{org_id}/policygroups/{name}', 'get', [serverId, orgId, policyGroup.policy_group]]">{{policyGroup.occurrence}}
+          </app-authorized>
+          </chef-td>
       </chef-tr>
   </chef-tbody>
 </chef-table>
diff --git a/e2e/cypress/integration/api/iam/infra_clients_actions.spec.ts b/e2e/cypress/integration/api/iam/infra_clients_actions.spec.ts
@@ -115,14 +115,14 @@ describe('Infra Clients get', () => {
 describe('Infra Clients create', () => {
     let withInfraServersClientCreateActionToken = '';
     let withoutInfraServersClientCreateActionToken = '';
-    
+
         const cypressPrefix = 'infra-server-client-actions-create';
         const policyId1 = `${cypressPrefix}-pol-1-${Cypress.moment().format('MMDDYYhhmm')}`;
         const policyId2 = `${cypressPrefix}-pol-2-${Cypress.moment().format('MMDDYYhhmm')}`;
         const tokenId1 = `${cypressPrefix}-token-1-${Cypress.moment().format('MMDDYYhhmm')}`;
         const tokenId2 = `${cypressPrefix}-token-2-${Cypress.moment().format('MMDDYYhhmm')}`;
         const objectsToCleanUp = ['tokens', 'policies'];
-    
+
         const withInfraServersClientCreatePolicy = {
         id: policyId1,
         name: tokenId1,
@@ -137,8 +137,8 @@ describe('Infra Clients create', () => {
                 projects: ['*']
             }]
         };
-    
-    
+
+
         const withoutInfraServersClientCreatePolicy = {
             id: policyId2,
             name: tokenId2,
@@ -153,10 +153,10 @@ describe('Infra Clients create', () => {
                 projects: ['*']
             }]
         };
-    
+
         before(() => {
             cy.cleanupIAMObjectsByIDPrefixes(cypressPrefix, objectsToCleanUp);
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -168,7 +168,7 @@ describe('Infra Clients create', () => {
                 }).then((resp) => {
                     withInfraServersClientCreateActionToken = resp.body.token.value;
                 });
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -177,7 +177,7 @@ describe('Infra Clients create', () => {
                 }).then((resp) => {
                     expect(resp.status).to.equal(200);
                 });
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -189,7 +189,7 @@ describe('Infra Clients create', () => {
                 }).then((resp) => {
                     withoutInfraServersClientCreateActionToken = resp.body.token.value;
                 });
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -199,11 +199,11 @@ describe('Infra Clients create', () => {
                     expect(resp.status).to.equal(200);
                 });
             });
-    
+
         after(() => {
             cy.cleanupIAMObjectsByIDPrefixes(cypressPrefix, objectsToCleanUp);
         });
-    
+
         it('client post returns 200 when create actions is allowed', () => {
             cy.request({
                 headers: { 'api-token': withInfraServersClientCreateActionToken },
@@ -215,12 +215,12 @@ describe('Infra Clients create', () => {
                     org_id: 'test-org',
                     server_id: 'local-dev',
                     validator: true
-                },
+                }
                 }).then((resp) => {
                     assert.equal(resp.status, 200);
                 });
         });
-    
+
         it('clients post returns 403 when create actions is denied', () => {
             cy.request({
                 headers: { 'api-token': withoutInfraServersClientCreateActionToken },
@@ -243,14 +243,14 @@ describe('Infra Clients create', () => {
     describe('Infra Reset Client Key', () => {
         let withInfraServersClientResetActionToken = '';
         let withoutInfraServersClientResetActionToken = '';
-    
+
         const cypressPrefix = 'infra-server-client-actions-reset';
         const policyId1 = `${cypressPrefix}-pol-1-${Cypress.moment().format('MMDDYYhhmm')}`;
         const policyId2 = `${cypressPrefix}-pol-2-${Cypress.moment().format('MMDDYYhhmm')}`;
         const tokenId1 = `${cypressPrefix}-token-1-${Cypress.moment().format('MMDDYYhhmm')}`;
         const tokenId2 = `${cypressPrefix}-token-2-${Cypress.moment().format('MMDDYYhhmm')}`;
         const objectsToCleanUp = ['tokens', 'policies'];
-    
+
         const withInfraServersClientResetPolicy = {
         id: policyId1,
         name: tokenId1,
@@ -265,8 +265,8 @@ describe('Infra Clients create', () => {
                 projects: ['*']
             }]
         };
-    
-    
+
+
         const withoutInfraServersClientResetPolicy = {
             id: policyId2,
             name: tokenId2,
@@ -281,10 +281,10 @@ describe('Infra Clients create', () => {
                 projects: ['*']
             }]
         };
-    
+
         before(() => {
             cy.cleanupIAMObjectsByIDPrefixes(cypressPrefix, objectsToCleanUp);
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -296,7 +296,7 @@ describe('Infra Clients create', () => {
                 }).then((resp) => {
                     withInfraServersClientResetActionToken = resp.body.token.value;
                 });
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -305,7 +305,7 @@ describe('Infra Clients create', () => {
                 }).then((resp) => {
                     expect(resp.status).to.equal(200);
                 });
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -317,7 +317,7 @@ describe('Infra Clients create', () => {
                 }).then((resp) => {
                     withoutInfraServersClientResetActionToken = resp.body.token.value;
                 });
-    
+
             cy.request({
                 headers: { 'api-token': Cypress.env('ADMIN_TOKEN') },
                 method: 'POST',
@@ -327,11 +327,11 @@ describe('Infra Clients create', () => {
                     expect(resp.status).to.equal(200);
                 });
             });
-    
+
         after(() => {
             cy.cleanupIAMObjectsByIDPrefixes(cypressPrefix, objectsToCleanUp);
         });
-    
+
         it('client put returns 403 when update actions is denied', () => {
             cy.request({
                 headers: { 'api-token': withoutInfraServersClientResetActionToken },
@@ -342,7 +342,7 @@ describe('Infra Clients create', () => {
                     assert.equal(resp.status, 403);
                 });
         });
-    
+
         it('client put returns 200 when update actions is allowed', () => {
             cy.request({
                 headers: { 'api-token': withInfraServersClientResetActionToken },

diff --git a/e2e/cypress/integration/api/iam/node_actions.spec.ts b/e2e/cypress/integration/api/iam/node_actions.spec.ts
@@ -339,5 +339,5 @@ describe('Nodes delete', () => {
             });
     });
 
- 
+
 });