Merge branch 'v3-master' into merge-v2-master

* v3-master:
  Temp fix for linting
  Remove some duped reducers - all other cf specific reducers/functions should move out following #3789
  Fix linting

src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts

@@ -3,17 +3,15 @@ import { MatDialog } from '@angular/material';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
-import {
-  CloudFoundryEndpointService,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import {
-  UserInviteConfigurationDialogComponent,
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component';
 import {
   UserInviteService,
 } from '../../../../../../cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service';
 import { ICfV2Info } from '../../../../../../core/src/core/cf-api.types';
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
+import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import {
+  UserInviteConfigurationDialogComponent,
+} from '../../../../features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component';
 
 @Component({
   selector: 'app-card-cf-info',

src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts

@@ -1,3 +1,4 @@
+// tslint:disable:max-line-length
 import { CommonModule } from '@angular/common';
 import { ApplicationModule, NgModule } from '@angular/core';
 import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
@@ -6,6 +7,9 @@ import { CoreModule } from '../../../../core/src/core/core.module';
 import {
   TableCellCfCellComponent,
 } from '../../../../core/src/shared/components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component';
+import {
+  TableCellQuotaComponent,
+} from '../../../../core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import {
   AddServiceInstanceBaseStepComponent,
@@ -127,7 +131,8 @@ import { SelectServiceComponent } from './select-service/select-service.componen
 import { ServiceIconComponent } from './service-icon/service-icon.component';
 import { ServicePlanPriceComponent } from './service-plan-price/service-plan-price.component';
 import { ServicePlanPublicComponent } from './service-plan-public/service-plan-public.component';
-import { TableCellQuotaComponent } from '../../../../core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
+
+// tslint:enable:max-line-length
 
 @NgModule({
   imports: [

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts

@@ -6,9 +6,6 @@ import { switchMap } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { isServiceInstance } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import {
-  TableCellServiceInstanceTagsComponent,
-} from '../../../../../../../cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
 import { IServiceBinding } from '../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
@@ -20,6 +17,9 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
+import {
+  TableCellServiceInstanceTagsComponent,
+} from '../cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
 import { AppServiceBindingCardComponent } from './app-service-binding-card/app-service-binding-card.component';
 import { AppServiceBindingDataSource } from './app-service-binding-data-source';
 

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts

@@ -1,3 +1,4 @@
+// tslint:disable:max-line-length
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
@@ -24,6 +25,8 @@ import {
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source';
 
+// tslint:enable:max-line-length
+
 @Injectable()
 export class CfCellHealthListConfigService extends BaseCfListConfig<CfCellHealthEntry> {
 

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts

@@ -1,3 +1,4 @@
+// tslint:disable:max-line-length
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
@@ -18,6 +19,8 @@ import { ActiveRouteCfCell } from '../../../../../features/cloud-foundry/cf-page
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellsDataSource } from './cf-cells-data-source';
 
+// tslint:enable:max-line-length
+
 @Injectable()
 export class CfCellsListConfigService extends BaseCfListConfig<IMetricVectorResult<IMetricCell>> {
 

src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts → src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers.ts

@@ -1,19 +1,11 @@
-import { ChangeUserRole } from '../../../../cloud-foundry/src/actions/users.actions';
-import {
-  defaultUserOrgRoleState,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-org.reducer';
-import {
-  defaultUserSpaceRoleState,
-} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer';
-import {
-  ICfRolesState,
-  IOrgRoleState,
-  ISpaceRoleState,
-} from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
-import { PermissionStrings } from '../../../../core/src/core/current-user-permissions.config';
-import { ICurrentUserRolesState } from '../../types/current-user-roles.types';
-import { APISuccessOrFailedAction } from '../../types/request.types';
-import { OrgUserRoleNames, SpaceUserRoleNames } from '../../../../cloud-foundry/src/store/types/user.types';
+import { PermissionStrings } from '../../../../../core/src/core/current-user-permissions.config';
+import { ICurrentUserRolesState } from '../../../../../store/src/types/current-user-roles.types';
+import { APISuccessOrFailedAction } from '../../../../../store/src/types/request.types';
+import { ChangeUserRole } from '../../../actions/users.actions';
+import { ICfRolesState, IOrgRoleState, ISpaceRoleState } from '../../types/cf-current-user-roles.types';
+import { OrgUserRoleNames, SpaceUserRoleNames } from '../../types/user.types';
+import { defaultUserOrgRoleState } from './current-user-roles-org.reducer';
+import { defaultUserSpaceRoleState } from './current-user-roles-space.reducer';
 
 export function updateAfterRoleChange(
   state: ICurrentUserRolesState,

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-orgs.reducer.ts

@@ -1,6 +1,9 @@
+import {
+  addNewRoles,
+  removeOldRoles,
+} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
 import { IOrgsRoleState } from '../../types/cf-current-user-roles.types';
-import { addNewRoles, removeOldRoles } from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { currentUserOrgRoleReducer } from './current-user-roles-org.reducer';
 
 export function currentUserOrgRolesReducer(state: IOrgsRoleState = {}, action: GetCurrentUserRelationsComplete) {

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts

@@ -1,7 +1,7 @@
-import { UserRelationTypes } from '../../../actions/permissions.actions';
+import { ISpace } from '../../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { UserRelationTypes } from '../../../actions/permissions.actions';
 import { ISpaceRoleState } from '../../types/cf-current-user-roles.types';
-import { ISpace } from '../../../../../core/src/core/cf-api.types';
 
 export const defaultUserSpaceRoleState: ISpaceRoleState = {
   orgId: null,

src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-spaces.reducer.ts

@@ -1,6 +1,9 @@
+import {
+  addNewRoles,
+  removeOldRoles,
+} from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { GetCurrentUserRelationsComplete } from '../../../actions/permissions.actions';
 import { ISpacesRoleState } from '../../types/cf-current-user-roles.types';
-import { addNewRoles, removeOldRoles } from '../../../../../store/src/reducers/current-user-roles-reducer/current-user-reducer.helpers';
 import { currentUserSpaceRoleReducer } from './current-user-roles-space.reducer';
 
 export function currentUserSpaceRolesReducer(state: ISpacesRoleState = {}, action: GetCurrentUserRelationsComplete) {

src/frontend/packages/store/src/reducers/current-user-roles-reducer/current-user-roles.reducer.ts

@@ -17,6 +17,9 @@ import { ADD_ROLE_SUCCESS, REMOVE_ROLE_SUCCESS } from '../../../../cloud-foundry
 import {
   currentUserBaseCFRolesReducer,
 } from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-base-cf-role.reducer';
+import {
+  updateAfterRoleChange,
+} from '../../../../cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-changed.reducers';
 import { SESSION_VERIFIED, VerifiedSession } from '../../actions/auth.actions';
 import {
   CONNECT_ENDPOINTS_SUCCESS,
@@ -32,7 +35,6 @@ import {
   currentUserRolesRequestStateReducer,
 } from './current-user-request-state.reducers';
 import { roleInfoFromSessionReducer, updateNewlyConnectedEndpoint } from './current-user-role-session.reducer';
-import { updateAfterRoleChange } from './current-user-roles-changed.reducers';
 import { addEndpoint, removeEndpointRoles, removeOrgRoles, removeSpaceRoles } from './current-user-roles-clear.reducers';
 
 const getDefaultState = () => ({