Tweaks

cloudfoundry · KlapTrap · Feb 19, 2019 · Jan 25, 2019 · Jan 25, 2019 · Jan 25, 2019
commit 1da601ceb7754102cd462dc5e9967bf4d521434e
diff --git a/src/frontend/app/features/cloud-foundry/user-invites/user-invite.service.ts b/src/frontend/app/features/cloud-foundry/user-invites/user-invite.service.ts
@@ -15,17 +15,17 @@ import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.
 
 const { proxyAPIVersion } = environment;
 
-export interface UserInviteResponse {
+export interface UserInviteBaseResponse {
   error: boolean;
   errorMessage?: string;
 }
 
-export interface UserInviteSendUaaResponse {
-  failed_invites: UserInviteSendUaaSectionResponse[];
-  new_invites: UserInviteSendUaaSectionResponse[];
+export interface UserInviteResponseUaa {
+  failed_invites: UserInviteResponseUaaSection[];
+  new_invites: UserInviteResponseUaaSection[];
 }
 
-export interface UserInviteSendUaaSectionResponse {
+export interface UserInviteResponseUaaSection {
   email: string;
   errorCode: string;
   errorMessage: string;
@@ -34,7 +34,7 @@ export interface UserInviteSendUaaSectionResponse {
   userid: string;
 }
 
-export interface UserInviteSendResponse extends UserInviteResponse, UserInviteSendUaaResponse {
+export interface UserInviteSendResponse extends UserInviteBaseResponse, UserInviteResponseUaa {
 }
 
 export enum UserInviteSendSpaceRoles {
@@ -43,7 +43,7 @@ export enum UserInviteSendSpaceRoles {
   manager = 'manager'
 }
 
-interface UserInviteSendRequest {
+interface UserInviteSend {
   org: string;
   space: string;
   spaceRoles: { [spaceRole: string]: boolean };
@@ -72,7 +72,7 @@ export class UserInviteService {
     );
   }
 
-  configure(cfGUID: string, clientID: string, clientSecret: string): Observable<UserInviteResponse> {
+  configure(cfGUID: string, clientID: string, clientSecret: string): Observable<UserInviteBaseResponse> {
     const formData: FormData = new FormData();
     formData.append('client_id', clientID);
     formData.append('client_secret', clientSecret);
@@ -110,7 +110,7 @@ export class UserInviteService {
     return obs$;
   }
 
-  unconfigure(cfGUID: string): Observable<UserInviteResponse> {
+  unconfigure(cfGUID: string): Observable<UserInviteBaseResponse> {
     const url = `/pp/${proxyAPIVersion}/invite/${cfGUID}`;
     return this.http.delete(url).pipe(
       map(v => {
@@ -151,7 +151,7 @@ export class UserInviteService {
 
   invite(cfGuid: string, orgGuid: string, spaceGuid: string, spaceRole: UserInviteSendSpaceRoles, emails: string[]):
     Observable<UserInviteSendResponse> {
-    const users: UserInviteSendRequest = {
+    const users: UserInviteSend = {
       org: orgGuid,
       space: spaceGuid,
       spaceRoles: {
@@ -160,7 +160,7 @@ export class UserInviteService {
       emails
     };
     return this.http.post(`/pp/${proxyAPIVersion}/invite/send/${cfGuid}`, users).pipe(
-      map((response: UserInviteSendUaaResponse) => ({
+      map((response: UserInviteResponseUaa) => ({
         error: response.failed_invites.length > 0,
         ...response
       })),

diff --git a/...res/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts b/...res/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
@@ -96,7 +96,7 @@ export class InviteUsersCreateComponent implements OnInit {
 
     // Mark all as processing
     const processingState: StackedInputActionsState[] = [];
-    Object.entries(this.users.values).forEach(([key, value]) => {
+    Object.keys(this.users.values).forEach(key => {
       processingState.push({
         key,
         result: StackedInputActionResult.PROCESSING,
@@ -113,10 +113,10 @@ export class InviteUsersCreateComponent implements OnInit {
       Object.values(this.users.values)).pipe(
         map(res => {
           if (!res.error && res.failed_invites.length === 0) {
-            // Clear all paginations of type users for this endpoint
+            // Success! Clear all paginations of type users such that lists can be refetched with new user.s
             this.store.dispatch(new ClearPaginationOfType(cfUserSchemaKey));
           } else if (res.failed_invites.length > 0) {
-            // Push failures back into components
+            // One or more failed. Push failures back into components
             const newState: StackedInputActionsState[] = [];
             Object.entries(this.users.values).forEach(([key, email]) => {
               // Update failed users
@@ -139,14 +139,14 @@ export class InviteUsersCreateComponent implements OnInit {
                 });
                 return;
               }
-              // Can't find user for unknown reason, set to failed to can try again
+              // Can't find user for unknown reason, set to failed so it can be tried again
               newState.push({
                 key,
                 result: StackedInputActionResult.FAILED,
                 message: 'No response for user found'
               });
             });
-            // We've just come from a valid state, so this should be valid again
+            // We've just come from a valid state, so form should be valid again
             this.stepValid.next(true);
             this.stateIn.next(newState);
             res.errorMessage = 'Failed to invite one or more users. Please address per user message and try again';

diff --git a/...res/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts b/...res/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
@@ -48,9 +48,6 @@ import { getRowMetadata } from '../../../cf.helpers';
 import { CfRolesService } from '../cf-roles.service';
 import { SpaceRolesListWrapperComponent } from './space-roles-list-wrapper/space-roles-list-wrapper.component';
 
-/* tslint:disable:max-line-length */
-/* tslint:enable:max-line-length */
-
 interface Org { metadata: { guid: string }; }
 interface CfUserWithWarning extends CfUser {
   showWarning: boolean;

diff --git a/...components/stacked-input-actions/stacked-input-action/stacked-input-action.component.html b/...components/stacked-input-actions/stacked-input-action/stacked-input-action.component.html
@@ -1,4 +1,3 @@
-<!-- // TODO: rc generic validation OR change name -->
 <div class="input-action">
   <form class="input-action__form stepper-form">
     <mat-form-field class="">
@@ -15,12 +14,10 @@
     </mat-form-field>
   </form>
   <div class="input-action__detail">
-    <div style="width: 24px;" *ngIf="showRemove">
-      <mat-icon class="input-action__detail__remove" [ngClass]="{'disabled': emailFormControl.disabled}" (click)="!emailFormControl.disabled && remove.emit()" [matTooltip]="'Remove'">indeterminate_check_box</mat-icon>
-    </div>
-    <div *ngIf="state" class="input-action__detail__result">
-      <app-boolean-indicator *ngIf="state.result === result.SUCCEEDED || state.result === result.FAILED" [isTrue]="state.result === result.SUCCEEDED" type="succeeded-failed" [subtle]="false" [showText]="false"></app-boolean-indicator>
+    <mat-icon *ngIf="showRemove" class="input-action__detail__remove" [ngClass]="{'disabled': emailFormControl.disabled}" (click)="!emailFormControl.disabled && remove.emit()" [matTooltip]="'Remove'">indeterminate_check_box</mat-icon>
+    <ng-container *ngIf="state && result && (state.result === result.SUCCEEDED || state.result === result.FAILED)" class="input-action__detail__result">
+      <app-boolean-indicator [isTrue]="state.result === result.SUCCEEDED" type="succeeded-failed" [subtle]="false" [showText]="false"></app-boolean-indicator>
       <span>{{ state.message }}</span>
-    </div>
+    </ng-container>
   </div>
 </div>
diff --git a/...components/stacked-input-actions/stacked-input-action/stacked-input-action.component.scss b/...components/stacked-input-actions/stacked-input-action/stacked-input-action.component.scss
@@ -1,21 +1,22 @@
 .input-action {
   align-items: center;
   display: flex;
-  // flex-direction: row;
 
-   > *, &__detail > *, &__detail__result app-boolean-indicator { // TODO: RC flatten
-    margin-right: 10px;
-   }
+  $margin: 10px;
 
   &__form {
     align-items: center;
     flex: 1;
     flex-direction: row;
+    margin-right: $margin;
   }
   &__detail {
     align-items: center;
     display: flex;
     margin-top: 20px;
+    > * {
+      margin-right: $margin;
+    }
 
     &__remove {
       cursor: pointer;
@@ -25,13 +26,8 @@
       }
     }
 
-    &__result {
-      align-items: center;
-      display: flex;
-      app-boolean-indicator {
-        // margin-right: 10px;
-      }
+    app-boolean-indicator {
+      width: 20px;
     }
   }
-
-}
+}
diff --git a/...d/components/stacked-input-actions/stacked-input-action/stacked-input-action.component.ts b/...d/components/stacked-input-actions/stacked-input-action/stacked-input-action.component.ts
@@ -28,6 +28,9 @@ export interface StackedInputActionUpdate {
   valid: boolean;
 }
 
+/**
+ * Individual email input field meant to be stacked amongst others of same type in a . Used in conjunction with StackedInputActionsComponent
+ */
 @Component({
   selector: 'app-stacked-input-action',
   templateUrl: './stacked-input-action.component.html',

diff --git a/src/frontend/app/shared/components/stacked-input-actions/stacked-input-actions.component.ts b/src/frontend/app/shared/components/stacked-input-actions/stacked-input-actions.component.ts
@@ -29,6 +29,9 @@ export interface StackedInputActionsState {
 
 export interface StackedInputActionsUpdate { values: { [key: string]: string }; valid: boolean; }
 
+/**
+ * Host for a collection of StackedInputActionComponent components
+ */
 @Component({
   selector: 'app-stacked-input-actions',
   templateUrl: './stacked-input-actions.component.html',
@@ -55,7 +58,6 @@ export class StackedInputActionsComponent implements OnInit, OnDestroy {
       update: StackedInputActionUpdate
     }
   } = {};
-  // private valueState: { [key: number]: StackedInputActionUpdate } = {};
   private subs: Subscription[] = [];
 
   constructor(