Added users tab in server details page (#5802)

* Added Users tab UI Signed-off-by: chaitali-mane <cmane@progress.com> * Added enitites api integration Signed-off-by: chaitali-mane <cmane@progress.com> * minor changes Signed-off-by: chaitali-mane <cmane@progress.com> * Updated minor change Signed-off-by: chaitali-mane <cmane@progress.com>
chef · Feb 25, 2022 · 5c81f71 · 5c81f71
1 parent bf1c650
commit 5c81f71
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/components/automate-ui/src/app/entities/servers/server.actions.ts b/components/automate-ui/src/app/entities/servers/server.actions.ts
@@ -150,7 +150,6 @@ export class GetUsers implements Action {
 
 export class GetUsersSuccess implements Action {
   readonly type = ServerActionTypes.GET_USERS_SUCCESS;
-
   constructor(public payload: UsersSuccessPayload) { }
 }
 

diff --git a/components/automate-ui/src/app/entities/servers/server.model.ts b/components/automate-ui/src/app/entities/servers/server.model.ts
@@ -30,3 +30,13 @@ export interface MigrationStatus {
   migration_type: string;
   migration_status: string;
 }
+
+export interface User {
+  id: string;
+  server_id: string;
+  infra_server_username: string;
+  credential_id: string;
+  connector: string;
+  automate_user_id: string;
+  is_server_admin: boolean;
+}
diff --git a/...ate-ui/src/app/modules/infra-proxy/chef-server-details/chef-server-details.component.html b/...ate-ui/src/app/modules/infra-proxy/chef-server-details/chef-server-details.component.html
@@ -10,6 +10,7 @@
       </chef-breadcrumbs>
       <chef-page-header>
         <div class="meta-box">
+<<<<<<< HEAD
           <p class="chef-server-info-text">CHEF SERVER INFORMATION</p>
           <div class="summary-body first">
             <ul>
@@ -111,6 +112,26 @@
             <!-- <chef-option value='users' data-cy="users-tab">Users</chef-option> -->
             <chef-option value='details' data-cy="details-tab">Details</chef-option>
           </app-authorized>
+=======
+          <div class="summary-body">
+            <chef-heading data-cy="page-title">{{ server?.name }}</chef-heading>
+            <ul>
+              <li>
+                <span class="heading">FQDN</span>
+                <span data-cy="node-env">{{ server?.fqdn }}</span>
+              </li>
+              <li>
+                <span class="heading">IP Address</span>
+                <span>{{ server?.ip_address }}</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <chef-tab-selector [value]="tabValue" (change)="onSelectedTab($event)">
+          <chef-option value='orgs' data-cy="orgs-tab">Orgs</chef-option>
+          <chef-option value='users' data-cy="users-tab">Users</chef-option>
+          <chef-option value='details' data-cy="details-tab">Details</chef-option>
+>>>>>>> f4f1ece86 (Added users tab in server details page (#5802))
         </chef-tab-selector>
       </chef-page-header>
       <app-create-org-modal

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
@@ -144,12 +144,9 @@ export class ChefServersListComponent implements OnInit, OnDestroy {
       webui_key: this.webUIKeyForm.controls['webui_key'].value || ''
     };
     this.store.dispatch(new CreateServer(server));
-<<<<<<< HEAD
     this.telemetryService.track('InfraServer_Add_Chef_InfraServer');
     this.creatingChefServer = false;
     this.createChefServerForm.reset();
-=======
->>>>>>> d7dca2875 (Add changes for the create server slider (#5755))
     this.resetCreateModal();
   }