Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shorten file paths containing cloudfoundry/cloud-foundry #4466

Merged
merged 17 commits into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions src/frontend/packages/cloud-foundry/sass/_all-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

@import '../src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.theme';
@import '../src/shared/components/schema-form/schema-form.component.theme';
@import '../src/features/cloud-foundry/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
@import '../src/features/cf/tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component.theme';
@import '../src/features/applications/deploy-application/deploy-application.component.theme';
@import '../src/features/applications/deploy-application/deploy-application-step2/deploy-application-fs/deploy-application-fs.component.theme';
@import '../src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme';
@import '../src/features/cf/tabs/cf-firehose/cloud-foundry-firehose.component.theme';

@mixin apply-theme-stratos-cloud-foundry($stratos-theme) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { cfEntityFactory } from '../cf-entity-factory';
import { organizationEntityType, quotaDefinitionEntityType, spaceQuotaEntityType } from '../cf-entity-types';
import { CFEntityConfig } from '../cf-types';
import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component';
import { CFStartAction } from './cf-action.types';

export const GET_QUOTA_DEFINITION = '[QuotaDefinition] Get one';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const customRoutes: Routes = [
},
{
path: 'cloud-foundry',
loadChildren: () => import('./features/cloud-foundry/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule),
loadChildren: () => import('./features/cf/cloud-foundry-section.module').then(m => m.CloudFoundrySectionModule),
data: {
stratosNavigation: {
label: 'Cloud Foundry',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { generateStratosEntities } from '../../store/src/stratos-entity-generato
import { testSCFEndpointGuid } from '../../store/testing/public-api';
import { BaseCfOrgSpaceRouteMock } from '../test-framework/cloud-foundry-endpoint-service.helper';
import { generateCFEntities } from './cf-entity-generator';
import { ActiveRouteCfOrgSpace } from './features/cloud-foundry/cf-page.types';
import { ActiveRouteCfOrgSpace } from './features/cf/cf-page.types';
import { CfUserService } from './shared/data-services/cf-user.service';
import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service';
import { GitSCMService } from './shared/data-services/scm/scm.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
UpdateQuotaDefinition,
} from '../actions/quota-definitions.actions';
import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component';

export interface QuotaDefinitionActionBuilder extends OrchestratedActionBuilders {
get: (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
UpdateSpaceQuotaDefinition,
} from '../actions/quota-definitions.actions';
import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
import { QuotaFormValues } from '../features/cf/quota-definition-form/quota-definition-form.component';

export interface SpaceQuotaDefinitionActionBuilders extends OrchestratedActionBuilders {
get: (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import {
import {
TableCellTCPRouteComponent,
} from '../../../shared/components/list/list-types/cf-routes/table-cell-tcproute/table-cell-tcproute.component';
import { isServiceInstance, isUserProvidedServiceInstance } from '../../cloud-foundry/cf.helpers';
import { isServiceInstance, isUserProvidedServiceInstance } from '../../cf/cf.helpers';
import { ApplicationService } from '../application.service';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
AppServiceBindingListConfigService,
} from '../../../../shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service';
import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service';
import { fetchTotalResults } from '../../../cloud-foundry/cf.helpers';
import { fetchTotalResults } from '../../../cf/cf.helpers';
import { ApplicationService } from '../../application.service';

@Injectable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
import {
CfAppInstancesConfigService,
} from '../../../../../../shared/components/list/list-types/app-instance/cf-app-instances-config.service';
import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/cf-page.types';
import { CloudFoundryEndpointService } from '../../../../../cloud-foundry/services/cloud-foundry-endpoint.service';
import { ActiveRouteCfOrgSpace } from '../../../../../cf/cf-page.types';
import { CloudFoundryEndpointService } from '../../../../../cf/services/cloud-foundry-endpoint.service';
import { ApplicationMonitorService } from '../../../../application-monitor.service';

@Component({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import { Store } from '@ngrx/store';
import { Observable, Subscription } from 'rxjs';
import { filter, first, map, tap } from 'rxjs/operators';

import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
import { organizationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
import { StepOnNextResult } from '../../../../core/src/shared/components/stepper/step/step.component';
import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
import { APIResource } from '../../../../store/src/types/api.types';
import { ISpaceQuotaDefinition } from '../../cf-api.types';
import { CFAppState } from '../../cf-app-state';
import { cfEntityCatalog } from '../../cf-entity-catalog';
import { organizationEntityType } from '../../cf-entity-types';
import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
import { ActiveRouteCfOrgSpace } from './cf-page.types';

export class AddEditSpaceStepBase {
Expand All @@ -35,8 +35,8 @@ export class AddEditSpaceStepBase {
this.orgGuid,
this.cfGuid,
getPaginationKey(organizationEntityType, this.orgGuid), {
flatten: true,
}
flatten: true,
}
).entities$.pipe(
filter(spaces => !!spaces),
map(spaces => spaces.map(space => space.entity.name)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@ import { Store } from '@ngrx/store';
import { Observable, Subscription } from 'rxjs';
import { filter, map, tap } from 'rxjs/operators';

import { CreateOrganization } from '../../../../../../cloud-foundry/src/actions/organization.actions';
import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
import {
createEntityRelationPaginationKey,
} from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
import { endpointEntityType } from '../../../../../../store/src/helpers/stratos-entity-factory';
import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
import { APIResource } from '../../../../../../store/src/types/api.types';
import { CreateOrganization } from '../../../../actions/organization.actions';
import { IOrganization, IOrgQuotaDefinition } from '../../../../cf-api.types';
import { CFAppState } from '../../../../cf-app-state';
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
import { organizationEntityType } from '../../../../cf-entity-types';
import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
import { createEntityRelationPaginationKey } from '../../../../entity-relations/entity-relations.types';
import { selectCfRequestInfo } from '../../../../store/selectors/api.selectors';
import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { FormGroup } from '@angular/forms';
import { Subscription } from 'rxjs';
import { filter, map, pairwise } from 'rxjs/operators';

import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { ActivatedRoute } from '@angular/router';
import { Observable, Subscription } from 'rxjs';
import { filter, map, pairwise } from 'rxjs/operators';

import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
import { APIResource } from '../../../../../../store/src/types/api.types';
import { IQuotaDefinition } from '../../../../cf-api.types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { Store } from '@ngrx/store';
import { Subscription } from 'rxjs';
import { filter, map, pairwise } from 'rxjs/operators';

import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
import { CFAppState } from '../../../../cf-app-state';
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
import { AddEditSpaceStepBase } from '../../add-edit-space-step-base';
import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { IMetrics } from '../../../../store/src/types/base-metric.types';
import { MetricQueryType } from '../../../../store/src/types/metric.types';
import { FetchCFCellMetricsPaginatedAction } from '../../actions/cf-metrics.actions';
import { CFEntityConfig } from '../../cf-types';
import { CellMetrics } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
import { CellMetrics } from './tabs/cf-cells/cloud-foundry-cell/cloud-foundry-cell.service';

export class CfCellHelper {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ import { Store } from '@ngrx/store';
import { combineLatest, Observable } from 'rxjs';
import { filter, first, map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';

import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers';
import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
import {
getCurrentUserCFEndpointRolesState,
} from '../../../../cloud-foundry/src/store/selectors/cf-current-user-role.selectors';
import { ICfRolesState } from '../../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
import { UserRoleLabels } from '../../../../cloud-foundry/src/store/types/users-roles.types';
import { PermissionConfig } from '../../../../core/src/core/permissions/current-user-permissions.config';
import { CurrentUserPermissionsService } from '../../../../core/src/core/permissions/current-user-permissions.service';
import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service';
Expand All @@ -29,9 +21,14 @@ import { EndpointModel } from '../../../../store/src/types/endpoint.types';
import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
import { IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
import { CFFeatureFlagTypes, IApp, ISpace } from '../../cf-api.types';
import { CFAppState } from '../../cf-app-state';
import { cfEntityFactory } from '../../cf-entity-factory';
import { getCFEntityKey } from '../../cf-entity-helpers';
import { applicationEntityType } from '../../cf-entity-types';
import { CFEntityConfig } from '../../cf-types';
import { ListCfRoute } from '../../shared/components/list/list-types/cf-routes/cf-routes-data-source-base';
import { getCurrentUserCFEndpointRolesState } from '../../store/selectors/cf-current-user-role.selectors';
import { ICfRolesState } from '../../store/types/cf-current-user-roles.types';
import {
CfUser,
CfUserRoleParams,
Expand All @@ -40,6 +37,7 @@ import {
UserRoleInOrg,
UserRoleInSpace,
} from '../../store/types/cf-user.types';
import { UserRoleLabels } from '../../store/types/users-roles.types';
import { CfCurrentUserPermissions, CfPermissionTypes } from '../../user-permissions/cf-user-permissions-checkers';
import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import { Store } from '@ngrx/store';
import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
import { first, map } from 'rxjs/operators';

import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
import { CFAppCLIInfoContext } from '../../../../../cloud-foundry/src/shared/components/cli-info/cli-info.component';
import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
import { RouterNav } from '../../../../../store/src/actions/router.actions';
import { getFullEndpointApiUrl } from '../../../../../store/src/endpoint-utils';
import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
import { IOrganization, ISpace } from '../../../cf-api.types';
import { CFAppState } from '../../../cf-app-state';
import { CFAppCLIInfoContext } from '../../../shared/components/cli-info/cli-info.component';
import {
CloudFoundryUserProvidedServicesService,
} from '../../../shared/services/cloud-foundry-user-provided-services.service';
Expand Down
Loading