From 872d34dd659d3df99270eab8726fc035e26a5c2d Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 5 May 2020 14:18:03 +0100 Subject: [PATCH 01/15] Fixes following merge --- .../backup-endpoints/backup-endpoints.component.html | 2 +- src/jetstream/plugins/monocular/sync.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html index bfbec70bda..f11198e59d 100644 --- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html +++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html @@ -14,7 +14,7 @@

Backup Endpoints

- +

There are no endpoints to backup

diff --git a/src/jetstream/plugins/monocular/sync.go b/src/jetstream/plugins/monocular/sync.go index 1c4d5969ce..ab1e6c3460 100644 --- a/src/jetstream/plugins/monocular/sync.go +++ b/src/jetstream/plugins/monocular/sync.go @@ -68,7 +68,7 @@ func (m *Monocular) Sync(action interfaces.EndpointAction, endpoint *interfaces. Status: "Pending", Busy: true, } - m.portalProxy.UpdateEndointMetadata(endpoint.GUID, marshalSyncMetadata(metadata)) + m.portalProxy.UpdateEndpointMetadata(endpoint.GUID, marshalSyncMetadata(metadata)) // Add the job to the queue to be processed job := SyncJob{ @@ -127,7 +127,7 @@ func (m *Monocular) processSyncRequests() { Status: "Synchronizing", Busy: true, } - m.portalProxy.UpdateEndointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata)) + m.portalProxy.UpdateEndpointMetadata(job.Endpoint.GUID, marshalSyncMetadata(metadata)) syncURL := fmt.Sprintf("%s%s/sync/%s", m.SyncServiceURL, chartRepoPathPrefix, job.Endpoint.Name) //Hit the sync server container endpoint to trigger a sync for given repo @@ -228,7 +228,7 @@ func marshalSyncMetadata(metadata SyncMetadata) string { } func (m *Monocular) updateMetadata(endpoint string, metadata SyncMetadata) { - err := m.portalProxy.UpdateEndointMetadata(endpoint, marshalSyncMetadata(metadata)) + err := m.portalProxy.UpdateEndpointMetadata(endpoint, marshalSyncMetadata(metadata)) if err != nil { log.Errorf("Failed to update endpoint metadata: %v+", err) } From 5651d91fdfe6c395a829bd18cf9db1c78b14199e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 11:20:49 +0100 Subject: [PATCH 02/15] Fix entity-catalog.service --> entity-catalog file change --- .../helm/create-release/create-release.component.ts | 2 +- .../frontend/app/custom/helm/helm-testing.module.ts | 3 ++- .../monocular-repository-list-config.service.ts | 2 +- custom-src/frontend/app/custom/helm/store/helm.effects.ts | 8 ++++---- .../app/custom/kubernetes/kubernetes.testing.module.ts | 2 +- .../kubernetes-pod-containers.component.ts | 2 +- .../app/custom/kubernetes/store/kubernetes.effects.ts | 2 +- .../kubernetes-summary.component.ts | 4 ++-- .../helm-release-tab-base.component.ts | 2 +- .../workloads/release/tabs/helm-release-helper.service.ts | 2 +- .../kubernetes/workloads/store/workloads.effects.ts | 2 +- 11 files changed, 16 insertions(+), 15 deletions(-) diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index 87e87edc6b..60dd7f0190 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -10,7 +10,7 @@ import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rx import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators'; import { AppState } from '../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog'; import { EndpointsService } from '../../../core/endpoints.service'; import { safeUnsubscribe } from '../../../core/utils.service'; import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; diff --git a/custom-src/frontend/app/custom/helm/helm-testing.module.ts b/custom-src/frontend/app/custom/helm/helm-testing.module.ts index 62765f8b0d..be42355419 100644 --- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts +++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts @@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module'; -import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog'; import { createBasicStoreModule } from '../../../../store/testing/public-api'; import { generateStratosEntities } from '../../base-entity-types'; import { CoreModule } from '../../core/core.module'; @@ -13,6 +13,7 @@ import { SharedModule } from '../../shared/shared.module'; import { HelmReleaseGuid } from '../kubernetes/workloads/workload.types'; import { generateHelmEntities } from './helm-entity-generator'; + @NgModule({ imports: [{ ngModule: EntityCatalogFeatureModule, diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts index b3d343ef8c..de28838e2b 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts +++ b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts @@ -4,7 +4,7 @@ import { MatSnackBar } from '@angular/material'; import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; import { UnregisterEndpoint } from 'frontend/packages/store/src/actions/endpoint.actions'; -import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; import { endpointSchemaKey } from 'frontend/packages/store/src/helpers/entity-factory'; import { selectDeletionInfo } from 'frontend/packages/store/src/selectors/api.selectors'; import { of as observableOf } from 'rxjs'; diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/custom-src/frontend/app/custom/helm/store/helm.effects.ts index 4d3d1534dd..e79232c5d9 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts +++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts @@ -2,9 +2,10 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { Action, Store } from '@ngrx/store'; +import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from 'frontend/packages/store/src/actions/endpoint.actions'; import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions'; import { AppState } from 'frontend/packages/store/src/app-state'; -import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers'; import { NormalizedResponse } from 'frontend/packages/store/src/types/api.types'; import { @@ -13,11 +14,12 @@ import { WrapperRequestActionFailed, WrapperRequestActionSuccess, } from 'frontend/packages/store/src/types/request.types'; -import { Observable, of } from 'rxjs'; +import { Observable } from 'rxjs'; import { catchError, flatMap, mergeMap } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { isJetstreamError } from '../../../jetstream.helpers'; +import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; import { GET_HELM_VERSIONS, GET_MONOCULAR_CHARTS, @@ -27,8 +29,6 @@ import { HelmInstall, } from './helm.actions'; import { HelmVersion } from './helm.types'; -import { GetAllEndpointsSuccess, GET_ENDPOINTS_SUCCESS } from 'frontend/packages/store/src/actions/endpoint.actions'; -import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; @Injectable() export class HelmEffects { diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts index 9aa2016dfd..05ecca6666 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts @@ -4,7 +4,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module'; -import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog'; import { createBasicStoreModule } from '../../../../store/testing/public-api'; import { generateStratosEntities } from '../../base-entity-types'; import { CoreModule } from '../../core/core.module'; diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts index ecc31b5654..f83718f337 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts @@ -6,7 +6,7 @@ import { of } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { AppState } from '../../../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog'; import { selectEntity } from '../../../../../../../store/src/selectors/api.selectors'; import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component'; import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types'; diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts index d5d36df44d..c55b3cca8a 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts @@ -9,7 +9,7 @@ import { of } from 'rxjs'; import { catchError, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators'; import { AppState } from '../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog'; import { NormalizedResponse } from '../../../../../store/src/types/api.types'; import { StartRequestAction, diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts index a7c14df6ce..5f7d4cdd5d 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts @@ -1,12 +1,13 @@ import { HttpClient } from '@angular/common/http'; import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; import { SafeResourceUrl } from '@angular/platform-browser'; +import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { combineLatest, interval, Observable, Subscription } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { AppState } from '../../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; @@ -17,7 +18,6 @@ import { } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types'; import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; import { GetKubernetesNamespaces, GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions'; -import { Router } from '@angular/router'; interface IValueLabels { usedLabel?: string; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts index 0787289ab5..f3d8d9927a 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts @@ -4,7 +4,7 @@ import { Store } from '@ngrx/store'; import { LoggerService } from 'frontend/packages/core/src/core/logger.service'; import { IPageSideNavTab } from 'frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component'; import { AppState } from 'frontend/packages/store/src/app-state'; -import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; import { PaginatedAction } from 'frontend/packages/store/src/types/pagination.types'; import { EntityRequestAction, WrapperRequestActionSuccess } from 'frontend/packages/store/src/types/request.types'; import { Observable, Subject, Subscription } from 'rxjs'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts index 723a77bd33..aa8a7b73c9 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from 'frontend/packages/store/src/app-state'; -import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service'; import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory'; import { selectEntity } from 'frontend/packages/store/src/selectors/api.selectors'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts index 10656a97fc..086bc29fd8 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts @@ -7,7 +7,7 @@ import { Observable } from 'rxjs'; import { catchError, flatMap, mergeMap } from 'rxjs/operators'; import { AppState } from '../../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service'; +import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; import { NormalizedResponse } from '../../../../../../store/src/types/api.types'; import { EntityRequestAction, From cca5f7b4f3d02ac57c37d852b0b67aa254436dc8 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 7 May 2020 14:16:46 +0100 Subject: [PATCH 03/15] WIP --- .../app/custom/helm/helm-entity-generator.ts | 2 +- .../kubernetes/kubernetes-entity-catalog.ts | 7 ++ .../kubernetes/kubernetes-entity-generator.ts | 79 ++++++++++++++----- .../action-builders/kube.action-builders.ts | 76 ++++++++++++++++++ .../kubernetes/store/kubernetes.actions.ts | 30 ++++--- .../kubernetes/store/kubernetes.effects.ts | 19 ++--- .../store/workloads-entity-generator.ts | 2 +- .../card-autoscaler-default.component.spec.ts | 4 +- ...p-autoscaler-events-config.service.spec.ts | 4 +- ...scaler-metric-chart-card.component.spec.ts | 2 +- ...r-metric-chart-list-config.service.spec.ts | 4 +- .../metrics/metrics/metrics.component.html | 19 +++-- .../core/test-framework/core-test.helper.ts | 4 +- 13 files changed, 196 insertions(+), 56 deletions(-) create mode 100644 custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts create mode 100644 custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts index aef2cffc53..0fb65457a6 100644 --- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts +++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts @@ -2,7 +2,7 @@ import { StratosBaseCatalogEntity, StratosCatalogEndpointEntity, StratosCatalogEntity, -} from '../../../../store/src/entity-catalog/entity-catalog-entity'; +} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts new file mode 100644 index 0000000000..dbadecc336 --- /dev/null +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts @@ -0,0 +1,7 @@ +/** + * A strongly typed collection of Kube Catalog Entities. + * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc + */ +export class KubeEntityCatalog { + +} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts index cd4b43f25a..7beff79804 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts @@ -5,8 +5,11 @@ import { StratosBaseCatalogEntity, StratosCatalogEndpointEntity, StratosCatalogEntity, -} from '../../../../store/src/entity-catalog/entity-catalog-entity'; -import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types'; +} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; +import { + IStratosEntityDefinition, + StratosEndpointExtensionDefinition, +} from '../../../../store/src/entity-catalog/entity-catalog.types'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { EndpointAuthTypeConfig, EndpointType } from '../../core/extension/extension-types'; import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component'; @@ -29,6 +32,24 @@ import { kubernetesServicesEntityType, kubernetesStatefulSetsEntityType, } from './kubernetes-entity-factory'; +import { + KubeAppActionBuilders, + kubeAppActionBuilders, + KubeDashboardActionBuilders, + kubeDashboardActionBuilders, + KubeDeploymentActionBuilders, + kubeDeploymentActionBuilders, + KubeNamespaceActionBuilders, + kubeNamespaceActionBuilders, + KubeNodeActionBuilders, + kubeNodeActionBuilders, + KubePodActionBuilders, + kubePodActionBuilders, + KubeServiceActionBuilders, + kubeServiceActionBuilders, + KubeStatefulSetsActionBuilders, + kubeStatefulSetsActionBuilders, +} from './store/action-builders/kube.action-builders'; import { KubernetesApp, KubernetesDeployment, @@ -160,79 +181,97 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi } function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesAppsEntityType, schema: kubernetesEntityFactory(kubernetesAppsEntityType), - endpoint: endpointDefinition + endpoint: endpointDefinition, + }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubeAppActionBuilders + }); } function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesStatefulSetsEntityType, schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubeStatefulSetsActionBuilders + }); } function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesPodsEntityType, schema: kubernetesEntityFactory(kubernetesPodsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubePodActionBuilders + }); } function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesDeploymentsEntityType, schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubeDeploymentActionBuilders + }); } function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesNodesEntityType, schema: kubernetesEntityFactory(kubernetesNodesEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubeNodeActionBuilders + }); } function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesNamespacesEntityType, schema: kubernetesEntityFactory(kubernetesNamespacesEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubeNamespaceActionBuilders + }); } function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesServicesEntityType, schema: kubernetesEntityFactory(kubernetesServicesEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + return new StratosCatalogEntity(definition, { + actionBuilders: kubeServiceActionBuilders + }); } function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: kubernetesDashboardEntityType, schema: kubernetesEntityFactory(kubernetesDashboardEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + // TODO: RC any + return new StratosCatalogEntity(definition, { + actionBuilders: kubeDashboardActionBuilders + }); } function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition = { + const definition: IStratosEntityDefinition = { type: metricEntityType, schema: kubernetesEntityFactory(metricEntityType), label: 'Kubernetes Metric', diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts new file mode 100644 index 0000000000..0ca8312580 --- /dev/null +++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts @@ -0,0 +1,76 @@ +import { + OrchestratedActionBuilders, +} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; +import { GetKubernetesNode, GetKubernetesNodes } from '../kubernetes.actions'; + +export interface KubeAppActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubeAppActionBuilders: KubeAppActionBuilders = { +} + +export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = { +} + +export interface KubePodActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubePodActionBuilders: KubePodActionBuilders = { +} + +export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = { +} + +export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { + get: ( + nodeName: string, + kubeGuid: string + ) => GetKubernetesNode + getMultiple: ( + kubeGuid: string, + paginationKey: string, + ) => GetKubernetesNodes +} + +export const kubeNodeActionBuilders: KubeNodeActionBuilders = { + get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode() + getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid) +} + +export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = { +} + +export interface KubeServiceActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubeServiceActionBuilders: KubeServiceActionBuilders = { +} + +export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders { + +} + +export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = { +} + +// export interface A extends OrchestratedActionBuilders { + +// } + +// export const a: A = { +// } \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts index 6d1d44c4ef..ac98e0735f 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts @@ -17,6 +17,7 @@ import { kubernetesServicesEntityType, kubernetesStatefulSetsEntityType, } from '../kubernetes-entity-factory'; +import { getKubeAPIResourceGuid } from './kube.selectors'; export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info'; export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success'; @@ -89,7 +90,12 @@ const sortPodsByName = { export interface KubeAction extends EntityRequestAction { kubeGuid: string; } -export interface KubePaginationAction extends PaginatedAction, KubeAction { } +export interface KubePaginationAction extends PaginatedAction, KubeAction { + getId: (r: any) => string; +} +export interface KubeSingleEntityAction extends KubeAction { + guid: string; +} export class KubeHealthCheck implements KubePaginationAction { constructor(public kubeGuid) { @@ -128,10 +134,12 @@ export class GetKubernetesNodes implements KubePaginationAction { 'order-direction': 'desc' as SortDirection, 'order-direction-field': 'name' }; + getId = getKubeAPIResourceGuid; } -export class GetKubernetesNode implements KubeAction { +export class GetKubernetesNode implements KubeSingleEntityAction { constructor(public nodeName: string, public kubeGuid: string) { + this.guid = this.nodeName; } type = GET_NODE_INFO; entityType = kubernetesNodesEntityType; @@ -143,9 +151,10 @@ export class GetKubernetesNode implements KubeAction { GET_NODE_INFO_SUCCESS, GET_NODE_INFO_FAILURE ]; + guid: string; } -export class GetKubernetesNamespace implements KubeAction { +export class GetKubernetesNamespace implements KubeSingleEntityAction { constructor(public namespaceName: string, public kubeGuid: string) { } type = GET_NAMESPACE_INFO; @@ -160,7 +169,7 @@ export class GetKubernetesNamespace implements KubeAction { ]; } -export class CreateKubernetesNamespace implements KubeAction { +export class CreateKubernetesNamespace implements KubeSingleEntityAction { public guid: string; constructor(public namespaceName: string, public kubeGuid: string) { this.guid = `Creating-${namespaceName}-${kubeGuid}`; @@ -193,7 +202,7 @@ export class GetKubernetesPods implements KubePaginationAction { }; } -export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction { +export class GetKubernetesPodsOnNode implements KubePaginationAction { constructor(public kubeGuid: string, public nodeName: string) { this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid); this.initialParams = { @@ -214,7 +223,7 @@ export class GetKubernetesPodsOnNode implements PaginatedAction, KubeAction { initialParams: PaginationParam; } -export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAction { +export class GetKubernetesServicesInNamespace implements KubePaginationAction { constructor(public kubeGuid: string, public namespaceName: string) { this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid); } @@ -233,7 +242,7 @@ export class GetKubernetesServicesInNamespace implements PaginatedAction, KubeAc }; } -export class GetKubernetesPodsInNamespace implements PaginatedAction, KubeAction { +export class GetKubernetesPodsInNamespace implements KubePaginationAction { constructor(public kubeGuid: string, public namespaceName: string) { this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid); } @@ -292,7 +301,7 @@ export class GetKubernetesServices implements KubePaginationAction { }; } -export class GetKubernetesPod implements KubeAction { +export class GetKubernetesPod implements KubeSingleEntityAction { constructor(public podName, public namespaceName, public kubeGuid) { } type = GET_KUBE_POD; @@ -338,8 +347,9 @@ export class GeKubernetesDeployments implements KubePaginationAction { paginationKey: string; } -export class GetKubernetesDashboard implements KubeAction { +export class GetKubernetesDashboard implements KubeSingleEntityAction { constructor(public kubeGuid: string) { + this.guid = this.getId(); } type = GET_KUBE_DASHBOARD; entityType = kubernetesDashboardEntityType; @@ -351,6 +361,8 @@ export class GetKubernetesDashboard implements KubeAction { GET_KUBE_DASHBOARD_SUCCESS, GET_KUBE_DASHBOARD_FAILURE ]; + getId = () => this.kubeGuid; + guid: string; } function getKubeMetricsAction(guid: string) { diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts index c55b3cca8a..55d6ccc0f8 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts @@ -124,9 +124,8 @@ export class KubernetesEffects { result: [] } as NormalizedResponse; const status = response as KubeDashboardStatus; - const id = status.guid; - result.entities[dashboardEntityConfig.entityKey][id] = status; - result.result.push(id); + result.entities[dashboardEntityConfig.entityKey][action.guid] = status; + result.result.push(action.guid); return [ new WrapperRequestActionSuccess(result, action) ]; @@ -155,8 +154,7 @@ export class KubernetesEffects { const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType); return this.processSingleItemAction(action, `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`, - nodeEntityConfig.entityKey, - (node) => node.metadata.name); + nodeEntityConfig.entityKey); }) ); @@ -168,7 +166,7 @@ export class KubernetesEffects { return this.processSingleItemAction(action, `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`, namespaceEntityConfig.entityKey, - getKubeAPIResourceGuid); + getKubeAPIResourceGuid); // TODO: RC HERE }) ); @@ -314,10 +312,9 @@ export class KubernetesEffects { } private processListAction( - action: KubePaginationAction | KubeAction, + action: KubePaginationAction, url: string, entityKey: string, - getId: GetID, filterResults?: Filter) { this.store.dispatch(new StartRequestAction(action)); @@ -397,7 +394,6 @@ export class KubernetesEffects { action: KubeAction, url: string, schemaKey: string, - getId: GetID, body?: any) { const requestType: ApiRequestTypes = body ? 'create' : 'fetch'; this.store.dispatch(new StartRequestAction(action, requestType)); @@ -418,12 +414,11 @@ export class KubernetesEffects { entities: { [schemaKey]: {} }, result: [] } as NormalizedResponse; - const id = getId(response); const data = action.entityType === kubernetesPodsEntityType ? KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(response as unknown as KubernetesPod) : response; - res.entities[schemaKey][id] = data; - res.result.push(id); + res.entities[schemaKey][action.guid] = data; + res.result.push(action.guid); const actions: Action[] = [ new WrapperRequestActionSuccess(res, action) ]; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts index cddd1778f4..8ba379a06c 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts @@ -1,7 +1,7 @@ import { StratosBaseCatalogEntity, StratosCatalogEntity, -} from 'frontend/packages/store/src/entity-catalog/entity-catalog-entity'; +} from 'frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { StratosEndpointExtensionDefinition } from 'frontend/packages/store/src/entity-catalog/entity-catalog.types'; import { IFavoriteMetadata } from 'frontend/packages/store/src/types/user-favorites.types'; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts index 347c2a3c40..77c25d66d0 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -15,7 +15,9 @@ import { import { MetadataItemComponent } from '../../../../core/src/shared/components/metadata-item/metadata-item.component'; import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper'; import { AppTestModule } from '../../../../core/test-framework/core-test.helper'; -import { EntityCatalogHelper } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; +import { + EntityCatalogHelper, +} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service'; import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory'; import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index 4f00ffdaef..8412c69ad4 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -14,7 +14,9 @@ import { SharedModule } from '../../../../../core/src/shared/shared.module'; import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper'; import { AppTestModule } from '../../../../../core/test-framework/core-test.helper'; import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper'; -import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; +import { + EntityCatalogHelper, +} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts index bc8e376f85..95bab21784 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts @@ -18,7 +18,7 @@ import { generateTestApplicationServiceProvider } from '../../../../../../core/t import { AppTestModule } from '../../../../../../core/test-framework/core-test.helper'; import { EntityCatalogHelper, -} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; +} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { CfAutoscalerTestingModule } from '../../../../cf-autoscaler-testing.module'; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts index 08e9f627eb..3c16b6b43a 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts @@ -11,7 +11,9 @@ import { import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service'; import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper'; import { AppTestModule } from '../../../../../core/test-framework/core-test.helper'; -import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; +import { + EntityCatalogHelper, +} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html index 3d5b4dfaf9..544d07696e 100644 --- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html +++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html @@ -1,4 +1,5 @@ -{{ (metricsEndpoint$ | async)?.entity.provider.name }} +{{ (metricsEndpoint$ | async)?.entity.provider.name }} +
@@ -8,7 +9,8 @@
@@ -35,11 +37,14 @@

{{ svc.url }} - {{ svc.metadata.metrics_job || 'N/A' }} - {{ svc.metadata.metrics_environment || 'N/A' }} + {{ svc.metadata.metrics_job || 'N/A' }} + + + {{ svc.metadata.metrics_environment || 'N/A' }}
-
+
{{ jobDetails[svc.metadata.metrics_job].health | uppercase }} @@ -57,6 +62,4 @@

-
- - +
\ No newline at end of file diff --git a/src/frontend/packages/core/test-framework/core-test.helper.ts b/src/frontend/packages/core/test-framework/core-test.helper.ts index 99e36a22d7..d9ca7cafe9 100644 --- a/src/frontend/packages/core/test-framework/core-test.helper.ts +++ b/src/frontend/packages/core/test-framework/core-test.helper.ts @@ -5,7 +5,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { StoreModule } from '@ngrx/store'; import { createBasicStoreModule } from '@stratos/store/testing'; -import { EntityCatalogHelper } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; +import { + EntityCatalogHelper, +} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; import { EntityCatalogHelpers } from '../../store/src/entity-catalog/entity-catalog.helper'; import { appReducers } from '../../store/src/reducers.module'; import { CoreModule } from '../src/core/core.module'; From 9d199edf081b5cf24734e50f69e045c1f721b0fe Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 11 May 2020 17:11:23 +0100 Subject: [PATCH 04/15] WIP --- .../create-release.component.ts | 36 ++- .../kubernetes/kubernetes-entity-catalog.ts | 13 +- .../kubernetes/kubernetes-entity-generator.ts | 4 +- .../kubernetes-pod-containers.component.ts | 1 + .../action-builders/kube.action-builders.ts | 20 +- .../kubernetes/store/kubernetes.actions.ts | 254 ++++++++++-------- .../kubernetes/store/kubernetes.effects.ts | 186 +++++-------- .../helm-release-services-list-source.ts | 5 +- .../kube-namespaces-filter-config.service.ts | 6 +- .../helm-release-tab-base.component.ts | 28 +- .../store/workloads-entity-factory.ts | 8 +- .../store/workloads-entity-generator.ts | 1 + .../workloads/store/workloads.actions.ts | 18 +- .../src/store/app-autoscaler.actions.ts | 3 +- .../src/store/autoscaler.effects.ts | 2 +- .../src/actions/buildpack.action.ts | 3 +- .../src/actions/domains.actions.ts | 3 +- .../src/actions/quota-definitions.actions.ts | 5 +- .../src/actions/relation.actions.ts | 12 +- .../src/actions/security-groups-actions.ts | 3 +- .../src/actions/service-bindings.actions.ts | 3 +- .../src/actions/service-broker.actions.ts | 3 +- .../service-plan-visibility.actions.ts | 3 +- .../src/actions/service-plan.actions.ts | 3 +- .../entity-relations-validate.spec.ts | 17 +- .../packages/store/src/types/request.types.ts | 2 +- 26 files changed, 326 insertions(+), 316 deletions(-) diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index 60dd7f0190..c9c1a14fc6 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -7,18 +7,20 @@ import { Store } from '@ngrx/store'; import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory'; import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; -import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators'; +import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators'; import { AppState } from '../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog'; +import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; +import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types'; import { EndpointsService } from '../../../core/endpoints.service'; import { safeUnsubscribe } from '../../../core/utils.service'; import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config'; import { ConfirmationDialogService } from '../../../shared/components/confirmation-dialog.service'; import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components/stepper/step/step.component'; +import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory'; import { KubernetesNamespace } from '../../kubernetes/store/kube.types'; -import { CreateKubernetesNamespace, GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions'; +import { GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions'; import { HelmInstall } from '../store/helm.actions'; import { HelmInstallValues } from '../store/helm.types'; @@ -64,7 +66,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { private store: Store, private httpClient: HttpClient, private confirmDialog: ConfirmationDialogService, - private pmf: PaginationMonitorFactory + private pmf: PaginationMonitorFactory, // TODO: RC search and destroy + private emf: EntityMonitorFactory // TODO: RC search and destroy ) { const chart = this.route.snapshot.params; this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`; @@ -103,6 +106,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { action, paginationMonitor: this.pmf.create(action.paginationKey, action, true) }).entities$.pipe( + tap(a => console.log(action, a)), filter(namespaces => !!namespaces), first() ); @@ -112,15 +116,18 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { this.details.controls.releaseNamespace.valueChanges.pipe(startWith(''), distinctUntilChanged()) ]).pipe( // Filter out namespaces from other kubes + tap(a => console.log(1, a)), map(([namespaces, kubeId, namespace]: [KubernetesNamespace[], string, string]) => ([ namespaces.filter(ns => ns.metadata.kubeId === kubeId), namespace ])), + tap(a => console.log(2, a)), // Map to endpoint names map(([namespaces, namespace]: [KubernetesNamespace[], string]) => [ namespaces.map(ns => ns.metadata.name), namespace ]), + tap(a => console.log(3, a)), // Filter out namespaces not matching existing text map(([namespaces, namespace]: [string[], string]) => this.filterTyped(namespaces, namespace)), ); @@ -233,14 +240,10 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { }); } - const action = new CreateKubernetesNamespace( + return kubeEntityCatalog.namespace.api.create( this.details.controls.releaseNamespace.value, - this.details.controls.endpoint.value); - this.store.dispatch(action); - - const namespaceEntityConfig = entityCatalog.getEntity(action); - const monitor = namespaceEntityConfig.getEntityMonitor(this.store, action.guid); - return monitor.entityRequest$.pipe( + this.details.controls.endpoint.value + ).pipe( pairwise(), filter(([oldVal, newVal]) => oldVal.creating && !newVal.creating), map(([, newVal]) => newVal), @@ -267,14 +270,19 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { chart: this.route.snapshot.params }; + // TODO: RC // Make the request const action = new HelmInstall(values); this.store.dispatch(action); - const releaseEntityConfig = entityCatalog.getEntity(action); + // const releaseEntityConfig = entityCatalog.getEntity(action); - // Wait for result of request - return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe( + return this.emf.create( + action.guid, + action + ).entityRequest$.pipe( + // Wait for result of request + // return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe( filter(state => !!state), pairwise(), filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)), diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts index dbadecc336..8aab0f5479 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts @@ -1,7 +1,18 @@ +import { StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; +import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; +import { KubeNamespaceActionBuilders } from './store/action-builders/kube.action-builders'; +import { KubernetesNamespace } from './store/kube.types'; + /** * A strongly typed collection of Kube Catalog Entities. * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc */ export class KubeEntityCatalog { -} \ No newline at end of file + public namespace: StratosCatalogEntity; + +} + + + +export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog(); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts index 7beff79804..38b9d860ab 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts @@ -20,6 +20,7 @@ import { KubernetesConfigAuthFormComponent, } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component'; import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component'; +import { kubeEntityCatalog } from './kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE, kubernetesAppsEntityType, @@ -242,9 +243,10 @@ function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDe schema: kubernetesEntityFactory(kubernetesNamespacesEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.namespace = new StratosCatalogEntity(definition, { actionBuilders: kubeNamespaceActionBuilders }); + return kubeEntityCatalog.namespace; } function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefinition) { diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts index f83718f337..a2d755a21d 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts @@ -46,6 +46,7 @@ export class KubernetesPodContainersComponent extends CardCell { if (!row || !!this.containerDataSource) { return; } + // TODO: RC this.containerDataSource = { isTableLoading$: of(false), connect: () => this.store.select(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe( diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts index 0ca8312580..9f6eee394f 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts @@ -1,7 +1,12 @@ import { OrchestratedActionBuilders, } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; -import { GetKubernetesNode, GetKubernetesNodes } from '../kubernetes.actions'; +import { + CreateKubernetesNamespace, + GetKubernetesNamespace, + GetKubernetesNode, + GetKubernetesNodes, +} from '../kubernetes.actions'; export interface KubeAppActionBuilders extends OrchestratedActionBuilders { @@ -43,15 +48,24 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { } export const kubeNodeActionBuilders: KubeNodeActionBuilders = { - get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode() + get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid), getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid) } export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders { - + get: ( + namespace: string, + kubeGuid: string + ) => GetKubernetesNamespace; + create: ( + namespace: string, + kubeGuid: string + ) => CreateKubernetesNamespace; } export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = { + get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid), + create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid) } export interface KubeServiceActionBuilders extends OrchestratedActionBuilders { diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts index ac98e0735f..fbf8a06d69 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts @@ -17,7 +17,14 @@ import { kubernetesServicesEntityType, kubernetesStatefulSetsEntityType, } from '../kubernetes-entity-factory'; -import { getKubeAPIResourceGuid } from './kube.selectors'; +import { + KubernetesDeployment, + KubernetesNamespace, + KubernetesNode, + KubernetesPod, + KubernetesStatefulSet, + KubeService, +} from './kube.types'; export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info'; export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success'; @@ -82,41 +89,45 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure'; -const sortPodsByName = { +const defaultSortParams = { 'order-direction': 'desc' as SortDirection, 'order-direction-field': 'name' }; +const deliminate = (...args: string[]) => args.join('_:_'); + export interface KubeAction extends EntityRequestAction { kubeGuid: string; } -export interface KubePaginationAction extends PaginatedAction, KubeAction { - getId: (r: any) => string; +export interface KubePaginationAction extends PaginatedAction, KubeAction { + getId: (r: T, kubeGuid: string) => string; } export interface KubeSingleEntityAction extends KubeAction { guid: string; } -export class KubeHealthCheck implements KubePaginationAction { - constructor(public kubeGuid) { - this.paginationKey = kubeGuid + '-health-check'; +export class GetKubernetesNode implements KubeSingleEntityAction { + static getGuid(kubeGuid: string, nodeName: string): string { + return deliminate(nodeName, kubeGuid); } - initialParams = { - limit: 1 - }; - type = GET_NODES_INFO; + + constructor(public nodeName: string, public kubeGuid: string) { + this.guid = GetKubernetesNode.getGuid(kubeGuid, nodeName); + } + type = GET_NODE_INFO; entityType = kubernetesNodesEntityType; endpointType = KUBERNETES_ENDPOINT_TYPE; entity = [kubernetesEntityFactory(kubernetesNodesEntityType)]; + actions = [ - GET_NODES_INFO, - GET_NODES_INFO_SUCCESS, - GET_NODES_INFO_FAILURE + GET_NODE_INFO, + GET_NODE_INFO_SUCCESS, + GET_NODE_INFO_FAILURE ]; - paginationKey: string; + guid: string; } -export class GetKubernetesNodes implements KubePaginationAction { +export class GetKubernetesNodes implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesNodesEntityType, kubeGuid); } @@ -130,32 +141,41 @@ export class GetKubernetesNodes implements KubePaginationAction { GET_NODES_INFO_FAILURE ]; paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' + initialParams: PaginationParam = { + ...defaultSortParams }; - getId = getKubeAPIResourceGuid; + getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name); } -export class GetKubernetesNode implements KubeSingleEntityAction { - constructor(public nodeName: string, public kubeGuid: string) { - this.guid = this.nodeName; +export class KubeHealthCheck extends GetKubernetesNodes { + constructor(kubeGuid) { + super(kubeGuid); + this.paginationKey = kubeGuid + '-health-check'; + this.initialParams.limit = 1; } - type = GET_NODE_INFO; - entityType = kubernetesNodesEntityType; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entity = [kubernetesEntityFactory(kubernetesNodesEntityType)]; +} - actions = [ - GET_NODE_INFO, - GET_NODE_INFO_SUCCESS, - GET_NODE_INFO_FAILURE - ]; - guid: string; +export class CreateKubernetesNamespace implements KubeSingleEntityAction { + public guid: string; + constructor(public namespaceName: string, public kubeGuid: string) { + this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'? + } + + type = CREATE_NAMESPACE; + entityType = kubernetesNamespacesEntityType; + endpointType = KUBERNETES_ENDPOINT_TYPE; + entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)]; + actions = getActions('Namespace', 'Create'); + requestType: ApiRequestTypes = 'create'; } export class GetKubernetesNamespace implements KubeSingleEntityAction { + static getGuid(kubeGuid: string, namespaceName: string): string { + return deliminate(namespaceName, kubeGuid); + } + constructor(public namespaceName: string, public kubeGuid: string) { + this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName); } type = GET_NAMESPACE_INFO; entityType = kubernetesNamespacesEntityType; @@ -167,23 +187,51 @@ export class GetKubernetesNamespace implements KubeSingleEntityAction { GET_NAMESPACE_INFO_SUCCESS, GET_NAMESPACE_INFO_FAILURE ]; + guid: string; } -export class CreateKubernetesNamespace implements KubeSingleEntityAction { - public guid: string; - constructor(public namespaceName: string, public kubeGuid: string) { - this.guid = `Creating-${namespaceName}-${kubeGuid}`; +export class GetKubernetesNamespaces implements KubePaginationAction { + constructor(public kubeGuid: string) { + this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all'); } - - type = CREATE_NAMESPACE; + type = GET_NAMESPACES_INFO; entityType = kubernetesNamespacesEntityType; endpointType = KUBERNETES_ENDPOINT_TYPE; entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)]; - actions = getActions('Namespace', 'Create'); - requestType: ApiRequestTypes = 'create'; + actions = [ + GET_NAMESPACES_INFO, + GET_NAMESPACES_INFO_SUCCESS, + GET_NAMESPACES_INFO_FAILURE + ]; + paginationKey: string; + initialParams = { + ...defaultSortParams + }; + getId = (namespace: KubernetesNamespace, kubeGuid: string): string => GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name); +} + +export class GetKubernetesPod implements KubeSingleEntityAction { + static getId(kubeGuid: string, namespace: string, podName: string): string { // TODO: RC id/guid naming + return deliminate(podName, namespace, kubeGuid); + } + + // static + constructor(public podName, public namespaceName, public kubeGuid) { + this.guid = GetKubernetesPod.getId(kubeGuid, namespaceName, podName); + } + type = GET_KUBE_POD; + entityType = kubernetesPodsEntityType; + endpointType = KUBERNETES_ENDPOINT_TYPE; + entity = [kubernetesEntityFactory(kubernetesPodsEntityType)]; + actions = [ + GET_KUBE_POD, + GET_KUBE_POD_SUCCESS, + GET_KUBE_POD_FAILURE + ]; + guid: string; } -export class GetKubernetesPods implements KubePaginationAction { +export class GetKubernetesPods implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesPodsEntityType, 'k8', kubeGuid); } @@ -197,91 +245,43 @@ export class GetKubernetesPods implements KubePaginationAction { GET_POD_INFO_FAILURE ]; paginationKey: string; - initialParams = { - ...sortPodsByName + initialParams: PaginationParam = { + ...defaultSortParams }; + getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name); } -export class GetKubernetesPodsOnNode implements KubePaginationAction { - constructor(public kubeGuid: string, public nodeName: string) { +export class GetKubernetesPodsOnNode extends GetKubernetesPods { + constructor(kubeGuid: string, public nodeName: string) { + super(kubeGuid) this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `node-${nodeName}`, kubeGuid); - this.initialParams = { - fieldSelector: `spec.nodeName=${nodeName}`, - ...sortPodsByName - }; + this.initialParams.fieldSelector = `spec.nodeName=${nodeName}`; } type = GET_PODS_ON_NODE_INFO; - entityType = kubernetesPodsEntityType; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entity = [kubernetesEntityFactory(kubernetesPodsEntityType)]; actions = [ GET_PODS_ON_NODE_INFO, GET_PODS_ON_NODE_INFO_SUCCESS, GET_PODS_ON_NODE_INFO_FAILURE ]; - paginationKey: string; - initialParams: PaginationParam; } -export class GetKubernetesServicesInNamespace implements KubePaginationAction { - constructor(public kubeGuid: string, public namespaceName: string) { - this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid); - } - type = GET_SERVICES_IN_NAMESPACE_INFO; - entityType = kubernetesServicesEntityType; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entity = [kubernetesEntityFactory(kubernetesServicesEntityType)]; - actions = [ - GET_SERVICES_IN_NAMESPACE_INFO, - GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS, - GET_SERVICES_IN_NAMESPACE_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - ...sortPodsByName - }; -} - -export class GetKubernetesPodsInNamespace implements KubePaginationAction { - constructor(public kubeGuid: string, public namespaceName: string) { +export class GetKubernetesPodsInNamespace extends GetKubernetesPods { + constructor(kubeGuid: string, public namespaceName: string) { + super(kubeGuid); this.paginationKey = getPaginationKey(kubernetesPodsEntityType, `ns-${namespaceName}`, kubeGuid); } type = GET_PODS_IN_NAMESPACE_INFO; - entityType = kubernetesPodsEntityType; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entity = [kubernetesEntityFactory(kubernetesPodsEntityType)]; actions = [ GET_PODS_IN_NAMESPACE_INFO, GET_PODS_IN_NAMEPSACE_INFO_SUCCESS, GET_PODS_IN_NAMEPSACE_INFO_FAILURE ]; - paginationKey: string; - initialParams = { - ...sortPodsByName - }; } -export class GetKubernetesNamespaces implements KubePaginationAction { - constructor(public kubeGuid: string) { - this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all'); +export class GetKubernetesServices implements KubePaginationAction { + static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming + return deliminate(serviceName, namespace, kubeGuid); } - type = GET_NAMESPACES_INFO; - entityType = kubernetesNamespacesEntityType; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)]; - actions = [ - GET_NAMESPACES_INFO, - GET_NAMESPACES_INFO_SUCCESS, - GET_NAMESPACES_INFO_FAILURE - ]; - paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' - }; -} - -export class GetKubernetesServices implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid); } @@ -295,27 +295,36 @@ export class GetKubernetesServices implements KubePaginationAction { GET_SERVICE_INFO_FAILURE ]; paginationKey: string; - initialParams = { - 'order-direction': 'desc' as SortDirection, - 'order-direction-field': 'name' + initialParams: PaginationParam = { + ...defaultSortParams }; + getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name); } -export class GetKubernetesPod implements KubeSingleEntityAction { - constructor(public podName, public namespaceName, public kubeGuid) { +export class GetKubernetesServicesInNamespace extends GetKubernetesServices { + constructor(kubeGuid: string, public namespaceName: string) { + super(kubeGuid); + // TODO: RC Check all for guid AND uniqueness + this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid); } - type = GET_KUBE_POD; - entityType = kubernetesPodsEntityType; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entity = [kubernetesEntityFactory(kubernetesPodsEntityType)]; actions = [ - GET_KUBE_POD, - GET_KUBE_POD_SUCCESS, - GET_KUBE_POD_FAILURE + GET_SERVICES_IN_NAMESPACE_INFO, + GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS, + GET_SERVICES_IN_NAMESPACE_INFO_FAILURE ]; } -export class GetKubernetesStatefulSets implements KubePaginationAction { +// TODO: RC +// Create name +// delete name +// create with same name.. same + + +export class GetKubernetesStatefulSets implements KubePaginationAction { + static getId(kubeGuid: string, namespace: string, name: string): string { + return deliminate(name, namespace, kubeGuid); // TODO: RC check + } + constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid); } @@ -329,9 +338,13 @@ export class GetKubernetesStatefulSets implements KubePaginationAction { GET_KUBE_STATEFULSETS_FAILURE ]; paginationKey: string; + getId = (statefulSet: KubernetesStatefulSet, kubeGuid: string) => GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name); } -export class GeKubernetesDeployments implements KubePaginationAction { +export class GeKubernetesDeployments implements KubePaginationAction { + static getId(kubeGuid: string, namespace: string, name: string): string { + return deliminate(name, namespace, kubeGuid); // TODO: RC check + } constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid); } @@ -345,11 +358,15 @@ export class GeKubernetesDeployments implements KubePaginationAction { GET_KUBE_DEPLOYMENT_FAILURE ]; paginationKey: string; + getId = (deployment: KubernetesDeployment, kubeGuid: string) => GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name); } export class GetKubernetesDashboard implements KubeSingleEntityAction { + static getId(kubeGuid: string): string { + return kubeGuid; + } constructor(public kubeGuid: string) { - this.guid = this.getId(); + this.guid = GetKubernetesDashboard.getId(kubeGuid); } type = GET_KUBE_DASHBOARD; entityType = kubernetesDashboardEntityType; @@ -361,7 +378,6 @@ export class GetKubernetesDashboard implements KubeSingleEntityAction { GET_KUBE_DASHBOARD_SUCCESS, GET_KUBE_DASHBOARD_FAILURE ]; - getId = () => this.kubeGuid; guid: string; } diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts index 55d6ccc0f8..cf3c752176 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts @@ -21,15 +21,9 @@ import { isJetstreamError } from '../../../jetstream.helpers'; import { KUBERNETES_ENDPOINT_TYPE, kubernetesDashboardEntityType, - kubernetesDeploymentsEntityType, - kubernetesNamespacesEntityType, - kubernetesNodesEntityType, kubernetesPodsEntityType, - kubernetesServicesEntityType, - kubernetesStatefulSetsEntityType, } from '../kubernetes-entity-factory'; import { KubernetesPodExpandedStatusHelper } from '../services/kubernetes-expanded-state'; -import { getKubeAPIResourceGuid } from './kube.selectors'; import { BasicKubeAPIResource, KubernetesDeployment, @@ -150,172 +144,133 @@ export class KubernetesEffects { @Effect() fetchNodeInfo$ = this.actions$.pipe( ofType(GET_NODE_INFO), - flatMap(action => { - const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType); - return this.processSingleItemAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}`, - nodeEntityConfig.entityKey); - }) + flatMap(action => this.processSingleItemAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes/${action.nodeName}` + )) ); @Effect() fetchNamespaceInfo$ = this.actions$.pipe( ofType(GET_NAMESPACE_INFO), - flatMap(action => { - const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType); - return this.processSingleItemAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`, - namespaceEntityConfig.entityKey, - getKubeAPIResourceGuid); // TODO: RC HERE - }) + flatMap(action => this.processSingleItemAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}`) + ) ); @Effect() fetchPodsInfo$ = this.actions$.pipe( ofType(GET_POD_INFO), - flatMap(action => { - const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`, - podsEntityConfig.entityKey, - getKubeAPIResourceGuid - ); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods` + )) ); @Effect() fetchPodsOnNodeInfo$ = this.actions$.pipe( ofType(GET_PODS_ON_NODE_INFO), - flatMap(action => { - const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType); - return this.processListAction(action, + flatMap(action => + this.processListAction( + action, `/pp/${this.proxyAPIVersion}/proxy/api/v1/pods`, - podsEntityConfig.entityKey, - getKubeAPIResourceGuid - ); - }) + // Note - filtering done via param in action + ) + ) ); @Effect() fetchPodsInNamespaceInfo$ = this.actions$.pipe( ofType(GET_PODS_IN_NAMESPACE_INFO), - flatMap(action => { - const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`, - podsEntityConfig.entityKey, - getKubeAPIResourceGuid - ); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods`, + )) ); @Effect() fetchServicesInNamespaceInfo$ = this.actions$.pipe( ofType(GET_SERVICES_IN_NAMESPACE_INFO), - flatMap(action => { - const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`, - servicesEntityConfig.entityKey, - getKubeAPIResourceGuid - ); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/services`, + )) ); @Effect() fetchPodInfo$ = this.actions$.pipe( ofType(GET_KUBE_POD), - flatMap(action => { - const podsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`, - podsEntityConfig.entityKey, - getKubeAPIResourceGuid - ); - }) + flatMap(action => this.processSingleItemAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces/${action.namespaceName}/pods/${action.podName}`, + )) ); @Effect() fetchServicesInfo$ = this.actions$.pipe( ofType(GET_SERVICE_INFO), - flatMap(action => { - const servicesEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesServicesEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`, - servicesEntityConfig.entityKey, - getKubeAPIResourceGuid); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/services`, + )) ); @Effect() fetchNamespacesInfo$ = this.actions$.pipe( ofType(GET_NAMESPACES_INFO), - flatMap(action => { - const namespaceEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNamespacesEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`, - namespaceEntityConfig.entityKey, - getKubeAPIResourceGuid); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`, + )) ); @Effect() createNamespace$ = this.actions$.pipe( ofType(CREATE_NAMESPACE), - flatMap(action => { - const namespaceEntityConfig = entityCatalog.getEntity(action); - return this.processSingleItemAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`, - namespaceEntityConfig.entityKey, - getKubeAPIResourceGuid, - { - kind: 'Namespace', - apiVersion: 'v1', - metadata: { - name: action.namespaceName, - }, - }); - }) + flatMap(action => this.processSingleItemAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/namespaces`, + { + kind: 'Namespace', + apiVersion: 'v1', + metadata: { + name: action.namespaceName, + }, + } + ) + ) ); @Effect() fetchStatefulSets$ = this.actions$.pipe( ofType(GET_KUBE_STATEFULSETS), - flatMap(action => { - const statefulSetsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesStatefulSetsEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`, - statefulSetsEntityConfig.entityKey, - getKubeAPIResourceGuid); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/statefulsets`, + )) ); @Effect() fetchDeployments$ = this.actions$.pipe( ofType(GET_KUBE_DEPLOYMENT), - flatMap(action => { - const deploymentsEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesDeploymentsEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`, - deploymentsEntityConfig.entityKey, - getKubeAPIResourceGuid); - }) + flatMap(action => this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/apis/apps/v1/deployments`, + )) ); private processNodeAction(action: GetKubernetesNodes) { - const nodeEntityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesNodesEntityType); - return this.processListAction(action, - `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes`, - nodeEntityConfig.entityKey, - getKubeAPIResourceGuid); + return this.processListAction( + action, + `/pp/${this.proxyAPIVersion}/proxy/api/v1/nodes` + ); } - private processListAction( + private processListAction( action: KubePaginationAction, - url: string, - entityKey: string, - filterResults?: Filter) { + url: string) { this.store.dispatch(new StartRequestAction(action)); const getKubeIds = action.kubeGuid ? @@ -326,6 +281,7 @@ export class KubernetesEffects { ); let pKubeIds: string[]; + const entityKey = entityCatalog.getEntityKey(action); return getKubeIds.pipe( switchMap(kubeIds => { pKubeIds = kubeIds; @@ -360,10 +316,9 @@ export class KubernetesEffects { }); return combinedRes; }, []); - const filteredItems = filterResults ? items.filter(res => filterResults(res)) : items; - const processesData = filteredItems + const processesData = items .reduce((res, data) => { - const id = getId(data); + const id = action.getId(data, data.metadata.kubeId); const updatedData = action.entityType === kubernetesPodsEntityType ? KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(data as unknown as KubernetesPod) : data; @@ -393,7 +348,6 @@ export class KubernetesEffects { private processSingleItemAction( action: KubeAction, url: string, - schemaKey: string, body?: any) { const requestType: ApiRequestTypes = body ? 'create' : 'fetch'; this.store.dispatch(new StartRequestAction(action, requestType)); @@ -406,18 +360,18 @@ export class KubernetesEffects { headers }; const request = body ? this.http.post(url, body, requestArgs) : this.http.get(url, requestArgs); - + const entityKey = entityCatalog.getEntityKey(action); return request .pipe( mergeMap((response: T) => { const res = { - entities: { [schemaKey]: {} }, + entities: { [entityKey]: {} }, result: [] } as NormalizedResponse; const data = action.entityType === kubernetesPodsEntityType ? KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(response as unknown as KubernetesPod) : response; - res.entities[schemaKey][action.guid] = data; + res.entities[entityKey][action.guid] = data; res.result.push(action.guid); const actions: Action[] = [ new WrapperRequestActionSuccess(res, action) diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts index ff70a8a77e..b85316b114 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts @@ -9,8 +9,7 @@ import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators' import { kubernetesEntityFactory } from '../../kubernetes-entity-factory'; import { KubeService } from '../../store/kube.types'; -import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions'; -import { getHelmReleaseServiceId } from '../store/workloads-entity-factory'; +import { GetKubernetesServices, GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions'; import { GetHelmReleases, GetHelmReleaseServices } from '../store/workloads.actions'; import { HelmRelease, HelmReleaseService } from '../workload.types'; @@ -51,7 +50,7 @@ export class HelmReleaseServicesDataSource extends ListDataSource { store, action, schema: action.entity[0], - getRowUniqueId: getHelmReleaseServiceId, + getRowUniqueId: (row: KubeService) => GetKubernetesServices.getId(row.metadata.kubeId, row.metadata.namespace, row.metadata.name), paginationKey: action.paginationKey, isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts index c41019c89a..6132e3fc47 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts @@ -3,10 +3,7 @@ import { Store } from '@ngrx/store'; import { safeUnsubscribe } from 'frontend/packages/core/src/core/utils.service'; import { AppState } from 'frontend/packages/store/src/app-state'; import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory'; -import { - getCurrentPageRequestInfo, - getPaginationObservables, -} from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors'; import { EndpointModel } from 'frontend/packages/store/src/types/endpoint.types'; import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; @@ -22,6 +19,7 @@ import { withLatestFrom, } from 'rxjs/operators'; +import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../../kubernetes-entity-factory'; import { KubernetesNamespace } from '../../store/kube.types'; import { GetKubernetesNamespaces } from '../../store/kubernetes.actions'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts index f3d8d9927a..c337b3e032 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts @@ -5,16 +5,14 @@ import { LoggerService } from 'frontend/packages/core/src/core/logger.service'; import { IPageSideNavTab } from 'frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component'; import { AppState } from 'frontend/packages/store/src/app-state'; import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; -import { PaginatedAction } from 'frontend/packages/store/src/types/pagination.types'; import { EntityRequestAction, WrapperRequestActionSuccess } from 'frontend/packages/store/src/types/request.types'; import { Observable, Subject, Subscription } from 'rxjs'; import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets'; import { catchError, map, share, switchMap } from 'rxjs/operators'; import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state'; -import { getKubeAPIResourceGuid } from '../../../store/kube.selectors'; -import { KubernetesPod } from '../../../store/kube.types'; -import { getHelmReleaseServiceId } from '../../store/workloads-entity-factory'; +import { KubernetesPod, KubeService } from '../../../store/kube.types'; +import { KubePaginationAction } from '../../../store/kubernetes.actions'; import { GetHelmReleaseGraph, GetHelmReleasePods, @@ -24,9 +22,6 @@ import { import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod } from '../../workload.types'; import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service'; -type IDGetterFunction = (data: any) => string; - - @Component({ selector: 'app-helm-release-tab-base', @@ -113,9 +108,13 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { prefix = messageObj.data; } else if (messageObj.kind === 'Pods') { const pods: KubernetesPod[] = messageObj.data || []; - const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod)); + const podsWithInfo: KubernetesPod[] = pods.map(pod => { + const res = KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod); + res.metadata.kubeId = this.helmReleaseHelper.endpointGuid; + return res; + }); const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle); - this.populateList(releasePodsAction, podsWithInfo, getKubeAPIResourceGuid); + this.populateList(releasePodsAction, podsWithInfo); } else if (messageObj.kind === 'Graph') { const graph: HelmReleaseGraph = messageObj.data; graph.endpointId = this.helmReleaseHelper.endpointGuid; @@ -126,10 +125,11 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') { // Store all of the services const manifest = messageObj.data; - const svcs = []; + const svcs: KubeService[] = []; // Store ALL resources for the release manifest.forEach(resource => { if (resource.kind === 'Service' && prefix) { + resource.metadata.kubeId = this.helmReleaseHelper.endpointGuid; svcs.push(resource); } }); @@ -138,7 +138,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle ); - this.populateList(releaseServicesAction, svcs, getHelmReleaseServiceId); + this.populateList(releaseServicesAction, svcs); } const resources = { ...manifest }; @@ -167,15 +167,15 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { this.store.dispatch(successWrapper); } - private populateList(action: PaginatedAction, resources: any, idGetter: IDGetterFunction) { + private populateList(action: KubePaginationAction, resources: any) { const newResources = {}; resources.forEach(resource => { const newResource: HelmReleasePod = { - endpointId: action.endpointGuid, + endpointId: action.kubeGuid, releaseTitle: this.helmReleaseHelper.releaseTitle, ...resource }; - newResources[idGetter(newResource)] = newResource; + newResources[action.getId(newResource, action.kubeGuid)] = newResource; }); const releasePods = { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts index 804514030a..1053c129c8 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts @@ -1,6 +1,6 @@ import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema'; import { addKubernetesEntitySchema, KubernetesEntitySchema } from '../../kubernetes-entity-factory'; -import { HelmRelease, HelmReleaseGraph, HelmReleaseResource, HelmReleaseService } from '../workload.types'; +import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types'; export const helmReleaseEntityKey = 'helmRelease'; export const helmReleasePodEntityType = 'helmReleasePod'; @@ -9,8 +9,8 @@ export const helmReleaseGraphEntityType = 'helmReleaseGraph'; export const helmReleaseResourceEntityType = 'helmReleaseResource'; export const getHelmReleaseId = (entity: HelmRelease) => `${entity.endpointId}-${entity.namespace}-${entity.name}`; -export const getHelmReleaseServiceId = - (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`; +// export const getHelmReleaseServiceId = +// (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`; export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => `${entity.endpointId}-${entity.releaseTitle}`; export const getHelmReleaseResourceId = (entity: HelmReleaseResource) => `${entity.endpointId}-${entity.releaseTitle}`; @@ -21,7 +21,7 @@ const entityCache: { entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema( helmReleaseEntityKey, {}, - { idAttribute: getHelmReleaseId } + { idAttribute: getHelmReleaseId } // TODO: RC ); entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema( diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts index 8ba379a06c..fa0f66070f 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts @@ -18,6 +18,7 @@ export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExt ]; } +// TODO: RC function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) { const definition = { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts index 92818a4800..e5a61ea7a8 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts @@ -8,6 +8,8 @@ import { kubernetesPodsEntityType, kubernetesServicesEntityType, } from '../../kubernetes-entity-factory'; +import { KubernetesPod, KubeService } from '../../store/kube.types'; +import { GetKubernetesPod, GetKubernetesServices, KubePaginationAction } from '../../store/kubernetes.actions'; import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory'; export const GET_HELM_RELEASES = '[Helm] Get Releases'; @@ -103,12 +105,12 @@ export class GetHelmReleaseResource implements EntityRequestAction { /** * Won't fetch pods, used to push/retrieve data from store */ -export class GetHelmReleasePods implements MonocularPaginationAction { +export class GetHelmReleasePods implements KubePaginationAction { constructor( - public endpointGuid: string, + public kubeGuid: string, public releaseTitle: string ) { - this.paginationKey = `${endpointGuid}/${releaseTitle}/pods`; + this.paginationKey = `${kubeGuid}/${releaseTitle}/pods`; } type = GET_HELM_RELEASE_PODS; endpointType = KUBERNETES_ENDPOINT_TYPE; @@ -124,17 +126,19 @@ export class GetHelmReleasePods implements MonocularPaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; + getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name); + } /** * Won't fetch pods, used to push/retrieve data from store */ -export class GetHelmReleaseServices implements MonocularPaginationAction { +export class GetHelmReleaseServices implements KubePaginationAction { constructor( - public endpointGuid: string, + public kubeGuid: string, public releaseTitle: string ) { - this.paginationKey = `${endpointGuid}/${releaseTitle}/services`; + this.paginationKey = `${kubeGuid}/${releaseTitle}/services`; } type = GET_HELM_RELEASE_SERVICES; endpointType = KUBERNETES_ENDPOINT_TYPE; @@ -150,6 +154,8 @@ export class GetHelmReleaseServices implements MonocularPaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; + getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name); + } export class HelmUpdateRelease implements Action { diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts index 679ec56335..2b85882417 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts @@ -1,3 +1,5 @@ +import { HttpRequest } from '@angular/common/http'; + import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-types'; import { createEntityRelationPaginationKey } from '../../../cloud-foundry/src/entity-relations/entity-relations.types'; import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers'; @@ -14,7 +16,6 @@ import { AUTOSCALER_ENDPOINT_TYPE, autoscalerEntityFactory, } from './autoscaler-entity-factory'; -import { HttpRequest } from '@angular/common/http'; export const AppAutoscalerPolicyEvents = { GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy', diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts index 094fbef14d..c0422d77be 100644 --- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts +++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts @@ -6,10 +6,10 @@ import { Observable } from 'rxjs'; import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators'; import { PaginationResponse } from '../../../cloud-foundry/src/store/types/cf-api.types'; -import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog'; import { environment } from '../../../core/src/environments/environment'; import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers'; import { AppState } from '../../../store/src/app-state'; +import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog'; import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers'; import { resultPerPageParam, diff --git a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts index 8fe4445485..d7a40dee9d 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/buildpack.action.ts @@ -1,9 +1,10 @@ +import { HttpRequest } from '@angular/common/http'; + import { getActions } from '../../../store/src/actions/action.helper'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { cfEntityFactory } from '../cf-entity-factory'; import { buildpackEntityType } from '../cf-entity-types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest } from '@angular/common/http'; export class FetchAllBuildpacks extends CFStartAction implements PaginatedAction { constructor(public endpointGuid: string, public paginationKey: string) { diff --git a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts index 6d56f47d8d..13d4f6d59b 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/domains.actions.ts @@ -1,3 +1,5 @@ +import { HttpRequest } from '@angular/common/http'; + import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { ICFAction } from '../../../store/src/types/request.types'; @@ -5,7 +7,6 @@ import { cfEntityFactory } from '../cf-entity-factory'; import { domainEntityType } from '../cf-entity-types'; import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest } from '@angular/common/http'; export const GET_DOMAIN = '[domain] Get domain '; export const GET_DOMAIN_SUCCESS = '[domain] Get domain success'; diff --git a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts index 7c5678b1c2..02200b9fb3 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts @@ -1,15 +1,16 @@ +import { HttpParams, HttpRequest } from '@angular/common/http'; + import { IQuotaDefinition } from '../../../core/src/core/cf-api.types'; import { QuotaFormValues, } from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { ICFAction } from '../../../store/src/types/request.types'; -import { CFEntityConfig } from '../cf-types'; 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 { CFStartAction } from './cf-action.types'; -import { HttpRequest, HttpParams } from '@angular/common/http'; export const GET_QUOTA_DEFINITION = '[QuotaDefinition] Get one'; export const GET_QUOTA_DEFINITION_SUCCESS = '[QuotaDefinition] Get one success'; diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts index 1d8e1129fd..b0d2154801 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts @@ -1,13 +1,11 @@ +import { HttpParams, HttpRequest } from '@angular/common/http'; + import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types'; -import { - EntityInlineChildAction, - EntityInlineParentAction, -} from '../entity-relations/entity-relations.types'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; -import { RequestEntityLocation, RequestActionEntity } from '../../../store/src/types/request.types'; -import { CFStartAction } from './cf-action.types'; +import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types'; import { EntityTreeRelation } from '../entity-relations/entity-relation-tree'; -import { HttpRequest, HttpParams } from '@angular/common/http'; +import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types'; +import { CFStartAction } from './cf-action.types'; const relationActionId = 'FetchRelationAction'; diff --git a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts index 1930e67071..8d882c6a44 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/security-groups-actions.ts @@ -1,10 +1,11 @@ +import { HttpRequest } from '@angular/common/http'; + import { getActions } from '../../../store/src/actions/action.helper'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { cfEntityFactory } from '../cf-entity-factory'; import { securityGroupEntityType, spaceEntityType } from '../cf-entity-types'; import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest } from '@angular/common/http'; export class GetAllSecurityGroups extends CFStartAction implements PaginatedAction, EntityInlineParentAction { constructor( diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts index d0a2763cfb..cd7763a255 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/service-bindings.actions.ts @@ -1,10 +1,11 @@ +import { HttpParams, HttpRequest } from '@angular/common/http'; + import { getActions } from '../../../store/src/actions/action.helper'; import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types'; import { ICFAction } from '../../../store/src/types/request.types'; import { cfEntityFactory } from '../cf-entity-factory'; import { serviceBindingEntityType } from '../cf-entity-types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest, HttpParams } from '@angular/common/http'; export const DELETE_SERVICE_BINDING_ACTION = '[ Service Instances ] Delete Service Binding'; export const DELETE_SERVICE_BINDING_ACTION_SUCCESS = '[ Service Instances ] Delete Service Binding success'; diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts index a598c73a26..5dfefc6e7b 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/service-broker.actions.ts @@ -1,10 +1,11 @@ +import { HttpRequest } from '@angular/common/http'; + import { getActions } from '../../../store/src/actions/action.helper'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { EntityRequestAction } from '../../../store/src/types/request.types'; import { cfEntityFactory } from '../cf-entity-factory'; import { serviceBrokerEntityType } from '../cf-entity-types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest } from '@angular/common/http'; export class GetServiceBrokers extends CFStartAction implements PaginatedAction { constructor( diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts index 34e8b3dde4..42adf48a73 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/service-plan-visibility.actions.ts @@ -1,3 +1,5 @@ +import { HttpRequest } from '@angular/common/http'; + import { getActions } from '../../../store/src/actions/action.helper'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { cfEntityFactory } from '../cf-entity-factory'; @@ -9,7 +11,6 @@ import { } from '../cf-entity-types'; import { createEntityRelationKey } from '../entity-relations/entity-relations.types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest } from '@angular/common/http'; export class GetServicePlanVisibilities extends CFStartAction implements PaginatedAction { constructor( diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts index d12c5e0ee3..a7b2621cda 100644 --- a/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts +++ b/src/frontend/packages/cloud-foundry/src/actions/service-plan.actions.ts @@ -1,3 +1,5 @@ +import { HttpRequest } from '@angular/common/http'; + import { getActions } from '../../../store/src/actions/action.helper'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { cfEntityFactory } from '../cf-entity-factory'; @@ -12,7 +14,6 @@ import { } from '../cf-entity-types'; import { createEntityRelationKey } from '../entity-relations/entity-relations.types'; import { CFStartAction } from './cf-action.types'; -import { HttpRequest } from '@angular/common/http'; export class GetServicePlanServiceInstances extends CFStartAction implements PaginatedAction { constructor( diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts index 7c6d7e0b99..56b874827c 100644 --- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts +++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts @@ -1,21 +1,14 @@ import { inject, TestBed } from '@angular/core/testing'; import { Store } from '@ngrx/store'; +import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing'; -import { - EntityCatalogTestModuleManualStore, - TEST_CATALOGUE_ENTITIES, -} from '../../../store/src/entity-catalog-test.module'; -import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog'; -import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types'; import { environment } from '../../../core/src/environments/environment'; -import { - createBasicStoreModule, - createEntityStoreState, - TestStoreEntity, -} from '@stratos/store/testing'; import { SetInitialParams } from '../../../store/src/actions/pagination.actions'; import { APIResponse } from '../../../store/src/actions/request.actions'; import { InternalAppState, IRequestTypeState } from '../../../store/src/app-state'; +import { EntityCatalogTestModuleManualStore, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module'; +import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog'; +import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types'; import { entityRelationMissingQuotaGuid, entityRelationMissingQuotaUrl, @@ -27,7 +20,6 @@ import { RequestEntityLocation, WrapperRequestActionSuccess, } from '../../../store/src/types/request.types'; -import { CF_ENDPOINT_TYPE } from '../cf-types'; import { GetOrganization } from '../actions/organization.actions'; import { FetchRelationPaginatedAction, FetchRelationSingleAction } from '../actions/relation.actions'; import { CFAppState } from '../cf-app-state'; @@ -40,6 +32,7 @@ import { routeEntityType, spaceEntityType, } from '../cf-entity-types'; +import { CF_ENDPOINT_TYPE } from '../cf-types'; import { EntityTreeRelation } from './entity-relation-tree'; import { validateEntityRelations } from './entity-relations'; import { createEntityRelationKey, createEntityRelationPaginationKey } from './entity-relations.types'; diff --git a/src/frontend/packages/store/src/types/request.types.ts b/src/frontend/packages/store/src/types/request.types.ts index 1e14568f76..e1b855210c 100644 --- a/src/frontend/packages/store/src/types/request.types.ts +++ b/src/frontend/packages/store/src/types/request.types.ts @@ -1,9 +1,9 @@ import { HttpRequest } from '@angular/common/http'; import { Action } from '@ngrx/store'; +import { ApiActionTypes, RequestTypes } from '../actions/request.actions'; import { BasePipelineRequestAction } from '../entity-catalog/action-orchestrator/action-orchestrator'; import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types'; -import { ApiActionTypes, RequestTypes } from '../actions/request.actions'; import { EntitySchema } from '../helpers/entity-schema'; import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers'; import { NormalizedResponse } from './api.types'; From 557deb2f828ee7d79e60f162f5af5da97ee98190 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 12 May 2020 17:15:57 +0100 Subject: [PATCH 05/15] WIP --- .../kubernetes/kubernetes-entity-factory.ts | 30 +++++-- .../kubernetes-namespaces-data-source.ts | 10 +-- .../kubernetes-node-pods-data-source.ts | 6 +- .../kubernetes-nodes-data-source.ts | 8 +- .../kubernetes-pods-data-source.ts | 6 +- .../kubernetes-services-data-source.ts | 6 +- .../custom/kubernetes/store/kube.getIds.ts | 79 +++++++++++++++++++ .../custom/kubernetes/store/kube.selectors.ts | 27 +++---- .../kubernetes/store/kubernetes.actions.ts | 67 ++++++++-------- .../kubernetes/store/kubernetes.effects.ts | 7 +- .../helm-release-pods-list-source.ts | 4 +- .../helm-release-services-list-source.ts | 48 +---------- .../helm-release-tab-base.component.ts | 12 ++- .../workloads/store/workloads.actions.ts | 7 +- .../kubernetes/workloads/workload.types.ts | 40 +++++----- 15 files changed, 196 insertions(+), 161 deletions(-) create mode 100644 custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts index 787e1a6024..7ae1e7178c 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts @@ -3,7 +3,15 @@ import { Schema, schema } from 'normalizr'; import { metricEntityType } from '../../../../cloud-foundry/src/cf-entity-types'; import { getAPIResourceGuid } from '../../../../cloud-foundry/src/store/selectors/api.selectors'; import { EntitySchema } from '../../../../store/src/helpers/entity-schema'; -import { getKubeAPIResourceGuid } from './store/kube.selectors'; +import { + getGuidFromKubeDashboardObj, + getGuidFromKubeDeploymentObj, + getGuidFromKubeNamespaceObj, + getGuidFromKubeNodeObj, + getGuidFromKubePodObj, + getGuidFromKubeServiceObj, + getGuidFromKubeStatefulSetObj, +} from './store/kube.getIds'; import { KubernetesApp } from './store/kube.types'; export const kubernetesEntityType = 'kubernetesInfo'; @@ -58,43 +66,49 @@ entityCache[kubernetesAppsEntityType] = new KubernetesEntitySchema( entityCache[kubernetesStatefulSetsEntityType] = new KubernetesEntitySchema( kubernetesStatefulSetsEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { + idAttribute: getGuidFromKubeStatefulSetObj + } ); entityCache[kubernetesPodsEntityType] = new KubernetesEntitySchema( kubernetesPodsEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { + idAttribute: getGuidFromKubePodObj + } ); entityCache[kubernetesDeploymentsEntityType] = new KubernetesEntitySchema( kubernetesDeploymentsEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { + idAttribute: getGuidFromKubeDeploymentObj + } ); entityCache[kubernetesNodesEntityType] = new KubernetesEntitySchema( kubernetesNodesEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { idAttribute: getGuidFromKubeNodeObj } ); entityCache[kubernetesNamespacesEntityType] = new KubernetesEntitySchema( kubernetesNamespacesEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { idAttribute: getGuidFromKubeNamespaceObj } ); entityCache[kubernetesServicesEntityType] = new KubernetesEntitySchema( kubernetesServicesEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { idAttribute: getGuidFromKubeServiceObj } ); entityCache[kubernetesDashboardEntityType] = new KubernetesEntitySchema( kubernetesDashboardEntityType, {}, - { idAttribute: getKubeAPIResourceGuid } + { idAttribute: getGuidFromKubeDashboardObj } ); entityCache[metricEntityType] = new KubernetesEntitySchema(metricEntityType); diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts index d1fd2cc6e3..eb8d545f24 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts @@ -4,9 +4,8 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { kubernetesEntityFactory, kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory'; +import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; import { KubernetesNamespace } from '../../store/kube.types'; import { GetKubernetesNamespaces } from '../../store/kubernetes.actions'; @@ -18,11 +17,12 @@ export class KubernetesNamespacesDataSource extends ListDataSource ) { + const action = new GetKubernetesNamespaces(kubeGuid.guid); super({ store, - action: new GetKubernetesNamespaces(kubeGuid.guid), - schema: kubernetesEntityFactory(kubernetesNamespacesEntityType), - getRowUniqueId: getKubeAPIResourceGuid, + action, + schema: action.entity[0], + getRowUniqueId: (row) => action.entity[0].getId(row), paginationKey: getPaginationKey(kubernetesNamespacesEntityType, kubeGuid.guid), isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts index a2c59454dd..ffd661ee3e 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts @@ -3,10 +3,8 @@ import { Store } from '@ngrx/store'; import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesNodeService } from '../../services/kubernetes-node.service'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; import { KubernetesPod } from '../../store/kube.types'; import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions'; @@ -22,8 +20,8 @@ export class KubernetesNodePodsDataSource extends ListDataSource super({ store, action, - schema: kubernetesEntityFactory(kubernetesPodsEntityType), - getRowUniqueId: getKubeAPIResourceGuid, + schema: action.entity[0], + getRowUniqueId: (row) => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts index 797cd9a5fd..a4cb7c905a 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts @@ -8,9 +8,8 @@ import { ListDataSource, } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { kubernetesEntityFactory, kubernetesNodesEntityType } from '../../kubernetes-entity-factory'; +import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; import { KubernetesNode } from '../../store/kube.types'; import { GetKubernetesNodes } from '../../store/kubernetes.actions'; @@ -22,11 +21,12 @@ export class KubernetesNodesDataSource extends ListDataSource { listConfig: IListConfig, transformEntities: (DataFunction | DataFunctionDefinition)[] ) { + const action = new GetKubernetesNodes(kubeGuid.guid); super({ store, action: new GetKubernetesNodes(kubeGuid.guid), - schema: kubernetesEntityFactory(kubernetesNodesEntityType), - getRowUniqueId: getKubeAPIResourceGuid, + schema: action.entity[0], + getRowUniqueId: (row) => action.entity[0].getId(row), paginationKey: getPaginationKey(kubernetesNodesEntityType, kubeGuid.guid), isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts index cd608a2569..abd06114e6 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts @@ -3,9 +3,7 @@ import { Store } from '@ngrx/store'; import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; import { KubernetesPod } from '../../store/kube.types'; import { GetKubernetesPods } from '../../store/kubernetes.actions'; @@ -20,8 +18,8 @@ export class KubernetesPodsDataSource extends ListDataSource { super({ store, action, - schema: kubernetesEntityFactory(kubernetesPodsEntityType), - getRowUniqueId: getKubeAPIResourceGuid, + schema: action.entity[0], + getRowUniqueId: (row) => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts index 6aed4a43f6..6b02912c88 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-services/kubernetes-services-data-source.ts @@ -5,8 +5,6 @@ import { AppState } from '../../../../../../store/src/app-state'; import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; -import { kubernetesEntityFactory, kubernetesServicesEntityType } from '../../kubernetes-entity-factory'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; import { KubeService } from '../../store/kube.types'; export class BaseKubernetesServicesDataSource extends ListDataSource { @@ -20,8 +18,8 @@ export class BaseKubernetesServicesDataSource extends ListDataSource action.entity[0].getId(row), paginationKey: action.paginationKey, transformEntity, isLocal: true, diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts new file mode 100644 index 0000000000..8f5d812860 --- /dev/null +++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts @@ -0,0 +1,79 @@ +import { + BasicKubeAPIResource, + KubernetesDeployment, + KubernetesNamespace, + KubernetesNode, + KubernetesPod, + KubernetesStatefulSet, + KubeService, +} from './kube.types'; +import { KubeDashboardStatus } from './kubernetes.effects'; + +const deliminate = (...args: string[]) => args.join('_:_'); + +const debugMissingKubeId = (entity: BasicKubeAPIResource) => { + if (!entity.metadata) { + console.log('DANGER WILL ROBINSON1:', entity); + } else if (!entity.metadata.kubeId) { + console.log('DANGER WILL ROBINSON2:', entity); + } +} + +export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => { + return deliminate(name, kubeGuid); +} +export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string => { + debugMissingKubeId(entity); + return getGuidFromKubeNode(entity.metadata.kubeId, entity.metadata.name); +} + +export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => { + return deliminate(name, kubeGuid); +} +export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string => { + debugMissingKubeId(entity); + return getGuidFromKubeNamespace(entity.metadata.kubeId, entity.metadata.name); +} + +export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => { + return deliminate(name, namespace, kubeGuid); +} +export const getGuidFromKubeServiceObj = (entity: KubeService): string => { + debugMissingKubeId(entity); + return getGuidFromKubeService(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); +} + +export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string => { + return deliminate(name, namespace, kubeGuid); +} +export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string => { + debugMissingKubeId(entity); + return getGuidFromKubeStatefulSet(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); +} + + +export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string => { + return deliminate(name, namespace, kubeGuid); +} +export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string => { + debugMissingKubeId(entity); + return getGuidFromKubeDeployment(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); +} + +export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => { + return deliminate(name, namespace, kubeGuid); +} +export const getGuidFromKubePodObj = (entity: KubernetesPod): string => { + debugMissingKubeId(entity); + return getGuidFromKubePod(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); +} + +export const getGuidFromKubeDashboard = (kubeGuid: string): string => { + return kubeGuid; +} +export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => { + if (!!entity.kubeGuid) { + console.log('aaaaa!!!!!'); + } + return getGuidFromKubeDashboard(entity.kubeGuid); +} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts index dd88469ca2..127babf675 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts @@ -1,20 +1,17 @@ -import { compose } from '@ngrx/store'; +// TODO: RC -import { BasicKubeAPIResource, Metadata } from './kube.types'; +// const getValueOrNull = (object, key) => +// object ? (object[key] ? object[key] : null) : null; +// export const getMetadataGuid = (metadata: Metadata): string => +// getValueOrNull(metadata, 'uid'); +// export const getKubeAPIMetadata = ( +// resource: BasicKubeAPIResource +// ): Metadata => getValueOrNull(resource, 'metadata'); -const getValueOrNull = (object, key) => - object ? (object[key] ? object[key] : null) : null; -export const getMetadataGuid = (metadata: Metadata): string => - getValueOrNull(metadata, 'uid'); - -export const getKubeAPIMetadata = ( - resource: BasicKubeAPIResource -): Metadata => getValueOrNull(resource, 'metadata'); - -export const getKubeAPIResourceGuid = compose( - getMetadataGuid, - getKubeAPIMetadata -); +// export const getKubeAPIResourceGuid = compose( +// getMetadataGuid, +// getKubeAPIMetadata +// ); diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts index fbf8a06d69..49abc5540c 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts @@ -17,6 +17,7 @@ import { kubernetesServicesEntityType, kubernetesStatefulSetsEntityType, } from '../kubernetes-entity-factory'; +import { getGuidFromKubeDashboard, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds'; import { KubernetesDeployment, KubernetesNamespace, @@ -89,36 +90,34 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure'; +// TODO: RC TIDY + const defaultSortParams = { 'order-direction': 'desc' as SortDirection, 'order-direction-field': 'name' }; -const deliminate = (...args: string[]) => args.join('_:_'); + export interface KubeAction extends EntityRequestAction { kubeGuid: string; } export interface KubePaginationAction extends PaginatedAction, KubeAction { - getId: (r: T, kubeGuid: string) => string; + // getId: (r: T, kubeGuid: string) => string; } export interface KubeSingleEntityAction extends KubeAction { guid: string; } export class GetKubernetesNode implements KubeSingleEntityAction { - static getGuid(kubeGuid: string, nodeName: string): string { - return deliminate(nodeName, kubeGuid); - } constructor(public nodeName: string, public kubeGuid: string) { - this.guid = GetKubernetesNode.getGuid(kubeGuid, nodeName); + this.guid = getGuidFromKubeNode(kubeGuid, nodeName); } type = GET_NODE_INFO; entityType = kubernetesNodesEntityType; endpointType = KUBERNETES_ENDPOINT_TYPE; entity = [kubernetesEntityFactory(kubernetesNodesEntityType)]; - actions = [ GET_NODE_INFO, GET_NODE_INFO_SUCCESS, @@ -144,7 +143,7 @@ export class GetKubernetesNodes implements KubePaginationAction initialParams: PaginationParam = { ...defaultSortParams }; - getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name); + // getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name); } export class KubeHealthCheck extends GetKubernetesNodes { @@ -158,7 +157,7 @@ export class KubeHealthCheck extends GetKubernetesNodes { export class CreateKubernetesNamespace implements KubeSingleEntityAction { public guid: string; constructor(public namespaceName: string, public kubeGuid: string) { - this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'? + // this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'? } type = CREATE_NAMESPACE; @@ -170,12 +169,12 @@ export class CreateKubernetesNamespace implements KubeSingleEntityAction { } export class GetKubernetesNamespace implements KubeSingleEntityAction { - static getGuid(kubeGuid: string, namespaceName: string): string { - return deliminate(namespaceName, kubeGuid); - } + // static getGuid(kubeGuid: string, namespaceName: string): string { + // return deliminate(namespaceName, kubeGuid); + // } constructor(public namespaceName: string, public kubeGuid: string) { - this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName); + // this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName); } type = GET_NAMESPACE_INFO; entityType = kubernetesNamespacesEntityType; @@ -207,17 +206,13 @@ export class GetKubernetesNamespaces implements KubePaginationAction GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name); + // getId = (namespace: KubernetesNamespace, kubeGuid: string): string => GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name); } export class GetKubernetesPod implements KubeSingleEntityAction { - static getId(kubeGuid: string, namespace: string, podName: string): string { // TODO: RC id/guid naming - return deliminate(podName, namespace, kubeGuid); - } - // static constructor(public podName, public namespaceName, public kubeGuid) { - this.guid = GetKubernetesPod.getId(kubeGuid, namespaceName, podName); + this.guid = getGuidFromKubePod(kubeGuid, namespaceName, podName); } type = GET_KUBE_POD; entityType = kubernetesPodsEntityType; @@ -248,7 +243,7 @@ export class GetKubernetesPods implements KubePaginationAction { initialParams: PaginationParam = { ...defaultSortParams }; - getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name); + // getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name); } export class GetKubernetesPodsOnNode extends GetKubernetesPods { @@ -279,9 +274,9 @@ export class GetKubernetesPodsInNamespace extends GetKubernetesPods { } export class GetKubernetesServices implements KubePaginationAction { - static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming - return deliminate(serviceName, namespace, kubeGuid); - } + // static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming + // return deliminate(serviceName, namespace, kubeGuid); + // } constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid); } @@ -298,7 +293,7 @@ export class GetKubernetesServices implements KubePaginationAction initialParams: PaginationParam = { ...defaultSortParams }; - getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name); + // getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name); } export class GetKubernetesServicesInNamespace extends GetKubernetesServices { @@ -321,9 +316,9 @@ export class GetKubernetesServicesInNamespace extends GetKubernetesServices { export class GetKubernetesStatefulSets implements KubePaginationAction { - static getId(kubeGuid: string, namespace: string, name: string): string { - return deliminate(name, namespace, kubeGuid); // TODO: RC check - } + // static getId(kubeGuid: string, namespace: string, name: string): string { + // return deliminate(name, namespace, kubeGuid); // TODO: RC check + // } constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid); @@ -338,13 +333,13 @@ export class GetKubernetesStatefulSets implements KubePaginationAction GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name); + // getId = (statefulSet: KubernetesStatefulSet, kubeGuid: string) => GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name); } export class GeKubernetesDeployments implements KubePaginationAction { - static getId(kubeGuid: string, namespace: string, name: string): string { - return deliminate(name, namespace, kubeGuid); // TODO: RC check - } + // static getId(kubeGuid: string, namespace: string, name: string): string { + // return deliminate(name, namespace, kubeGuid); // TODO: RC check + // } constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid); } @@ -358,15 +353,15 @@ export class GeKubernetesDeployments implements KubePaginationAction GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name); + // getId = (deployment: KubernetesDeployment, kubeGuid: string) => GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name); } export class GetKubernetesDashboard implements KubeSingleEntityAction { - static getId(kubeGuid: string): string { - return kubeGuid; - } + // static getId(kubeGuid: string): string { + // return kubeGuid; + // } constructor(public kubeGuid: string) { - this.guid = GetKubernetesDashboard.getId(kubeGuid); + this.guid = getGuidFromKubeDashboard(kubeGuid); } type = GET_KUBE_DASHBOARD; entityType = kubernetesDashboardEntityType; diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts index cf3c752176..645dc5b91e 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts @@ -73,6 +73,7 @@ export interface KubeDashboardContainer { export interface KubeDashboardStatus { guid: string; + kubeGuid: string; installed: boolean; stratosInstalled: boolean; running: boolean; @@ -90,9 +91,6 @@ export interface KubeDashboardStatus { serviceAccount: any; } -type GetID = (p: T) => string; -type Filter = (p: T) => boolean; - @Injectable() export class KubernetesEffects { proxyAPIVersion = environment.proxyAPIVersion; @@ -118,6 +116,7 @@ export class KubernetesEffects { result: [] } as NormalizedResponse; const status = response as KubeDashboardStatus; + status.kubeGuid = action.kubeGuid; result.entities[dashboardEntityConfig.entityKey][action.guid] = status; result.result.push(action.guid); return [ @@ -318,7 +317,7 @@ export class KubernetesEffects { }, []); const processesData = items .reduce((res, data) => { - const id = action.getId(data, data.metadata.kubeId); + const id = action.entity[0].getId(data); const updatedData = action.entityType === kubernetesPodsEntityType ? KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(data as unknown as KubernetesPod) : data; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts index d3cb3f80c4..317867b68d 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts @@ -3,7 +3,6 @@ import { ListDataSource } from 'frontend/packages/core/src/shared/components/lis import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types'; import { AppState } from 'frontend/packages/store/src/app-state'; -import { getKubeAPIResourceGuid } from '../../store/kube.selectors'; import { KubernetesPod } from '../../store/kube.types'; import { GetHelmReleasePods } from '../store/workloads.actions'; @@ -17,12 +16,11 @@ export class HelmReleasePodsDataSource extends ListDataSource { releaseTitle: string ) { const action = new GetHelmReleasePods(endpointGuid, releaseTitle); - super({ store, action, schema: action.entity[0], - getRowUniqueId: getKubeAPIResourceGuid, + getRowUniqueId: (row: KubernetesPod) => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts index b85316b114..24186f23f9 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-services-list-source.ts @@ -2,40 +2,9 @@ import { Store } from '@ngrx/store'; import { ListDataSource } from 'frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types'; import { AppState } from 'frontend/packages/store/src/app-state'; -import { PaginationMonitor } from 'frontend/packages/store/src/monitors/pagination-monitor'; -import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { Observable } from 'rxjs'; -import { filter, map, publishReplay, refCount, switchMap } from 'rxjs/operators'; -import { kubernetesEntityFactory } from '../../kubernetes-entity-factory'; import { KubeService } from '../../store/kube.types'; -import { GetKubernetesServices, GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions'; -import { GetHelmReleases, GetHelmReleaseServices } from '../store/workloads.actions'; -import { HelmRelease, HelmReleaseService } from '../workload.types'; - - -export const fetchHelmReleaseServiceFromKubernetes = (store: Store, helmService: HelmReleaseService): Observable => { - return fetchRelease(store, helmService.endpointId, helmService.releaseTitle).pipe( - switchMap(release => { - const action = new GetKubernetesServicesInNamespace(helmService.endpointId, release.namespace); - const paginationMonitor = new PaginationMonitor(store, action.paginationKey, kubernetesEntityFactory(action.entityType)); - return getPaginationObservables({ store, action, paginationMonitor }).entities$; - }), - filter(entities => !!entities), - map(services => services.find(service => service.metadata.name === helmService.name)), - publishReplay(1), - refCount() - ); -}; - -function fetchRelease(store: Store, endpointGuid: string, releaseTitle: string) { - const action = new GetHelmReleases(); - const paginationMonitor = new PaginationMonitor(store, action.paginationKey, action); - const svc = getPaginationObservables({ store, action, paginationMonitor }); - return svc.entities$.pipe( - map((items: HelmRelease[]) => items.find(item => item.guid === `${endpointGuid}:${releaseTitle}`)) - ); -} +import { GetHelmReleaseServices } from '../store/workloads.actions'; export class HelmReleaseServicesDataSource extends ListDataSource { @@ -50,23 +19,10 @@ export class HelmReleaseServicesDataSource extends ListDataSource { store, action, schema: action.entity[0], - getRowUniqueId: (row: KubeService) => GetKubernetesServices.getId(row.metadata.kubeId, row.metadata.namespace, row.metadata.name), + getRowUniqueId: (row: KubeService) => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, listConfig, }); - // transformEntity: map((helmServices: HelmReleaseService[]) => { - // return helmServices.map(helmService => { - // if (!helmService.kubeService$) { - // helmService.kubeService$ = fetchHelmReleaseServiceFromKubernetes(store, helmService); - // } - // return helmService; - // }); - // }), - // refresh: () => { - // store.dispatch(action); - // store.dispatch(new ClearPaginationOfType(action)); - // } - // }); } } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts index c337b3e032..5f5ad87171 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts @@ -19,7 +19,7 @@ import { GetHelmReleaseResource, GetHelmReleaseServices, } from '../../store/workloads.actions'; -import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod } from '../../workload.types'; +import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types'; import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service'; @@ -168,18 +168,22 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { } private populateList(action: KubePaginationAction, resources: any) { + const entity = entityCatalog.getEntity(action); + const entityKey = entity.entityKey; const newResources = {}; resources.forEach(resource => { - const newResource: HelmReleasePod = { + const newResource: HelmReleasePod | HelmReleaseService = { endpointId: action.kubeGuid, releaseTitle: this.helmReleaseHelper.releaseTitle, ...resource }; - newResources[action.getId(newResource, action.kubeGuid)] = newResource; + newResource.metadata.kubeId = action.kubeGuid; + const entityId = entity.getSchema(action.schemaKey).getId(resource) + newResources[entityId] = newResource; }); const releasePods = { - entities: { [entityCatalog.getEntityKey(action)]: newResources }, + entities: { [entityKey]: newResources }, result: Object.keys(newResources) }; const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1); diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts index e5a61ea7a8..4e7ebcd501 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts @@ -8,8 +8,7 @@ import { kubernetesPodsEntityType, kubernetesServicesEntityType, } from '../../kubernetes-entity-factory'; -import { KubernetesPod, KubeService } from '../../store/kube.types'; -import { GetKubernetesPod, GetKubernetesServices, KubePaginationAction } from '../../store/kubernetes.actions'; +import { KubePaginationAction } from '../../store/kubernetes.actions'; import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory'; export const GET_HELM_RELEASES = '[Helm] Get Releases'; @@ -126,8 +125,6 @@ export class GetHelmReleasePods implements KubePaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; - getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name); - } /** @@ -154,8 +151,6 @@ export class GetHelmReleaseServices implements KubePaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; - getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name); - } export class HelmUpdateRelease implements Action { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts index b0394359ab..63007dfd69 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { KubeService } from '../store/kube.types'; +import { KubernetesPod, KubeService } from '../store/kube.types'; export interface HelmRelease { endpointId: string; @@ -27,28 +26,33 @@ export interface HelmRelease { }; } -export interface HelmReleasePod { +export interface HelmReleaseEntity { endpointId: string; releaseTitle: string; - name: string; - ready: string; - status: string; - restarts: string; - age: string; } -export interface HelmReleaseService { - endpointId: string; - releaseTitle: string; - name: string; - kubeService$?: Observable; - metadata: any; - spec: any; +export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod { + // endpointId: string; + // releaseTitle: string; + // name: string; + // ready: string; + // status: string; + // restarts: string; + // age: string; } -export interface HelmReleaseGraph { - endpointId: string; - releaseTitle: string; +export interface HelmReleaseService extends HelmReleaseEntity, KubeService { + // endpointId: string; + // releaseTitle: string; + // name: string; + //kubeService$?: Observable; // TODO: RC ?? + // metadata: any; + // spec: any; +} + +export interface HelmReleaseGraph extends HelmReleaseEntity { + // endpointId: string; + // releaseTitle: string; nodes: {}; links: {}; } From aae429e44be82fd0d4ff6d27d92c1e4e0ce98d62 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 12 May 2020 17:42:59 +0100 Subject: [PATCH 06/15] Started to apply --- .../kubernetes/kubernetes-entity-catalog.ts | 38 ++++++++-- .../kubernetes/kubernetes-entity-generator.ts | 26 ++++--- .../kubernetes-pod-containers.component.ts | 10 +-- .../action-builders/kube.action-builders.ts | 74 +++++++++++++++++-- 4 files changed, 118 insertions(+), 30 deletions(-) diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts index 8aab0f5479..72cf4013ba 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts @@ -1,18 +1,44 @@ -import { StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; +import { + StratosCatalogEndpointEntity, + StratosCatalogEntity, +} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; -import { KubeNamespaceActionBuilders } from './store/action-builders/kube.action-builders'; -import { KubernetesNamespace } from './store/kube.types'; +import { + KubeAppActionBuilders, + KubeDashboardActionBuilders, + KubeDeploymentActionBuilders, + KubeNamespaceActionBuilders, + KubeNodeActionBuilders, + KubePodActionBuilders, + KubeServiceActionBuilders, + KubeStatefulSetsActionBuilders, +} from './store/action-builders/kube.action-builders'; +import { + KubernetesApp, + KubernetesDeployment, + KubernetesNamespace, + KubernetesNode, + KubernetesPod, + KubernetesStatefulSet, + KubeService, +} from './store/kube.types'; /** * A strongly typed collection of Kube Catalog Entities. * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc */ export class KubeEntityCatalog { - + public endpoint: StratosCatalogEndpointEntity; + public app: StratosCatalogEntity; + public statefulSet: StratosCatalogEntity; + public pod: StratosCatalogEntity; + public deployment: StratosCatalogEntity; + public node: StratosCatalogEntity; public namespace: StratosCatalogEntity; - + public service: StratosCatalogEntity + public dashboard: StratosCatalogEntity; + // TODO: RC workloads stuff } - export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog(); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts index 38b9d860ab..0fda94fd02 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts @@ -175,10 +175,11 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] { } function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - return new StratosCatalogEndpointEntity( + kubeEntityCatalog.endpoint = new StratosCatalogEndpointEntity( endpointDefinition, metadata => `/kubernetes/${metadata.guid}` ); + return kubeEntityCatalog.endpoint; } function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -186,11 +187,11 @@ function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinitio type: kubernetesAppsEntityType, schema: kubernetesEntityFactory(kubernetesAppsEntityType), endpoint: endpointDefinition, - }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.app = new StratosCatalogEntity(definition, { actionBuilders: kubeAppActionBuilders }); + return kubeEntityCatalog.app; } function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -199,9 +200,10 @@ function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtension schema: kubernetesEntityFactory(kubernetesStatefulSetsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.statefulSet = new StratosCatalogEntity(definition, { actionBuilders: kubeStatefulSetsActionBuilders }); + return kubeEntityCatalog.statefulSet; } function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -210,9 +212,10 @@ function generatePodsEntity(endpointDefinition: StratosEndpointExtensionDefiniti schema: kubernetesEntityFactory(kubernetesPodsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.pod = new StratosCatalogEntity(definition, { actionBuilders: kubePodActionBuilders }); + return kubeEntityCatalog.pod; } function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -221,9 +224,10 @@ function generateDeploymentsEntity(endpointDefinition: StratosEndpointExtensionD schema: kubernetesEntityFactory(kubernetesDeploymentsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.deployment = new StratosCatalogEntity(definition, { actionBuilders: kubeDeploymentActionBuilders }); + return kubeEntityCatalog.deployment; } function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -232,9 +236,10 @@ function generateNodesEntity(endpointDefinition: StratosEndpointExtensionDefinit schema: kubernetesEntityFactory(kubernetesNodesEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.node = new StratosCatalogEntity(definition, { actionBuilders: kubeNodeActionBuilders }); + return kubeEntityCatalog.node; } function generateNamespacesEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -255,9 +260,10 @@ function generateServicesEntity(endpointDefinition: StratosEndpointExtensionDefi schema: kubernetesEntityFactory(kubernetesServicesEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.service = new StratosCatalogEntity(definition, { actionBuilders: kubeServiceActionBuilders }); + return kubeEntityCatalog.service; } function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -266,10 +272,10 @@ function generateDashboardEntity(endpointDefinition: StratosEndpointExtensionDef schema: kubernetesEntityFactory(kubernetesDashboardEntityType), endpoint: endpointDefinition }; - // TODO: RC any - return new StratosCatalogEntity(definition, { + kubeEntityCatalog.dashboard = new StratosCatalogEntity(definition, { actionBuilders: kubeDashboardActionBuilders }); + return kubeEntityCatalog.dashboard; } function generateMetricEntity(endpointDefinition: StratosEndpointExtensionDefinition) { diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts index a2d755a21d..03295227db 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts @@ -6,8 +6,6 @@ import { of } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { AppState } from '../../../../../../../store/src/app-state'; -import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog'; -import { selectEntity } from '../../../../../../../store/src/selectors/api.selectors'; import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component'; import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types'; import { @@ -20,7 +18,7 @@ import { } from '../../../../../shared/components/list/list-table/table-cell-icon/table-cell-icon.component'; import { ITableColumn } from '../../../../../shared/components/list/list-table/table.types'; import { CardCell } from '../../../../../shared/components/list/list.types'; -import { KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType } from '../../../kubernetes-entity-factory'; +import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog'; import { Container, ContainerState, ContainerStatus, InitContainer, KubernetesPod } from '../../../store/kube.types'; export interface ContainerForTable { @@ -39,17 +37,15 @@ export interface ContainerForTable { }) export class KubernetesPodContainersComponent extends CardCell { - private entityConfig = entityCatalog.getEntity(KUBERNETES_ENDPOINT_TYPE, kubernetesPodsEntityType); - @Input() set row(row: KubernetesPod) { if (!row || !!this.containerDataSource) { return; } - // TODO: RC + const id = kubeEntityCatalog.pod.getSchema().getId(row); this.containerDataSource = { isTableLoading$: of(false), - connect: () => this.store.select(selectEntity(this.entityConfig.entityKey, row.metadata.uid)).pipe( + connect: () => kubeEntityCatalog.pod.store.getEntityMonitor(id).entity$.pipe( filter(pod => !!pod), map(pod => this.map(pod)), ), diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts index 9f6eee394f..5a39ea5df7 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts @@ -3,9 +3,20 @@ import { } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; import { CreateKubernetesNamespace, + GeKubernetesDeployments, + GetKubernetesDashboard, GetKubernetesNamespace, + GetKubernetesNamespaces, GetKubernetesNode, GetKubernetesNodes, + GetKubernetesPod, + GetKubernetesPods, + GetKubernetesPodsInNamespace, + GetKubernetesPodsOnNode, + GetKubernetesServices, + GetKubernetesServicesInNamespace, + GetKubernetesStatefulSets, + KubeHealthCheck, } from '../kubernetes.actions'; export interface KubeAppActionBuilders extends OrchestratedActionBuilders { @@ -16,24 +27,52 @@ export const kubeAppActionBuilders: KubeAppActionBuilders = { } export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders { - + getMultiple: ( + kubeGuid: string, + paginationKey: string, + ) => GetKubernetesStatefulSets } export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = { + getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesStatefulSets(kubeGuid) } export interface KubePodActionBuilders extends OrchestratedActionBuilders { - + get: ( + podName: string, + kubeGuid: string, + extraArgs: { namespace: string } + ) => GetKubernetesPod, + getMultiple: ( + kubeGuid: string, + paginationKey: string, + ) => GetKubernetesPods + getOnNode: ( + kubeGuid: string, + nodeName: string + ) => GetKubernetesPodsOnNode + getInNamespace: ( + kubeGuid: string, + namespace: string + ) => GetKubernetesPodsInNamespace } export const kubePodActionBuilders: KubePodActionBuilders = { + get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid), + getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesPods(kubeGuid), + getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName), + getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace) } export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders { - + getMultiple: ( + kubeGuid: string, + paginationKey: string, + ) => GeKubernetesDeployments } export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = { + getMultiple: (kubeGuid: string, paginationKey: string) => new GeKubernetesDeployments(kubeGuid) } export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { @@ -45,11 +84,15 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { kubeGuid: string, paginationKey: string, ) => GetKubernetesNodes + healthCheck: ( + kubeGuid: string, + ) => KubeHealthCheck; } export const kubeNodeActionBuilders: KubeNodeActionBuilders = { get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid), - getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid) + getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid), + healthCheck: (kubeGuid: string) => new KubeHealthCheck(kubeGuid) } export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders { @@ -61,25 +104,42 @@ export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders namespace: string, kubeGuid: string ) => CreateKubernetesNamespace; + getMultiple: ( + kubeGuid: string, + paginationKey: string, + ) => GetKubernetesNamespaces } export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = { get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid), - create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid) + create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid), + getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNamespaces(kubeGuid) } export interface KubeServiceActionBuilders extends OrchestratedActionBuilders { - + getMultiple: ( + kubeGuid: string, + paginationKey: string + ) => GetKubernetesServices + getInNamespace: ( + namespace: string, + kubeGuid: string + ) => GetKubernetesServicesInNamespace } export const kubeServiceActionBuilders: KubeServiceActionBuilders = { + getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesServices(kubeGuid), + getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace) } export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders { - + get: ( + kubeGuid: string + ) => GetKubernetesDashboard; } export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = { + get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid) } // export interface A extends OrchestratedActionBuilders { From 1b9ce7ba0b9b6556f100d761314b7276c225239e Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 13 May 2020 12:02:57 +0100 Subject: [PATCH 07/15] WIP --- .../create-release.component.ts | 19 +++--- .../kubernetes/kubernetes.setup.module.ts | 7 +-- .../kubernetes-namespace-pods-data-source.ts | 4 +- ...bernetes-namespace-services-data-source.ts | 5 +- .../kubernetes-namespaces-data-source.ts | 4 +- .../kubernetes-node-pods-data-source.ts | 4 +- .../kubernetes-nodes-data-source.ts | 6 +- .../kubernetes-pods-data-source.ts | 4 +- .../pod-metrics/pod-metrics.component.ts | 18 ++---- .../services/kubernetes-endpoint.service.ts | 63 ++++--------------- .../services/kubernetes-namespace.service.ts | 14 +---- .../services/kubernetes-node.service.ts | 12 +--- .../action-builders/kube.action-builders.ts | 24 +++---- .../kubernetes-summary.component.ts | 11 ++-- .../kube-namespaces-filter-config.service.ts | 33 ++++------ 15 files changed, 77 insertions(+), 151 deletions(-) diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index c9c1a14fc6..addfb39838 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -4,8 +4,6 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatTextareaAutosize } from '@angular/material'; import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; -import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory'; -import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators'; @@ -20,10 +18,14 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory'; import { KubernetesNamespace } from '../../kubernetes/store/kube.types'; -import { GetKubernetesNamespaces } from '../../kubernetes/store/kubernetes.actions'; import { HelmInstall } from '../store/helm.actions'; import { HelmInstallValues } from '../store/helm.types'; + +// private pmf: PaginationMonitorFactory, // TODO: RC search and destroy +// private emf: EntityMonitorFactory // TODO: RC search and destroy +// store.dispatch + @Component({ selector: 'app-create-release', templateUrl: './create-release.component.html', @@ -66,7 +68,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { private store: Store, private httpClient: HttpClient, private confirmDialog: ConfirmationDialogService, - private pmf: PaginationMonitorFactory, // TODO: RC search and destroy + // private pmf: PaginationMonitorFactory, // TODO: RC search and destroy private emf: EntityMonitorFactory // TODO: RC search and destroy ) { const chart = this.route.snapshot.params; @@ -100,13 +102,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE); - const action = new GetKubernetesNamespaces(null); - const allNamespaces$ = getPaginationObservables({ - store: this.store, - action, - paginationMonitor: this.pmf.create(action.paginationKey, action, true) - }).entities$.pipe( - tap(a => console.log(action, a)), + const allNamespaces$ = kubeEntityCatalog.namespace.store.getPaginationService(null).entities$.pipe( + // tap(a => console.log(action, a)), // TODO: RC find all console.log filter(namespaces => !!namespaces), first() ); diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts index 305457f572..45f33e0292 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.setup.module.ts @@ -1,8 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule, Optional, SkipSelf } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from '../../../../store/src/app-state'; import { EntityCatalogModule } from '../../../../store/src/entity-catalog.module'; import { EndpointHealthCheck } from '../../../endpoints-health-checks'; import { CoreModule } from '../../core/core.module'; @@ -16,12 +14,12 @@ import { KubernetesConfigAuthFormComponent, } from './auth-forms/kubernetes-config-auth-form/kubernetes-config-auth-form.component'; import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth-form/kubernetes-gke-auth-form.component'; +import { kubeEntityCatalog } from './kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE } from './kubernetes-entity-factory'; import { generateKubernetesEntities } from './kubernetes-entity-generator'; import { BaseKubeGuid } from './kubernetes-page.types'; import { KubernetesStoreModule } from './kubernetes.store.module'; import { KubernetesEndpointService } from './services/kubernetes-endpoint.service'; -import { KubeHealthCheck } from './store/kubernetes.actions'; @NgModule({ @@ -52,14 +50,13 @@ import { KubeHealthCheck } from './store/kubernetes.actions'; export class KubernetesSetupModule { constructor( endpointService: EndpointsService, - store: Store, @Optional() @SkipSelf() parentModule: KubernetesSetupModule ) { if (parentModule) { // Module has already been imported } else { endpointService.registerHealthCheck( - new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => store.dispatch(new KubeHealthCheck(endpoint.guid))) + new EndpointHealthCheck(KUBERNETES_ENDPOINT_TYPE, (endpoint) => kubeEntityCatalog.node.api.healthCheck(endpoint.guid)) ); } } diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts index aef7b05503..b5c6dbc2aa 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-pods/kubernetes-namespace-pods-data-source.ts @@ -3,11 +3,11 @@ import { Store } from '@ngrx/store'; import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { kubernetesEntityFactory, kubernetesPodsEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesNamespaceService } from '../../services/kubernetes-namespace.service'; import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesPodsInNamespace } from '../../store/kubernetes.actions'; export class KubernetesNamespacePodsDataSource extends ListDataSource { @@ -17,7 +17,7 @@ export class KubernetesNamespacePodsDataSource extends ListDataSource, kubeNamespaceService: KubernetesNamespaceService, ) { - const action = new GetKubernetesPodsInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName); + const action = kubeEntityCatalog.pod.actions.getInNamespace(kubeGuid.guid, kubeNamespaceService.namespaceName); super({ store, action, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts index 063318f97f..beb0626c7e 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespace-services/kubernetes-namespace-services-data-source.ts @@ -2,9 +2,9 @@ import { Store } from '@ngrx/store'; import { AppState } from '../../../../../../store/src/app-state'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubeService } from '../../store/kube.types'; -import { GetKubernetesServicesInNamespace } from '../../store/kubernetes.actions'; import { BaseKubernetesServicesDataSource } from '../kubernetes-services/kubernetes-services-data-source'; @@ -16,10 +16,9 @@ export class KubernetesNamespaceServicesDataSource extends BaseKubernetesService listConfig: IListConfig, namespace: string, ) { - const action = new GetKubernetesServicesInNamespace(kubeGuid.guid, namespace); super( store, - action, + kubeEntityCatalog.service.actions.getInNamespace(namespace, kubeGuid.guid), listConfig ); } diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts index eb8d545f24..2c3a375252 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-namespaces/kubernetes-namespaces-data-source.ts @@ -4,10 +4,10 @@ import { getPaginationKey } from '../../../../../../store/src/actions/pagination import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { kubernetesNamespacesEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesNamespace } from '../../store/kube.types'; -import { GetKubernetesNamespaces } from '../../store/kubernetes.actions'; export class KubernetesNamespacesDataSource extends ListDataSource { @@ -17,7 +17,7 @@ export class KubernetesNamespacesDataSource extends ListDataSource ) { - const action = new GetKubernetesNamespaces(kubeGuid.guid); + const action = kubeEntityCatalog.namespace.actions.getMultiple(kubeGuid.guid); super({ store, action, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts index ffd661ee3e..f89ae7ae9f 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-node-pods/kubernetes-node-pods-data-source.ts @@ -3,10 +3,10 @@ import { Store } from '@ngrx/store'; import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesNodeService } from '../../services/kubernetes-node.service'; import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesPodsOnNode } from '../../store/kubernetes.actions'; export class KubernetesNodePodsDataSource extends ListDataSource { @@ -16,7 +16,7 @@ export class KubernetesNodePodsDataSource extends ListDataSource listConfig: IListConfig, kubeNodeService: KubernetesNodeService, ) { - const action = new GetKubernetesPodsOnNode(kubeGuid.guid, kubeNodeService.nodeName); + const action = kubeEntityCatalog.pod.actions.getOnNode(kubeGuid.guid, kubeNodeService.nodeName); super({ store, action, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts index a4cb7c905a..30678de266 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-nodes/kubernetes-nodes-data-source.ts @@ -8,10 +8,10 @@ import { ListDataSource, } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { kubernetesNodesEntityType } from '../../kubernetes-entity-factory'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesNode } from '../../store/kube.types'; -import { GetKubernetesNodes } from '../../store/kubernetes.actions'; export class KubernetesNodesDataSource extends ListDataSource { @@ -21,10 +21,10 @@ export class KubernetesNodesDataSource extends ListDataSource { listConfig: IListConfig, transformEntities: (DataFunction | DataFunctionDefinition)[] ) { - const action = new GetKubernetesNodes(kubeGuid.guid); + const action = kubeEntityCatalog.node.actions.getMultiple(kubeGuid.guid); super({ store, - action: new GetKubernetesNodes(kubeGuid.guid), + action, schema: action.entity[0], getRowUniqueId: (row) => action.entity[0].getId(row), paginationKey: getPaginationKey(kubernetesNodesEntityType, kubeGuid.guid), diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts index abd06114e6..57d56cf38a 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pods-data-source.ts @@ -3,9 +3,9 @@ import { Store } from '@ngrx/store'; import { AppState } from '../../../../../../store/src/app-state'; import { ListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../../shared/components/list/list.component.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../../kubernetes-page.types'; import { KubernetesPod } from '../../store/kube.types'; -import { GetKubernetesPods } from '../../store/kubernetes.actions'; export class KubernetesPodsDataSource extends ListDataSource { @@ -14,7 +14,7 @@ export class KubernetesPodsDataSource extends ListDataSource { kubeGuid: BaseKubeGuid, listConfig: IListConfig ) { - const action = new GetKubernetesPods(kubeGuid.guid); + const action = kubeEntityCatalog.pod.actions.getMultiple(kubeGuid.guid); super({ store, action, diff --git a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts index 8f144d0768..0da0a94369 100644 --- a/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/pod-metrics/pod-metrics.component.ts @@ -1,12 +1,8 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; -import * as moment from 'moment'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { AppState } from '../../../../../store/src/app-state'; -import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { EntityInfo } from '../../../../../store/src/types/api.types'; import { ChartSeries, IMetricMatrixResult } from '../../../../../store/src/types/base-metric.types'; import { IMetricApplication } from '../../../../../store/src/types/metric.types'; @@ -18,12 +14,13 @@ import { getMetricsChartConfigBuilder, } from '../../../shared/components/metrics-chart/metrics.component.helpers'; import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types'; +import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; +import { formatAxisCPUTime, formatCPUTime } from '../kubernetes-metrics.helpers'; import { BaseKubeGuid } from '../kubernetes-page.types'; import { KubernetesEndpointService } from '../services/kubernetes-endpoint.service'; import { KubernetesService } from '../services/kubernetes.service'; import { KubernetesPod } from '../store/kube.types'; -import { FetchKubernetesMetricsAction, GetKubernetesPod } from '../store/kubernetes.actions'; -import { formatCPUTime, formatAxisCPUTime } from '../kubernetes-metrics.helpers'; +import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions'; @Component({ selector: 'app-pod-metrics', @@ -58,8 +55,6 @@ export class PodMetricsComponent { constructor( public activatedRoute: ActivatedRoute, - public store: Store, - public entityServiceFactory: EntityServiceFactory, public kubeEndpointService: KubernetesEndpointService ) { this.podName = activatedRoute.snapshot.params.podName; @@ -166,9 +161,8 @@ export class PodMetricsComponent { }]; }) ); - this.podEntity$ = this.entityServiceFactory.create( - this.podName, - new GetKubernetesPod(this.podName, this.namespaceName, this.kubeEndpointService.kubeGuid), - ).entityObs$; + this.podEntity$ = kubeEntityCatalog.pod.store.getEntityService(this.podName, this.kubeEndpointService.kubeGuid, { + namespace: this.namespaceName + }).entityObs$; } } diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts index 612e762654..cd6c67b9f3 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts @@ -7,17 +7,10 @@ import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actio import { AppState } from '../../../../../store/src/app-state'; import { EntityService } from '../../../../../store/src/entity-service'; import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; -import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; -import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; +import { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; import { EntityInfo } from '../../../../../store/src/types/api.types'; import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types'; -import { - kubernetesDeploymentsEntityType, - kubernetesNodesEntityType, - kubernetesPodsEntityType, - kubernetesServicesEntityType, - kubernetesStatefulSetsEntityType, -} from '../kubernetes-entity-factory'; +import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; import { BaseKubeGuid } from '../kubernetes-page.types'; import { KubernetesDeployment, @@ -26,15 +19,6 @@ import { KubernetesStatefulSet, KubeService, } from '../store/kube.types'; -import { - GeKubernetesDeployments, - GetKubernetesDashboard, - GetKubernetesNodes, - GetKubernetesPods, - GetKubernetesServices, - GetKubernetesStatefulSets, - KubePaginationAction, -} from '../store/kubernetes.actions'; import { KubeDashboardStatus } from '../store/kubernetes.effects'; @Injectable() @@ -61,7 +45,6 @@ export class KubernetesEndpointService { public baseKube: BaseKubeGuid, private store: Store, private entityServiceFactory: EntityServiceFactory, - private paginationMonitorFactory: PaginationMonitorFactory ) { const kubeGuid = baseKube.guid; @@ -160,40 +143,22 @@ export class KubernetesEndpointService { this.currentUser$ = this.endpoint$.pipe(map(e => e.entity.user), shareReplay(1)); - this.deployments$ = this.getObservable( - new GeKubernetesDeployments(this.kubeGuid), - kubernetesDeploymentsEntityType - ); + this.deployments$ = this.getObservable(kubeEntityCatalog.deployment.store.getPaginationService(this.kubeGuid)); - this.pods$ = this.getObservable( - new GetKubernetesPods(this.kubeGuid), - kubernetesPodsEntityType - ); + this.pods$ = this.getObservable(kubeEntityCatalog.pod.store.getPaginationService(this.kubeGuid)); - this.nodes$ = this.getObservable( - new GetKubernetesNodes(this.kubeGuid), - kubernetesNodesEntityType - ); + this.nodes$ = this.getObservable(kubeEntityCatalog.node.store.getPaginationService(this.kubeGuid)) - this.statefulSets$ = this.getObservable( - new GetKubernetesStatefulSets(this.kubeGuid), - kubernetesStatefulSetsEntityType - ); + this.statefulSets$ = this.getObservable(kubeEntityCatalog.statefulSet.store.getPaginationService(this.kubeGuid)); - this.services$ = this.getObservable( - new GetKubernetesServices(this.kubeGuid), - kubernetesServicesEntityType - ); + this.services$ = this.getObservable(kubeEntityCatalog.service.store.getPaginationService(this.kubeGuid)); this.kubeDashboardEnabled$ = this.store.select('auth').pipe( filter(auth => !!auth.sessionData['plugin-config']), map(auth => auth.sessionData['plugin-config'].kubeDashboardEnabled === 'true') ); - const kubeDashboardStatus$ = this.entityServiceFactory.create( - this.kubeGuid, - new GetKubernetesDashboard(this.kubeGuid), - ).waitForEntity$.pipe( + const kubeDashboardStatus$ = kubeEntityCatalog.dashboard.store.getEntityService(this.kubeGuid).waitForEntity$.pipe( map(status => status.entity), filter(status => !!status) ); @@ -223,14 +188,12 @@ export class KubernetesEndpointService { } public refreshKubernetesDashboardStatus() { - this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid)); + // this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid)); // TODO: RC store.dispatch + kubeEntityCatalog.dashboard.api.get(this.kubeGuid); } - private getObservable(paginationAction: KubePaginationAction, schemaKey: string): Observable { - return getPaginationObservables({ - store: this.store, - action: paginationAction, - paginationMonitor: this.paginationMonitorFactory.create(paginationAction.paginationKey, paginationAction, true) - }, true).entities$.pipe(filter(p => !!p), first()); + private getObservable(obs: PaginationObservables): Observable { + return obs.entities$.pipe(filter(p => !!p), first()); } + } diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts index 0d58870122..c4686cf28b 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-namespace.service.ts @@ -1,15 +1,11 @@ import { Injectable } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { filter, first, map, publishReplay } from 'rxjs/operators'; -import { AppState } from '../../../../../store/src/app-state'; -import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; -import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { getIdFromRoute } from '../../../core/utils.service'; +import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; import { KubernetesNamespace } from '../store/kube.types'; -import { GetKubernetesNamespace } from '../store/kubernetes.actions'; import { KubernetesEndpointService } from './kubernetes-endpoint.service'; @Injectable() @@ -21,18 +17,12 @@ export class KubernetesNamespaceService { constructor( public kubeEndpointService: KubernetesEndpointService, public activatedRoute: ActivatedRoute, - public store: Store, - public paginationMonitorFactory: PaginationMonitorFactory, - public entityServiceFactory: EntityServiceFactory, ) { this.namespaceName = getIdFromRoute(activatedRoute, 'namespaceName'); this.kubeGuid = kubeEndpointService.kubeGuid; - const namespaceEntity = this.entityServiceFactory.create( - this.namespaceName, - new GetKubernetesNamespace(this.namespaceName, this.kubeGuid), - ); + const namespaceEntity = kubeEntityCatalog.namespace.store.getEntityService(this.namespaceName, this.kubeGuid); this.namespace$ = namespaceEntity.entityObs$.pipe( filter(p => !!p), diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts index 74cc1f75d9..096eb86efa 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-node.service.ts @@ -6,14 +6,13 @@ import { filter, first, map, shareReplay } from 'rxjs/operators'; import { MetricQueryConfig, MetricsAction } from '../../../../../store/src/actions/metrics.actions'; import { AppState } from '../../../../../store/src/app-state'; -import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; -import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { EntityInfo } from '../../../../../store/src/types/api.types'; import { getIdFromRoute } from '../../../core/utils.service'; import { MetricQueryType } from '../../../shared/services/metrics-range-selector.types'; +import { kubeEntityCatalog } from '../kubernetes-entity-catalog'; import { KubernetesNode, MetricStatistic } from '../store/kube.types'; -import { FetchKubernetesMetricsAction, GetKubernetesNode } from '../store/kubernetes.actions'; +import { FetchKubernetesMetricsAction } from '../store/kubernetes.actions'; import { KubernetesEndpointService } from './kubernetes-endpoint.service'; @@ -33,17 +32,12 @@ export class KubernetesNodeService { public kubeEndpointService: KubernetesEndpointService, public activatedRoute: ActivatedRoute, public store: Store, - public paginationMonitorFactory: PaginationMonitorFactory, - public entityServiceFactory: EntityServiceFactory, public entityMonitorFactory: EntityMonitorFactory ) { this.nodeName = getIdFromRoute(activatedRoute, 'nodeName'); this.kubeGuid = kubeEndpointService.kubeGuid; - const nodeEntityService = this.entityServiceFactory.create( - this.nodeName, - new GetKubernetesNode(this.nodeName, this.kubeGuid), - ); + const nodeEntityService = kubeEntityCatalog.node.store.getEntityService(this.nodeName, this.kubeGuid); this.node$ = nodeEntityService.entityObs$.pipe( filter(p => !!p && !!p.entity), diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts index 5a39ea5df7..e9a6d5d381 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts @@ -29,12 +29,12 @@ export const kubeAppActionBuilders: KubeAppActionBuilders = { export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders { getMultiple: ( kubeGuid: string, - paginationKey: string, + paginationKey?: string, ) => GetKubernetesStatefulSets } export const kubeStatefulSetsActionBuilders: KubeStatefulSetsActionBuilders = { - getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesStatefulSets(kubeGuid) + getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesStatefulSets(kubeGuid) } export interface KubePodActionBuilders extends OrchestratedActionBuilders { @@ -45,7 +45,7 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders { ) => GetKubernetesPod, getMultiple: ( kubeGuid: string, - paginationKey: string, + paginationKey?: string, ) => GetKubernetesPods getOnNode: ( kubeGuid: string, @@ -59,7 +59,7 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders { export const kubePodActionBuilders: KubePodActionBuilders = { get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid), - getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesPods(kubeGuid), + getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesPods(kubeGuid), getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName), getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace) } @@ -67,12 +67,12 @@ export const kubePodActionBuilders: KubePodActionBuilders = { export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders { getMultiple: ( kubeGuid: string, - paginationKey: string, + paginationKey?: string, ) => GeKubernetesDeployments } export const kubeDeploymentActionBuilders: KubeDeploymentActionBuilders = { - getMultiple: (kubeGuid: string, paginationKey: string) => new GeKubernetesDeployments(kubeGuid) + getMultiple: (kubeGuid: string, paginationKey?: string) => new GeKubernetesDeployments(kubeGuid) } export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { @@ -82,7 +82,7 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { ) => GetKubernetesNode getMultiple: ( kubeGuid: string, - paginationKey: string, + paginationKey?: string, ) => GetKubernetesNodes healthCheck: ( kubeGuid: string, @@ -91,7 +91,7 @@ export interface KubeNodeActionBuilders extends OrchestratedActionBuilders { export const kubeNodeActionBuilders: KubeNodeActionBuilders = { get: (nodeName: string, endpointGuid: string) => new GetKubernetesNode(nodeName, endpointGuid), - getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNodes(kubeGuid), + getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNodes(kubeGuid), healthCheck: (kubeGuid: string) => new KubeHealthCheck(kubeGuid) } @@ -106,20 +106,20 @@ export interface KubeNamespaceActionBuilders extends OrchestratedActionBuilders ) => CreateKubernetesNamespace; getMultiple: ( kubeGuid: string, - paginationKey: string, + paginationKey?: string, ) => GetKubernetesNamespaces } export const kubeNamespaceActionBuilders: KubeNamespaceActionBuilders = { get: (namespace: string, kubeGuid: string) => new GetKubernetesNamespace(namespace, kubeGuid), create: (namespace: string, kubeGuid: string) => new CreateKubernetesNamespace(namespace, kubeGuid), - getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesNamespaces(kubeGuid) + getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesNamespaces(kubeGuid) } export interface KubeServiceActionBuilders extends OrchestratedActionBuilders { getMultiple: ( kubeGuid: string, - paginationKey: string + paginationKey?: string ) => GetKubernetesServices getInNamespace: ( namespace: string, @@ -128,7 +128,7 @@ export interface KubeServiceActionBuilders extends OrchestratedActionBuilders { } export const kubeServiceActionBuilders: KubeServiceActionBuilders = { - getMultiple: (kubeGuid: string, paginationKey: string) => new GetKubernetesServices(kubeGuid), + getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesServices(kubeGuid), getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace) } diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts index 5f7d4cdd5d..aa4186c638 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts @@ -16,8 +16,8 @@ import { IChartThresholds, ISimpleUsageChartData, } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service'; -import { GetKubernetesNamespaces, GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions'; interface IValueLabels { usedLabel?: string; @@ -113,9 +113,11 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy { ngOnInit() { const guid = this.kubeEndpointService.baseKube.guid; - const podCountAction = new GetKubernetesPods(guid); - const nodeCountAction = new GetKubernetesNodes(guid); - const namespacesCountAction = new GetKubernetesNamespaces(guid); + + + const podCountAction = kubeEntityCatalog.pod.actions.getMultiple(guid); + const nodeCountAction = kubeEntityCatalog.node.actions.getMultiple(guid); + const namespacesCountAction = kubeEntityCatalog.namespace.actions.getMultiple(guid); const pods$ = this.getPaginationObservable(podCountAction); const nodes$ = this.getPaginationObservable(nodeCountAction); const namespaces$ = this.getPaginationObservable(namespacesCountAction); @@ -182,6 +184,7 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy { true ); + // TODO: RC this could easily get backed up, would entityService .poll be better?? this.ngZone.runOutsideAngular(() => { this.polls.push( interval(10000).subscribe(() => { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts index 6132e3fc47..c49bd77483 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts @@ -2,8 +2,6 @@ import { Injectable, OnDestroy } from '@angular/core'; import { Store } from '@ngrx/store'; import { safeUnsubscribe } from 'frontend/packages/core/src/core/utils.service'; import { AppState } from 'frontend/packages/store/src/app-state'; -import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory'; -import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors'; import { EndpointModel } from 'frontend/packages/store/src/types/endpoint.types'; import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs'; @@ -20,9 +18,9 @@ import { } from 'rxjs/operators'; import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; -import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../../kubernetes-entity-factory'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; +import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes-entity-factory'; import { KubernetesNamespace } from '../../store/kube.types'; -import { GetKubernetesNamespaces } from '../../store/kubernetes.actions'; export interface KubernetesNamespacesFilterItem { list$: Observable; @@ -38,10 +36,9 @@ export class KubernetesNamespacesFilterService implements OnDestroy { public kube: KubernetesNamespacesFilterItem; public namespace: KubernetesNamespacesFilterItem; - private isLoading$: Observable; + // private isLoading$: Observable; private subs: Subscription[] = []; - private paginationAction = new GetKubernetesNamespaces(null); private allNamespaces = this.getNamespacesObservable(); private allNamespacesLoading$ = this.allNamespaces.pagination$.pipe(map( pag => getCurrentPageRequestInfo(pag).busy @@ -49,7 +46,6 @@ export class KubernetesNamespacesFilterService implements OnDestroy { constructor( private store: Store, - private paginationMonitorFactory: PaginationMonitorFactory, ) { this.kube = this.createKube(); this.namespace = this.createNamespace(); @@ -57,24 +53,17 @@ export class KubernetesNamespacesFilterService implements OnDestroy { // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors()); - this.isLoading$ = combineLatest( - this.kube.loading$, - this.namespace.loading$, - ).pipe( - map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading) - ); + // this.isLoading$ = combineLatest( // TODO: RC Not used?? + // this.kube.loading$, + // this.namespace.loading$, + // ).pipe( + // map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading) + // ); } private getNamespacesObservable() { - return getPaginationObservables({ - store: this.store, - action: this.paginationAction, - paginationMonitor: this.paginationMonitorFactory.create( - this.paginationAction.paginationKey, - kubernetesEntityFactory(this.paginationAction.entityType), - true - ) - }, true); + // TODO: RC is local??? + return kubeEntityCatalog.namespace.store.getPaginationService(null); } private createKube() { From 0bcb71188f0ef2f604a8bb2865fa9a73cbd5d5ed Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 13 May 2020 17:53:03 +0100 Subject: [PATCH 08/15] WIP --- .../kubernetes/kubernetes-entity-catalog.ts | 6 +- .../action-builders/kube.action-builders.ts | 22 +++++--- .../helm-release-pods-list-source.ts | 4 +- .../list-types/helm-releases-list-source.ts | 8 +-- .../helm-release-tab-base.component.ts | 27 ++++----- .../tabs/helm-release-helper.service.ts | 55 ++++++++----------- .../helm-release-summary-tab.component.ts | 4 +- .../store/workload-action-builders.ts | 42 ++++++++++++++ .../store/workloads-entity-factory.ts | 26 ++++++--- .../store/workloads-entity-generator.ts | 35 ++++++++++-- .../workloads/store/workloads.actions.ts | 44 ++++++++++----- .../workloads/store/workloads.effects.ts | 10 ++-- .../workloads/workloads-entity-catalog.ts | 20 +++++++ 13 files changed, 207 insertions(+), 96 deletions(-) create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts create mode 100644 custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts index 72cf4013ba..a59854a6f1 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts @@ -37,8 +37,10 @@ export class KubeEntityCatalog { public namespace: StratosCatalogEntity; public service: StratosCatalogEntity public dashboard: StratosCatalogEntity; - // TODO: RC workloads stuff } - +/** + * A strongly typed collection of Kube Catalog Entities. + * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc + */ export const kubeEntityCatalog: KubeEntityCatalog = new KubeEntityCatalog(); diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts index e9a6d5d381..51f1bc53c9 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts @@ -1,6 +1,7 @@ import { OrchestratedActionBuilders, } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; +import { GetHelmReleasePods, GetHelmReleaseServices } from '../../workloads/store/workloads.actions'; import { CreateKubernetesNamespace, GeKubernetesDeployments, @@ -55,13 +56,18 @@ export interface KubePodActionBuilders extends OrchestratedActionBuilders { kubeGuid: string, namespace: string ) => GetKubernetesPodsInNamespace + getInWorkload: ( + kubeGuid: string, + releaseTitle: string + ) => GetHelmReleasePods } export const kubePodActionBuilders: KubePodActionBuilders = { get: (podName: string, kubeGuid: string, { namespace }) => new GetKubernetesPod(podName, namespace, kubeGuid), getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesPods(kubeGuid), getOnNode: (kubeGuid: string, nodeName: string) => new GetKubernetesPodsOnNode(kubeGuid, nodeName), - getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace) + getInNamespace: (kubeGuid: string, namespace: string) => new GetKubernetesPodsInNamespace(kubeGuid, namespace), + getInWorkload: (kubeGuid: string, releaseTitle: string) => new GetHelmReleasePods(kubeGuid, releaseTitle) } export interface KubeDeploymentActionBuilders extends OrchestratedActionBuilders { @@ -125,11 +131,16 @@ export interface KubeServiceActionBuilders extends OrchestratedActionBuilders { namespace: string, kubeGuid: string ) => GetKubernetesServicesInNamespace + getInWorkload: ( + releaseTitle: string, + kubeGuid: string + ) => GetHelmReleaseServices } export const kubeServiceActionBuilders: KubeServiceActionBuilders = { getMultiple: (kubeGuid: string, paginationKey?: string) => new GetKubernetesServices(kubeGuid), - getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace) + getInNamespace: (namespace: string, kubeGuid: string) => new GetKubernetesServicesInNamespace(kubeGuid, namespace), + getInWorkload: (releaseTitle: string, kubeGuid: string) => new GetHelmReleaseServices(kubeGuid, releaseTitle) } export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders { @@ -141,10 +152,3 @@ export interface KubeDashboardActionBuilders extends OrchestratedActionBuilders export const kubeDashboardActionBuilders: KubeDashboardActionBuilders = { get: (kubeGuid: string) => new GetKubernetesDashboard(kubeGuid) } - -// export interface A extends OrchestratedActionBuilders { - -// } - -// export const a: A = { -// } \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts index 317867b68d..6726c3ef26 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-release-pods-list-source.ts @@ -3,8 +3,8 @@ import { ListDataSource } from 'frontend/packages/core/src/shared/components/lis import { IListConfig } from 'frontend/packages/core/src/shared/components/list/list.component.types'; import { AppState } from 'frontend/packages/store/src/app-state'; +import { kubeEntityCatalog } from '../../kubernetes-entity-catalog'; import { KubernetesPod } from '../../store/kube.types'; -import { GetHelmReleasePods } from '../store/workloads.actions'; export class HelmReleasePodsDataSource extends ListDataSource { @@ -15,7 +15,7 @@ export class HelmReleasePodsDataSource extends ListDataSource { endpointGuid: string, releaseTitle: string ) { - const action = new GetHelmReleasePods(endpointGuid, releaseTitle); + const action = kubeEntityCatalog.pod.actions.getInWorkload(endpointGuid, releaseTitle); super({ store, action, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts index 35bf800960..56a4505195 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts @@ -11,9 +11,9 @@ import { AppState } from 'frontend/packages/store/src/app-state'; import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types'; import { kubernetesEntityFactory } from '../../kubernetes-entity-factory'; -import { getHelmReleaseId, helmReleaseEntityKey } from '../store/workloads-entity-factory'; -import { GetHelmReleases } from '../store/workloads.actions'; +import { helmReleaseEntityKey } from '../store/workloads-entity-factory'; import { HelmRelease } from '../workload.types'; +import { workloadsEntityCatalog } from '../workloads-entity-catalog'; const kubeEndpointFilter = (entities: HelmRelease[], paginationState: PaginationEntityState) => { // Filter by Kube Endpoint and Namespace @@ -33,13 +33,13 @@ export class HelmReleasesDataSource extends ListDataSource { store: Store, listConfig: IListConfig ) { - const action = new GetHelmReleases(); + const action = workloadsEntityCatalog.release.actions.getMultiple(); const transformEntities = [{ type: 'filter' as DataFunctionDefinitionType, field: 'name' }, kubeEndpointFilter]; super({ store, action, schema: kubernetesEntityFactory(helmReleaseEntityKey), - getRowUniqueId: getHelmReleaseId, + getRowUniqueId: row => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, transformEntities, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts index 5f5ad87171..032037ea6f 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts @@ -10,16 +10,12 @@ import { Observable, Subject, Subscription } from 'rxjs'; import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets'; import { catchError, map, share, switchMap } from 'rxjs/operators'; +import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog'; import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state'; import { KubernetesPod, KubeService } from '../../../store/kube.types'; import { KubePaginationAction } from '../../../store/kubernetes.actions'; -import { - GetHelmReleaseGraph, - GetHelmReleasePods, - GetHelmReleaseResource, - GetHelmReleaseServices, -} from '../../store/workloads.actions'; import { HelmReleaseGraph, HelmReleaseGuid, HelmReleasePod, HelmReleaseService } from '../../workload.types'; +import { workloadsEntityCatalog } from '../../workloads-entity-catalog'; import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service'; @@ -113,14 +109,16 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { res.metadata.kubeId = this.helmReleaseHelper.endpointGuid; return res; }); - const releasePodsAction = new GetHelmReleasePods(this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle); + const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload( + this.helmReleaseHelper.endpointGuid, + this.helmReleaseHelper.releaseTitle + ); this.populateList(releasePodsAction, podsWithInfo); } else if (messageObj.kind === 'Graph') { const graph: HelmReleaseGraph = messageObj.data; graph.endpointId = this.helmReleaseHelper.endpointGuid; graph.releaseTitle = this.helmReleaseHelper.releaseTitle; - const releaseGraphAction = new GetHelmReleaseGraph(graph.endpointId, graph.releaseTitle); - + const releaseGraphAction = workloadsEntityCatalog.graph.actions.get(graph.releaseTitle, graph.endpointId); this.addResource(releaseGraphAction, graph); } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') { // Store all of the services @@ -134,17 +132,20 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { } }); if (svcs.length > 0) { - const releaseServicesAction = new GetHelmReleaseServices( + const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload( + this.helmReleaseHelper.releaseTitle, this.helmReleaseHelper.endpointGuid, - this.helmReleaseHelper.releaseTitle - ); + ) this.populateList(releaseServicesAction, svcs); } const resources = { ...manifest }; resources.endpointId = this.helmReleaseHelper.endpointGuid; resources.releaseTitle = this.helmReleaseHelper.releaseTitle; - const releaseResourceAction = new GetHelmReleaseResource(resources.endpointId, resources.releaseTitle); + const releaseResourceAction = workloadsEntityCatalog.resource.actions.get( + resources.releaseTitle, + resources.endpointId, + ); this.addResource(releaseResourceAction, resources); } } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts index aa8a7b73c9..0f193ea044 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts @@ -1,20 +1,10 @@ import { Injectable } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from 'frontend/packages/store/src/app-state'; -import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; -import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service'; -import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory'; -import { selectEntity } from 'frontend/packages/store/src/selectors/api.selectors'; import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; +import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog'; import { KubernetesPod } from '../../../store/kube.types'; -import { - GetHelmRelease, - GetHelmReleaseGraph, - GetHelmReleasePods, - GetHelmReleaseResource, -} from '../../store/workloads.actions'; +import { getHelmReleaseDetailsFromGuid } from '../../store/workloads-entity-factory'; import { HelmRelease, HelmReleaseChartData, @@ -22,6 +12,7 @@ import { HelmReleaseGuid, HelmReleaseResource, } from '../../workload.types'; +import { workloadsEntityCatalog } from '../../workloads-entity-catalog'; @Injectable() @@ -38,17 +29,18 @@ export class HelmReleaseHelperService { constructor( helmReleaseGuid: HelmReleaseGuid, - private store: Store, - private esf: EntityServiceFactory, - private paginationMonitorFactory: PaginationMonitorFactory, ) { this.guid = helmReleaseGuid.guid; - this.releaseTitle = this.guid.split(':')[2]; - this.namespace = this.guid.split(':')[1]; - this.endpointGuid = this.guid.split(':')[0]; - - const action = new GetHelmRelease(this.endpointGuid, this.namespace, this.releaseTitle); - const entityService = this.esf.create(action.guid, action); + const { endpointId, namespace, releaseTitle } = getHelmReleaseDetailsFromGuid(this.guid); + this.releaseTitle = releaseTitle; + this.namespace = namespace; + this.endpointGuid = endpointId; + + const entityService = workloadsEntityCatalog.release.store.getEntityService( + this.releaseTitle, + this.endpointGuid, + { namespace: this.namespace } + ); this.release$ = entityService.waitForEntity$.pipe( map((item) => item.entity), @@ -71,28 +63,27 @@ export class HelmReleaseHelperService { public fetchReleaseGraph(): Observable { // Get helm release - const action = new GetHelmReleaseGraph(this.endpointGuid, this.releaseTitle); - const entityKey = entityCatalog.getEntityKey(action); - return this.store.select(selectEntity(entityKey, action.guid)).pipe( + const guid = workloadsEntityCatalog.graph.actions.get(this.releaseTitle, this.endpointGuid).guid; + return workloadsEntityCatalog.graph.store.getEntityMonitor(guid).entity$.pipe( filter(graph => !!graph) ); } public fetchReleaseResources(): Observable { // Get helm release - const action = new GetHelmReleaseResource(this.endpointGuid, this.releaseTitle); - const entityKey = entityCatalog.getEntityKey(action); - return this.store.select(selectEntity(entityKey, action.guid)).pipe( + return workloadsEntityCatalog.resource.store.getPaginationMonitor( + this.endpointGuid, + null, + { releaseTitle: this.releaseTitle } + ).currentPage$.pipe( filter(resources => !!resources) ); } public fetchReleaseChartStats(): Observable { - const action = new GetHelmReleasePods(this.endpointGuid, this.releaseTitle); - return this.paginationMonitorFactory.create( - action.paginationKey, - action.entity[0], - true + return kubeEntityCatalog.pod.store.getInWorkload.getPaginationMonitor( + this.endpointGuid, + this.releaseTitle ).currentPage$.pipe( filter(pods => !!pods), map(this.mapPods) diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts index 43b268b89a..daa29e2160 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.ts @@ -12,8 +12,8 @@ import { combineLatest, Observable, ReplaySubject } from 'rxjs'; import { filter, first, map, publishReplay, refCount, startWith } from 'rxjs/operators'; import { endpointsEntityRequestDataSelector } from '../../../../../../../../store/src/selectors/endpoint.selectors'; -import { GetHelmReleases } from '../../../store/workloads.actions'; import { HelmReleaseChartData, HelmReleaseResource } from '../../../workload.types'; +import { workloadsEntityCatalog } from '../../../workloads-entity-catalog'; import { HelmReleaseHelperService } from '../helm-release-helper.service'; @Component({ @@ -188,7 +188,7 @@ export class HelmReleaseSummaryTabComponent implements OnDestroy { this.logService.error('Failed to delete release: ', err); }, complete: () => { - const action = new GetHelmReleases(); + const action = workloadsEntityCatalog.release.actions.getMultiple(); this.store.dispatch(new ClearPaginationOfType(action)); this.completeDelete(); this.store.dispatch(new RouterNav({ path: ['workloads'] })); diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts new file mode 100644 index 0000000000..eb7591f9c5 --- /dev/null +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts @@ -0,0 +1,42 @@ +import { + OrchestratedActionBuilders, +} from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; +import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions'; + +export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders { + get: ( + title: string, + endpointGuid: string, + extraArgs: { namespace: string } + ) => GetHelmRelease; + getMultiple: () => GetHelmReleases; +} + +export const workloadReleaseBuilders: WorkloadReleaseBuilders = { + get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => { + return new GetHelmRelease(endpointGuid, namespace, title); + }, + getMultiple: () => new GetHelmReleases() +} + +export interface WorkloadGraphBuilders extends OrchestratedActionBuilders { + get: ( + releaseTitle: string, + endpointGuid: string + ) => GetHelmReleaseGraph +} + +export const workloadGraphBuilders: WorkloadGraphBuilders = { + get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseGraph(endpointGuid, releaseTitle) +} + +export interface WorkloadResourceBuilders extends OrchestratedActionBuilders { + get: ( + releaseTitle: string, + endpointGuid: string, + ) => GetHelmReleaseResource +} + +export const workloadResourceBuilders: WorkloadResourceBuilders = { + get: (releaseTitle: string, endpointGuid: string) => new GetHelmReleaseResource(endpointGuid, releaseTitle) +} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts index 1053c129c8..abce799544 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-factory.ts @@ -8,11 +8,21 @@ export const helmReleaseServiceEntityType = 'helmReleaseService'; export const helmReleaseGraphEntityType = 'helmReleaseGraph'; export const helmReleaseResourceEntityType = 'helmReleaseResource'; -export const getHelmReleaseId = (entity: HelmRelease) => `${entity.endpointId}-${entity.namespace}-${entity.name}`; -// export const getHelmReleaseServiceId = -// (entity: HelmReleaseService) => `${entity.endpointId}-${entity.releaseTitle}-${entity.metadata.name}`; -export const getHelmReleaseGraphId = (entity: HelmReleaseGraph) => `${entity.endpointId}-${entity.releaseTitle}`; -export const getHelmReleaseResourceId = (entity: HelmReleaseResource) => `${entity.endpointId}-${entity.releaseTitle}`; +const separator = ':'; +export const getHelmReleaseDetailsFromGuid = (guid: string) => { + const parts = guid.split(separator); + return { + endpointId: parts[0], + namespace: parts[1], + releaseTitle: parts[2] + } +} +export const getHelmReleaseId = (endpointId: string, namespace: string, name: string) => `${endpointId}${separator}${namespace}${separator}${name}`; +export const getHelmReleaseIdByObj = (entity: HelmRelease) => getHelmReleaseId(entity.endpointId, entity.namespace, entity.name); +export const getHelmReleaseGraphId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`; +export const getHelmReleaseGraphIdByObj = (entity: HelmReleaseGraph) => getHelmReleaseGraphId(entity.endpointId, entity.releaseTitle); +export const getHelmReleaseResourceId = (endpointId: string, releaseTitle: string) => `${endpointId}${separator}${releaseTitle}`; +export const getHelmReleaseResourceIdByObj = (entity: HelmReleaseResource) => getHelmReleaseResourceId(entity.endpointId, entity.releaseTitle); const entityCache: { [key: string]: EntitySchema @@ -21,19 +31,19 @@ const entityCache: { entityCache[helmReleaseEntityKey] = new KubernetesEntitySchema( helmReleaseEntityKey, {}, - { idAttribute: getHelmReleaseId } // TODO: RC + { idAttribute: getHelmReleaseIdByObj } ); entityCache[helmReleaseGraphEntityType] = new KubernetesEntitySchema( helmReleaseGraphEntityType, {}, - { idAttribute: getHelmReleaseGraphId } + { idAttribute: getHelmReleaseGraphIdByObj } ); entityCache[helmReleaseResourceEntityType] = new KubernetesEntitySchema( helmReleaseResourceEntityType, {}, - { idAttribute: getHelmReleaseResourceId } + { idAttribute: getHelmReleaseResourceIdByObj } ); Object.entries(entityCache).forEach(([key, workloadSchema]) => addKubernetesEntitySchema(key, workloadSchema)); diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts index fa0f66070f..2e39c1e892 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts @@ -7,6 +7,15 @@ import { IFavoriteMetadata } from 'frontend/packages/store/src/types/user-favori import { kubernetesEntityFactory } from '../../kubernetes-entity-factory'; import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types'; +import { workloadsEntityCatalog } from '../workloads-entity-catalog'; +import { + WorkloadGraphBuilders, + workloadGraphBuilders, + WorkloadReleaseBuilders, + workloadReleaseBuilders, + WorkloadResourceBuilders, + workloadResourceBuilders, +} from './workload-action-builders'; import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory'; @@ -18,15 +27,19 @@ export function generateWorkloadsEntities(endpointDefinition: StratosEndpointExt ]; } -// TODO: RC - function generateReleaseEntity(endpointDefinition: StratosEndpointExtensionDefinition) { const definition = { type: helmReleaseEntityKey, schema: kubernetesEntityFactory(helmReleaseEntityKey), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + workloadsEntityCatalog.release = new StratosCatalogEntity( + definition, + { + actionBuilders: workloadReleaseBuilders + } + ); + return workloadsEntityCatalog.release; } function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -35,7 +48,13 @@ function generateReleaseGraphEntity(endpointDefinition: StratosEndpointExtension schema: kubernetesEntityFactory(helmReleaseGraphEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + workloadsEntityCatalog.graph = new StratosCatalogEntity( + definition, + { + actionBuilders: workloadGraphBuilders + } + ); + return workloadsEntityCatalog.graph; } function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -44,6 +63,12 @@ function generateReleaseResourceEntity(endpointDefinition: StratosEndpointExtens schema: kubernetesEntityFactory(helmReleaseResourceEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + workloadsEntityCatalog.resource = new StratosCatalogEntity( + definition, + { + actionBuilders: workloadResourceBuilders + } + ); + return workloadsEntityCatalog.resource; } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts index 4e7ebcd501..511d570f05 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts @@ -1,6 +1,6 @@ -import { Action } from '@ngrx/store'; import { EntityRequestAction } from 'frontend/packages/store/src/types/request.types'; +import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; import { MonocularPaginationAction } from '../../../helm/store/helm.actions'; import { KUBERNETES_ENDPOINT_TYPE, @@ -9,7 +9,14 @@ import { kubernetesServicesEntityType, } from '../../kubernetes-entity-factory'; import { KubePaginationAction } from '../../store/kubernetes.actions'; -import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory'; +import { + getHelmReleaseGraphId, + getHelmReleaseId, + getHelmReleaseResourceId, + helmReleaseEntityKey, + helmReleaseGraphEntityType, + helmReleaseResourceEntityType, +} from './workloads-entity-factory'; export const GET_HELM_RELEASES = '[Helm] Get Releases'; export const GET_HELM_RELEASES_SUCCESS = '[Helm] Get Releases Success'; @@ -31,6 +38,15 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release'; export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success'; export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure'; +interface HelmReleaseSingleEntity extends EntityRequestAction { + guid: string; +} + +interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction { + +} + + export class GetHelmReleases implements MonocularPaginationAction { constructor() { this.paginationKey = 'helm-releases'; @@ -51,14 +67,15 @@ export class GetHelmReleases implements MonocularPaginationAction { }; } -export class GetHelmRelease implements EntityRequestAction { + +export class GetHelmRelease implements HelmReleaseSingleEntity { guid: string; constructor( public endpointGuid: string, public namespace: string, public releaseTitle: string ) { - this.guid = `${endpointGuid}:${namespace}:${releaseTitle}`; + this.guid = getHelmReleaseId(endpointGuid, namespace, releaseTitle); } type = GET_HELM_RELEASE; endpointType = KUBERNETES_ENDPOINT_TYPE; @@ -71,13 +88,13 @@ export class GetHelmRelease implements EntityRequestAction { ]; } -export class GetHelmReleaseGraph implements EntityRequestAction { +export class GetHelmReleaseGraph implements HelmReleaseSingleEntity { guid: string; constructor( public endpointGuid: string, public releaseTitle: string ) { - this.guid = `${endpointGuid}-${releaseTitle}`; + this.guid = getHelmReleaseGraphId(endpointGuid, releaseTitle); } type = this.constructor.name; endpointType = KUBERNETES_ENDPOINT_TYPE; @@ -86,19 +103,19 @@ export class GetHelmReleaseGraph implements EntityRequestAction { actions = [this.type]; } -export class GetHelmReleaseResource implements EntityRequestAction { - guid: string; +export class GetHelmReleaseResource implements HelmReleaseSingleEntity { constructor( public endpointGuid: string, public releaseTitle: string ) { - this.guid = `${endpointGuid}-${releaseTitle}`; + this.guid = getHelmReleaseResourceId(this.endpointGuid, this.releaseTitle); } type = this.constructor.name; endpointType = KUBERNETES_ENDPOINT_TYPE; entity = kubernetesEntityFactory(helmReleaseResourceEntityType); entityType = helmReleaseResourceEntityType; actions = [this.type]; + guid: string; } /** @@ -127,8 +144,10 @@ export class GetHelmReleasePods implements KubePaginationAction { }; } + +// TODO: RC add to kube action builder /** - * Won't fetch pods, used to push/retrieve data from store + * Won't fetch services, used to push/retrieve data from store */ export class GetHelmReleaseServices implements KubePaginationAction { constructor( @@ -152,8 +171,3 @@ export class GetHelmReleaseServices implements KubePaginationAction { 'order-direction-field': 'name', }; } - -export class HelmUpdateRelease implements Action { - constructor(public values: any) { } - type = UPDATE_HELM_RELEASE; -} diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts index 086bc29fd8..eb65cffcb3 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts @@ -16,6 +16,7 @@ import { WrapperRequestActionSuccess, } from '../../../../../../store/src/types/request.types'; import { HelmRelease } from '../workload.types'; +import { getHelmReleaseId } from './workloads-entity-factory'; import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions'; @Injectable() @@ -48,7 +49,7 @@ export class WorkloadsEffects { return; } endpointData.forEach((data) => { - const helmRelease = this.mapHelmRelease(data, endpointId); + const helmRelease = this.mapHelmRelease(data, endpointId, getHelmReleaseId(endpointId, data.namespace, data.name)); processedData.entities[entityKey][helmRelease.guid] = helmRelease; processedData.result.push(helmRelease.guid); }); @@ -73,20 +74,20 @@ export class WorkloadsEffects { } as NormalizedResponse; // Go through each endpoint ID - processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid); + processedData.entities[entityKey][action.guid] = this.mapHelmRelease(response, action.endpointGuid, action.guid); processedData.result.push(action.guid); return processedData; }, [action.endpointGuid]); }) ); - private mapHelmRelease(data, endpointId) { + private mapHelmRelease(data, endpointId, guid: string) { const helmRelease: HelmRelease = { ...data, endpointId }; // Release name is unique for an endpoint - for Helm 3, include the namespace - helmRelease.guid = endpointId + ':' + data.namespace + ':' + data.name; + helmRelease.guid = guid;//endpointId + ':' + data.namespace + ':' + data.name; //TODO: RC delete // Make a note of the guid of the endpoint for the release helmRelease.status = data.info.status; helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed); @@ -108,6 +109,7 @@ export class WorkloadsEffects { return this.httpClient.get(url, requestArgs).pipe( mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]), catchError(error => [ + // TODO: RC trigger this, understand error (app.module.ts:173) guid of undefined new WrapperRequestActionFailed(error.message, action, 'fetch', { endpointIds, url: error.url || url, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts new file mode 100644 index 0000000000..ba37ba0821 --- /dev/null +++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts @@ -0,0 +1,20 @@ +import { StratosCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; +import { IFavoriteMetadata } from '../../../../../store/src/types/user-favorites.types'; +import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilders } from './store/workload-action-builders'; +import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.types'; + +/** + * A strongly typed collection of Kube Catalog Entities. + * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc + */ +export class WorkloadsEntityCatalog { + release: StratosCatalogEntity; + graph: StratosCatalogEntity + resource: StratosCatalogEntity +} + +/** + * A strongly typed collection of Kube Catalog Entities. + * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc + */ +export const workloadsEntityCatalog: WorkloadsEntityCatalog = new WorkloadsEntityCatalog(); From 57ff95c718ef42794e2f14d07cfdfcfc6ae96d87 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 15 May 2020 13:26:53 +0100 Subject: [PATCH 09/15] Fix most todo's --- .../create-release.component.ts | 10 +-- .../custom/kubernetes/store/kube.getIds.ts | 84 ++++++------------- .../custom/kubernetes/store/kube.selectors.ts | 17 ---- .../kubernetes/store/kubernetes.actions.ts | 74 +++++----------- .../kube-namespaces-filter-config.service.ts | 8 -- .../workloads/store/workloads.actions.ts | 3 +- .../workloads/store/workloads.effects.ts | 3 +- .../kubernetes/workloads/workload.types.ts | 21 +---- .../pagination-reducer.helper.ts | 32 +++++-- .../store/src/selectors/endpoint.selectors.ts | 4 - 10 files changed, 80 insertions(+), 176 deletions(-) delete mode 100644 custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index addfb39838..448a20abd8 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -5,7 +5,7 @@ import { MatTextareaAutosize } from '@angular/material'; import { ActivatedRoute } from '@angular/router'; import { Store } from '@ngrx/store'; import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; -import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap, tap } from 'rxjs/operators'; +import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators'; import { AppState } from '../../../../../store/src/app-state'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; @@ -68,8 +68,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { private store: Store, private httpClient: HttpClient, private confirmDialog: ConfirmationDialogService, - // private pmf: PaginationMonitorFactory, // TODO: RC search and destroy - private emf: EntityMonitorFactory // TODO: RC search and destroy + private emf: EntityMonitorFactory ) { const chart = this.route.snapshot.params; this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`; @@ -103,7 +102,6 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { this.kubeEndpoints$ = this.endpointsService.connectedEndpointsOfTypes(KUBERNETES_ENDPOINT_TYPE); const allNamespaces$ = kubeEntityCatalog.namespace.store.getPaginationService(null).entities$.pipe( - // tap(a => console.log(action, a)), // TODO: RC find all console.log filter(namespaces => !!namespaces), first() ); @@ -113,18 +111,15 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { this.details.controls.releaseNamespace.valueChanges.pipe(startWith(''), distinctUntilChanged()) ]).pipe( // Filter out namespaces from other kubes - tap(a => console.log(1, a)), map(([namespaces, kubeId, namespace]: [KubernetesNamespace[], string, string]) => ([ namespaces.filter(ns => ns.metadata.kubeId === kubeId), namespace ])), - tap(a => console.log(2, a)), // Map to endpoint names map(([namespaces, namespace]: [KubernetesNamespace[], string]) => [ namespaces.map(ns => ns.metadata.name), namespace ]), - tap(a => console.log(3, a)), // Filter out namespaces not matching existing text map(([namespaces, namespace]: [string[], string]) => this.filterTyped(namespaces, namespace)), ); @@ -267,7 +262,6 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { chart: this.route.snapshot.params }; - // TODO: RC // Make the request const action = new HelmInstall(values); this.store.dispatch(action); diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts index 8f5d812860..6639f6f509 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts @@ -1,3 +1,4 @@ +import { environment } from '../../../environments/environment.prod'; import { BasicKubeAPIResource, KubernetesDeployment, @@ -11,69 +12,38 @@ import { KubeDashboardStatus } from './kubernetes.effects'; const deliminate = (...args: string[]) => args.join('_:_'); -const debugMissingKubeId = (entity: BasicKubeAPIResource) => { - if (!entity.metadata) { - console.log('DANGER WILL ROBINSON1:', entity); - } else if (!entity.metadata.kubeId) { - console.log('DANGER WILL ROBINSON2:', entity); +const debugMissingKubeId = (entity: BasicKubeAPIResource, func: (...args: string[]) => string, ...args: string[]) => { + if (!environment.production && (!entity.metadata || !entity.metadata.kubeId)) { + console.log(`Kube entity does not have a kubeId, this is probably a bug: `, entity); } + return func(...args); } -export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => { - return deliminate(name, kubeGuid); -} -export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string => { - debugMissingKubeId(entity); - return getGuidFromKubeNode(entity.metadata.kubeId, entity.metadata.name); -} +export const getGuidFromKubeNode = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid) +export const getGuidFromKubeNodeObj = (entity: KubernetesNode): string => + debugMissingKubeId(entity, getGuidFromKubeNode, entity.metadata.kubeId, entity.metadata.name); -export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => { - return deliminate(name, kubeGuid); -} -export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string => { - debugMissingKubeId(entity); - return getGuidFromKubeNamespace(entity.metadata.kubeId, entity.metadata.name); -} +export const getGuidFromKubeNamespace = (kubeGuid: string, name: string): string => deliminate(name, kubeGuid) +export const getGuidFromKubeNamespaceObj = (entity: KubernetesNamespace): string => + debugMissingKubeId(entity, getGuidFromKubeNamespace, entity.metadata.kubeId, entity.metadata.name); -export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => { - return deliminate(name, namespace, kubeGuid); -} -export const getGuidFromKubeServiceObj = (entity: KubeService): string => { - debugMissingKubeId(entity); - return getGuidFromKubeService(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -} +export const getGuidFromKubeService = (kubeGuid: string, namespace: string, name: string): string => deliminate(name, namespace, kubeGuid); +export const getGuidFromKubeServiceObj = (entity: KubeService): string => + debugMissingKubeId(entity, getGuidFromKubeService, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string => { - return deliminate(name, namespace, kubeGuid); -} -export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string => { - debugMissingKubeId(entity); - return getGuidFromKubeStatefulSet(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -} +export const getGuidFromKubeStatefulSet = (kubeGuid: string, namespace: string, name: string): string => + deliminate(name, namespace, kubeGuid); +export const getGuidFromKubeStatefulSetObj = (entity: KubernetesStatefulSet): string => + debugMissingKubeId(entity, getGuidFromKubeStatefulSet, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); +export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string => + deliminate(name, namespace, kubeGuid); +export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string => + debugMissingKubeId(entity, getGuidFromKubeDeployment, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -export const getGuidFromKubeDeployment = (kubeGuid: string, namespace: string, name: string): string => { - return deliminate(name, namespace, kubeGuid); -} -export const getGuidFromKubeDeploymentObj = (entity: KubernetesDeployment): string => { - debugMissingKubeId(entity); - return getGuidFromKubeDeployment(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -} +export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => deliminate(name, namespace, kubeGuid); +export const getGuidFromKubePodObj = (entity: KubernetesPod): string => + debugMissingKubeId(entity, getGuidFromKubePod, entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -export const getGuidFromKubePod = (kubeGuid: string, namespace: string, name: string): string => { - return deliminate(name, namespace, kubeGuid); -} -export const getGuidFromKubePodObj = (entity: KubernetesPod): string => { - debugMissingKubeId(entity); - return getGuidFromKubePod(entity.metadata.kubeId, entity.metadata.namespace, entity.metadata.name); -} - -export const getGuidFromKubeDashboard = (kubeGuid: string): string => { - return kubeGuid; -} -export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => { - if (!!entity.kubeGuid) { - console.log('aaaaa!!!!!'); - } - return getGuidFromKubeDashboard(entity.kubeGuid); -} \ No newline at end of file +export const getGuidFromKubeDashboard = (kubeGuid: string): string => kubeGuid +export const getGuidFromKubeDashboardObj = (entity: KubeDashboardStatus): string => getGuidFromKubeDashboard(entity.kubeGuid); diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts deleted file mode 100644 index 127babf675..0000000000 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.selectors.ts +++ /dev/null @@ -1,17 +0,0 @@ -// TODO: RC - -// const getValueOrNull = (object, key) => -// object ? (object[key] ? object[key] : null) : null; -// export const getMetadataGuid = (metadata: Metadata): string => -// getValueOrNull(metadata, 'uid'); - -// export const getKubeAPIMetadata = ( -// resource: BasicKubeAPIResource -// ): Metadata => getValueOrNull(resource, 'metadata'); - -// export const getKubeAPIResourceGuid = compose( -// getMetadataGuid, -// getKubeAPIMetadata -// ); - - diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts index 49abc5540c..971f63dbf7 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts @@ -17,15 +17,7 @@ import { kubernetesServicesEntityType, kubernetesStatefulSetsEntityType, } from '../kubernetes-entity-factory'; -import { getGuidFromKubeDashboard, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds'; -import { - KubernetesDeployment, - KubernetesNamespace, - KubernetesNode, - KubernetesPod, - KubernetesStatefulSet, - KubeService, -} from './kube.types'; +import { getGuidFromKubeDashboard, getGuidFromKubeNamespace, getGuidFromKubeNode, getGuidFromKubePod } from './kube.getIds'; export const GET_RELEASE_POD_INFO = '[KUBERNETES Endpoint] Get Release Pods Info'; export const GET_RELEASE_POD_INFO_SUCCESS = '[KUBERNETES Endpoint] Get Release Pods Info Success'; @@ -90,27 +82,23 @@ export const GET_KUBE_DASHBOARD_SUCCESS = '[KUBERNETES Endpoint] Get Dashboard S export const GET_KUBE_DASHBOARD_FAILURE = '[KUBERNETES Endpoint] Get Dashboard Failure'; -// TODO: RC TIDY - const defaultSortParams = { 'order-direction': 'desc' as SortDirection, 'order-direction-field': 'name' }; - export interface KubeAction extends EntityRequestAction { kubeGuid: string; } -export interface KubePaginationAction extends PaginatedAction, KubeAction { - // getId: (r: T, kubeGuid: string) => string; +export interface KubePaginationAction extends PaginatedAction, KubeAction { + flattenPagination: boolean; } export interface KubeSingleEntityAction extends KubeAction { guid: string; } export class GetKubernetesNode implements KubeSingleEntityAction { - constructor(public nodeName: string, public kubeGuid: string) { this.guid = getGuidFromKubeNode(kubeGuid, nodeName); } @@ -126,7 +114,7 @@ export class GetKubernetesNode implements KubeSingleEntityAction { guid: string; } -export class GetKubernetesNodes implements KubePaginationAction { +export class GetKubernetesNodes implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesNodesEntityType, kubeGuid); } @@ -143,7 +131,7 @@ export class GetKubernetesNodes implements KubePaginationAction initialParams: PaginationParam = { ...defaultSortParams }; - // getId = (node: KubernetesNode, kubeGuid: string) => GetKubernetesNode.getGuid(kubeGuid, node.metadata.name); + flattenPagination = true; } export class KubeHealthCheck extends GetKubernetesNodes { @@ -155,9 +143,9 @@ export class KubeHealthCheck extends GetKubernetesNodes { } export class CreateKubernetesNamespace implements KubeSingleEntityAction { - public guid: string; + constructor(public namespaceName: string, public kubeGuid: string) { - // this.guid = GetKubernetesNamespace.getGuid(kubeGuid, namespaceName); // TODO: RC shouldn't be 'creating-guid'? + this.guid = getGuidFromKubeNamespace(kubeGuid, namespaceName); } type = CREATE_NAMESPACE; @@ -166,21 +154,17 @@ export class CreateKubernetesNamespace implements KubeSingleEntityAction { entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)]; actions = getActions('Namespace', 'Create'); requestType: ApiRequestTypes = 'create'; + guid: string; } export class GetKubernetesNamespace implements KubeSingleEntityAction { - // static getGuid(kubeGuid: string, namespaceName: string): string { - // return deliminate(namespaceName, kubeGuid); - // } - constructor(public namespaceName: string, public kubeGuid: string) { - // this.guid = GetKubernetesNamespace.getGuid(this.kubeGuid, this.namespaceName); + this.guid = getGuidFromKubeNamespace(kubeGuid, namespaceName); } type = GET_NAMESPACE_INFO; entityType = kubernetesNamespacesEntityType; endpointType = KUBERNETES_ENDPOINT_TYPE; entity = [kubernetesEntityFactory(kubernetesNamespacesEntityType)]; - actions = [ GET_NAMESPACE_INFO, GET_NAMESPACE_INFO_SUCCESS, @@ -189,7 +173,7 @@ export class GetKubernetesNamespace implements KubeSingleEntityAction { guid: string; } -export class GetKubernetesNamespaces implements KubePaginationAction { +export class GetKubernetesNamespaces implements KubePaginationAction { constructor(public kubeGuid: string) { this.paginationKey = getPaginationKey(kubernetesNamespacesEntityType, kubeGuid || 'all'); } @@ -206,11 +190,10 @@ export class GetKubernetesNamespaces implements KubePaginationAction GetKubernetesNamespace.getGuid(kubeGuid, namespace.metadata.name); + flattenPagination = true; } export class GetKubernetesPod implements KubeSingleEntityAction { - constructor(public podName, public namespaceName, public kubeGuid) { this.guid = getGuidFromKubePod(kubeGuid, namespaceName, podName); } @@ -226,7 +209,7 @@ export class GetKubernetesPod implements KubeSingleEntityAction { guid: string; } -export class GetKubernetesPods implements KubePaginationAction { +export class GetKubernetesPods implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesPodsEntityType, 'k8', kubeGuid); } @@ -243,7 +226,7 @@ export class GetKubernetesPods implements KubePaginationAction { initialParams: PaginationParam = { ...defaultSortParams }; - // getId = (pod: KubernetesPod, kubeGuid: string) => GetKubernetesPod.getId(kubeGuid, pod.metadata.namespace, pod.metadata.name); + flattenPagination = true; } export class GetKubernetesPodsOnNode extends GetKubernetesPods { @@ -273,10 +256,7 @@ export class GetKubernetesPodsInNamespace extends GetKubernetesPods { ]; } -export class GetKubernetesServices implements KubePaginationAction { - // static getId(kubeGuid: string, namespace: string, serviceName: string): string { // TODO: RC id/guid naming - // return deliminate(serviceName, namespace, kubeGuid); - // } +export class GetKubernetesServices implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesServicesEntityType, kubeGuid); } @@ -293,13 +273,12 @@ export class GetKubernetesServices implements KubePaginationAction initialParams: PaginationParam = { ...defaultSortParams }; - // getId = (service: KubeService, kubeGuid: string) => GetKubernetesServices.getId(kubeGuid, service.metadata.namespace, service.metadata.name); + flattenPagination = true; } export class GetKubernetesServicesInNamespace extends GetKubernetesServices { constructor(kubeGuid: string, public namespaceName: string) { super(kubeGuid); - // TODO: RC Check all for guid AND uniqueness this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid); } actions = [ @@ -309,17 +288,8 @@ export class GetKubernetesServicesInNamespace extends GetKubernetesServices { ]; } -// TODO: RC -// Create name -// delete name -// create with same name.. same - - -export class GetKubernetesStatefulSets implements KubePaginationAction { - // static getId(kubeGuid: string, namespace: string, name: string): string { - // return deliminate(name, namespace, kubeGuid); // TODO: RC check - // } +export class GetKubernetesStatefulSets implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesStatefulSetsEntityType, kubeGuid); } @@ -333,13 +303,10 @@ export class GetKubernetesStatefulSets implements KubePaginationAction GetKubernetesStatefulSets.getId(kubeGuid, statefulSet.metadata.namespace, statefulSet.metadata.name); + flattenPagination = true; } -export class GeKubernetesDeployments implements KubePaginationAction { - // static getId(kubeGuid: string, namespace: string, name: string): string { - // return deliminate(name, namespace, kubeGuid); // TODO: RC check - // } +export class GeKubernetesDeployments implements KubePaginationAction { constructor(public kubeGuid) { this.paginationKey = getPaginationKey(kubernetesDeploymentsEntityType, kubeGuid); } @@ -353,13 +320,10 @@ export class GeKubernetesDeployments implements KubePaginationAction GeKubernetesDeployments.getId(kubeGuid, deployment.metadata.namespace, deployment.metadata.name); + flattenPagination = true; } export class GetKubernetesDashboard implements KubeSingleEntityAction { - // static getId(kubeGuid: string): string { - // return kubeGuid; - // } constructor(public kubeGuid: string) { this.guid = getGuidFromKubeDashboard(kubeGuid); } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts index c49bd77483..fe9ca2f1e3 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts @@ -52,17 +52,9 @@ export class KubernetesNamespacesFilterService implements OnDestroy { // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors()); - - // this.isLoading$ = combineLatest( // TODO: RC Not used?? - // this.kube.loading$, - // this.namespace.loading$, - // ).pipe( - // map(([kubeLoading, nsLoading]) => kubeLoading || nsLoading) - // ); } private getNamespacesObservable() { - // TODO: RC is local??? return kubeEntityCatalog.namespace.store.getPaginationService(null); } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts index 511d570f05..c2adb9e3e2 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts @@ -142,10 +142,10 @@ export class GetHelmReleasePods implements KubePaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; + flattenPagination = true; } -// TODO: RC add to kube action builder /** * Won't fetch services, used to push/retrieve data from store */ @@ -170,4 +170,5 @@ export class GetHelmReleaseServices implements KubePaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; + flattenPagination = true; } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts index eb65cffcb3..4fcaf2153a 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts @@ -87,7 +87,7 @@ export class WorkloadsEffects { endpointId }; // Release name is unique for an endpoint - for Helm 3, include the namespace - helmRelease.guid = guid;//endpointId + ':' + data.namespace + ':' + data.name; //TODO: RC delete + helmRelease.guid = guid; // Make a note of the guid of the endpoint for the release helmRelease.status = data.info.status; helmRelease.lastDeployed = this.mapHelmModifiedDate(data.info.last_deployed); @@ -109,7 +109,6 @@ export class WorkloadsEffects { return this.httpClient.get(url, requestArgs).pipe( mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]), catchError(error => [ - // TODO: RC trigger this, understand error (app.module.ts:173) guid of undefined new WrapperRequestActionFailed(error.message, action, 'fetch', { endpointIds, url: error.url || url, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts index 63007dfd69..f91220bad4 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/workload.types.ts @@ -31,28 +31,11 @@ export interface HelmReleaseEntity { releaseTitle: string; } -export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod { - // endpointId: string; - // releaseTitle: string; - // name: string; - // ready: string; - // status: string; - // restarts: string; - // age: string; -} +export interface HelmReleasePod extends HelmReleaseEntity, KubernetesPod { } -export interface HelmReleaseService extends HelmReleaseEntity, KubeService { - // endpointId: string; - // releaseTitle: string; - // name: string; - //kubeService$?: Observable; // TODO: RC ?? - // metadata: any; - // spec: any; -} +export interface HelmReleaseService extends HelmReleaseEntity, KubeService { } export interface HelmReleaseGraph extends HelmReleaseEntity { - // endpointId: string; - // releaseTitle: string; nodes: {}; links: {}; } diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts index 2153fec07a..6f52000c22 100644 --- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts +++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts @@ -14,6 +14,7 @@ import { } from 'rxjs/operators'; import { populatePaginationFromParent } from '../../../../cloud-foundry/src/entity-relations/entity-relations'; +import { isEntityInlineParentAction } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types'; import { sortStringify } from '../../../../core/src/core/utils.service'; import { SetInitialParams } from '../../actions/pagination.actions'; import { CfValidateEntitiesStart } from '../../actions/request.actions'; @@ -194,6 +195,23 @@ function getObservables( map(([, newPag]) => newPag) ); + const shouldValidate = (action: PaginatedAction): boolean => { + // Validate if.. + // 1) The action is the correct type + const parentAction = isEntityInlineParentAction(action); + if (!parentAction) { + return false; + } + // 2) We have basic request info + // 3) The action states it should not be skipped + // 4) It's already been validated + // 5) There are actual relations to validate + if (action.skipValidation || parentAction.includeRelations.length === 0) { + return false; + } + return true; + } + let lastValidationFootprint: string; const entities$: Observable = combineLatest( @@ -211,11 +229,15 @@ function getObservables( if (lastValidationFootprint !== newValidationFootprint) { lastValidationFootprint = newValidationFootprint; // FIXME: Move cf - #3675 - // This should use something similar to ENTITY_INFO_HANDLER or come from entity itself - arrayAction.forEach(action => store.dispatch(new CfValidateEntitiesStart( - action, - pagination.ids[action.__forcedPageNumber__ || pagination.currentPage] - ))); + // This should use something similar to ENTITY_INFO_HANDLER or come from entity itself. See #4296 + arrayAction.forEach(action => { + if (shouldValidate(action)) { + store.dispatch(new CfValidateEntitiesStart( + action, + pagination.ids[action.__forcedPageNumber__ || pagination.currentPage] + )) + } + }); } }), switchMap(() => paginationMonitor.currentPage$), diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts index ee89fa29f4..e3757bd193 100644 --- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts +++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts @@ -61,10 +61,6 @@ export const endpointsCFEntitiesSelector = createSelector( cfEndpointEntitiesSelector ); -// const log = (label) => { -// return (val) => console.log(label, val); -// }; - // TODO: Move this #3769 export const endpointsCfEntitiesConnectedSelector = connectedEndpointsOfTypesSelector('cf'); From 54534a99c6ae94394d9ffde7f7e30e9cf8c90c48 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 15 May 2020 14:33:34 +0100 Subject: [PATCH 10/15] WIP --- .../create-release.component.ts | 13 +--- .../app/custom/helm/helm-entity-catalog.ts | 17 +++++ .../app/custom/helm/helm-entity-generator.ts | 11 +++- .../monocular-charts-data-source.ts | 9 ++- .../custom/helm/store/helm.action-builders.ts | 18 +++++ .../app/custom/helm/store/helm.actions.ts | 20 +----- .../app/custom/helm/store/helm.effects.ts | 56 +++------------- .../kubernetes/store/kubernetes.actions.ts | 1 + .../list-types/helm-releases-list-source.ts | 5 +- .../store/workload-action-builders.ts | 13 +++- .../workloads/store/workloads.actions.ts | 14 ++++ .../workloads/store/workloads.effects.ts | 65 ++++++++++++++++--- 12 files changed, 143 insertions(+), 99 deletions(-) create mode 100644 custom-src/frontend/app/custom/helm/helm-entity-catalog.ts create mode 100644 custom-src/frontend/app/custom/helm/store/helm.action-builders.ts diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index 448a20abd8..283ba6b23c 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -18,7 +18,7 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory'; import { KubernetesNamespace } from '../../kubernetes/store/kube.types'; -import { HelmInstall } from '../store/helm.actions'; +import { workloadsEntityCatalog } from '../../kubernetes/workloads/workloads-entity-catalog'; import { HelmInstallValues } from '../store/helm.types'; @@ -263,17 +263,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { }; // Make the request - const action = new HelmInstall(values); - this.store.dispatch(action); - - // const releaseEntityConfig = entityCatalog.getEntity(action); - - return this.emf.create( - action.guid, - action - ).entityRequest$.pipe( + return workloadsEntityCatalog.release.api.install(values).pipe( // Wait for result of request - // return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe( filter(state => !!state), pairwise(), filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)), diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts new file mode 100644 index 0000000000..cb1bcde3d7 --- /dev/null +++ b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts @@ -0,0 +1,17 @@ +import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders'; + +/** + * A strongly typed collection of Kube Catalog Entities. + * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc + */ +export class HelmEntityCatalog { + endpoint: StratosCatalogEndpointEntity; + chart: StratosCatalogEntity + version: StratosCatalogEntity +} + +/** + * A strongly typed collection of Kube Catalog Entities. + * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc + */ +export const helmEntityCatalog: HelmEntityCatalog = new HelmEntityCatalog(); diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts index 0fb65457a6..928e03e767 100644 --- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts +++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts @@ -5,12 +5,14 @@ import { } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; +import { helmEntityCatalog } from './helm-entity-catalog'; import { HELM_ENDPOINT_TYPE, helmEntityFactory, helmVersionsEntityType, monocularChartsEntityType, } from './helm-entity-factory'; +import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders'; import { HelmVersion, MonocularChart } from './store/helm.types'; @@ -36,10 +38,11 @@ export function generateHelmEntities(): StratosBaseCatalogEntity[] { } function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - return new StratosCatalogEndpointEntity( + helmEntityCatalog.endpoint = new StratosCatalogEndpointEntity( endpointDefinition, metadata => `/monocular/repos/${metadata.guid}`, ); + return helmEntityCatalog.endpoint; } function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -48,7 +51,8 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit schema: helmEntityFactory(monocularChartsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + helmEntityCatalog.chart = new StratosCatalogEntity(definition); + return helmEntityCatalog.chart; } function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefinition) { @@ -57,7 +61,8 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin schema: helmEntityFactory(helmVersionsEntityType), endpoint: endpointDefinition }; - return new StratosCatalogEntity(definition); + helmEntityCatalog.version = new StratosCatalogEntity(definition); + return helmEntityCatalog.version; } diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts index 2a1c005854..eebb7ad29b 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts +++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts @@ -4,8 +4,7 @@ import { PaginationEntityState } from '../../../../../store/src//types/paginatio import { AppState } from '../../../../../store/src/app-state'; import { ListDataSource } from '../../../shared/components/list/data-sources-controllers/list-data-source'; import { IListConfig } from '../../../shared/components/list/list.component.types'; -import { getMonocularChartId, helmEntityFactory, monocularChartsEntityType } from '../helm-entity-factory'; -import { GetMonocularCharts } from '../store/helm.actions'; +import { helmEntityCatalog } from '../helm-entity-catalog'; import { MonocularChart } from '../store/helm.types'; export class MonocularChartsDataSource extends ListDataSource { @@ -14,12 +13,12 @@ export class MonocularChartsDataSource extends ListDataSource { store: Store, listConfig: IListConfig ) { - const action = new GetMonocularCharts(); + const action = helmEntityCatalog.chart.actions.getMultiple(); super({ store, action, - schema: helmEntityFactory(monocularChartsEntityType), - getRowUniqueId: getMonocularChartId, + schema: action.entity[0], + getRowUniqueId: action.entity[0].getId, paginationKey: action.paginationKey, isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts new file mode 100644 index 0000000000..9af72dca3d --- /dev/null +++ b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts @@ -0,0 +1,18 @@ +import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; +import { GetHelmVersions, GetMonocularCharts } from './helm.actions'; + +export interface HelmChartActionBuilders extends OrchestratedActionBuilders { + getMultiple: () => GetMonocularCharts +} + +export const helmChartActionBuilders: HelmChartActionBuilders = { + getMultiple: () => new GetMonocularCharts() +} + +export interface HelmVersionActionBuilders extends OrchestratedActionBuilders { + getMultiple: () => GetHelmVersions +} + +export const helmVersionActionBuilders: HelmVersionActionBuilders = { + getMultiple: () => new GetHelmVersions() +} \ No newline at end of file diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts index ce114a1245..03bc05a385 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts +++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts @@ -1,6 +1,4 @@ import { EntityRequestAction } from '../../../../../store/src/types/request.types'; -import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory'; -import { helmReleaseEntityKey } from '../../kubernetes/workloads/store/workloads-entity-factory'; import { HELM_ENDPOINT_TYPE, helmEntityFactory, @@ -8,7 +6,6 @@ import { monocularChartsEntityType, } from '../helm-entity-factory'; import { PaginatedAction } from './../../../../../store/src/types/pagination.types'; -import { HelmInstallValues } from './helm.types'; export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts'; export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success'; @@ -18,10 +15,6 @@ export const GET_HELM_VERSIONS = '[Helm] Get Versions'; export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success'; export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure'; -export const HELM_INSTALL = '[Helm] Install'; -export const HELM_INSTALL_SUCCESS = '[Helm] Install Success'; -export const HELM_INSTALL_FAILURE = '[Helm] Install Failure'; - export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { } export class GetMonocularCharts implements MonocularPaginationAction { @@ -42,6 +35,7 @@ export class GetMonocularCharts implements MonocularPaginationAction { 'order-direction': 'desc', 'order-direction-field': 'name', }; + flattenPagination = true; } @@ -63,15 +57,5 @@ export class GetHelmVersions implements MonocularPaginationAction { 'order-direction': 'asc', 'order-direction-field': 'version', }; + flattenPagination = true; } - -export class HelmInstall implements EntityRequestAction { - type = HELM_INSTALL; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entityType = helmReleaseEntityKey; - guid: string; - constructor(public values: HelmInstallValues) { - this.guid = '' + this.values.releaseName; - } -} - diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/custom-src/frontend/app/custom/helm/store/helm.effects.ts index e79232c5d9..46dcbca74e 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts +++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts @@ -3,10 +3,8 @@ import { Injectable } from '@angular/core'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { Action, Store } from '@ngrx/store'; import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from 'frontend/packages/store/src/actions/endpoint.actions'; -import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions'; import { AppState } from 'frontend/packages/store/src/app-state'; import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog'; -import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers'; import { NormalizedResponse } from 'frontend/packages/store/src/types/api.types'; import { EntityRequestAction, @@ -19,15 +17,8 @@ import { catchError, flatMap, mergeMap } from 'rxjs/operators'; import { environment } from '../../../environments/environment'; import { isJetstreamError } from '../../../jetstream.helpers'; -import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; -import { - GET_HELM_VERSIONS, - GET_MONOCULAR_CHARTS, - GetHelmVersions, - GetMonocularCharts, - HELM_INSTALL, - HelmInstall, -} from './helm.actions'; +import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; +import { GET_HELM_VERSIONS, GET_MONOCULAR_CHARTS, GetHelmVersions, GetMonocularCharts } from './helm.actions'; import { HelmVersion } from './helm.types'; @Injectable() @@ -85,7 +76,7 @@ export class HelmEffects { const items = response.data as Array; const processedData = items.reduce((res, data) => { - const id = data.id; + const id = getMonocularChartId(data); res.entities[entityKey][id] = data; // Promote the name to the top-level object for simplicity data.name = data.attributes.name; @@ -119,7 +110,7 @@ export class HelmEffects { endpointId: endpoint, ...endpointData }; - processedData.entities[entityKey][endpoint] = version; + processedData.entities[entityKey][getHelmVersionId(version)] = version; processedData.result.push(endpoint); }); return processedData; @@ -127,36 +118,7 @@ export class HelmEffects { }) ); - @Effect() - helmInstall$ = this.actions$.pipe( - ofType(HELM_INSTALL), - flatMap(action => { - const requestType: ApiRequestTypes = 'create'; - const url = '/pp/v1/helm/install'; - this.store.dispatch(new StartRequestAction(action, requestType)); - return this.httpClient.post(url, action.values).pipe( - mergeMap(() => { - return [ - new ClearPaginationOfType(action), - new WrapperRequestActionSuccess(null, action) - ]; - }), - catchError(error => { - const { status, message } = this.createHelmError(error); - const errorMessage = `Failed to install helm chart: ${message}`; - return [ - new WrapperRequestActionFailed(errorMessage, action, requestType, { - endpointIds: [action.values.endpoint], - url: error.url || url, - eventCode: status, - message: errorMessage, - error - }) - ]; - }) - ); - }) - ); + private makeRequest( action: EntityRequestAction, @@ -172,7 +134,7 @@ export class HelmEffects { return this.httpClient.get(url, requestArgs).pipe( mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]), catchError(error => { - const { status, message } = this.createHelmError(error); + const { status, message } = HelmEffects.createHelmError(error); return [ new WrapperRequestActionFailed(message, action, 'fetch', { endpointIds, @@ -186,7 +148,7 @@ export class HelmEffects { ); } - private createHelmErrorMessage(err: any): string { + static createHelmErrorMessage(err: any): string { if (err) { if (err.error && err.error.message) { // Kube error @@ -202,7 +164,7 @@ export class HelmEffects { return 'Helm API request error'; } - private createHelmError(err: any): { status: string, message: string } { + static createHelmError(err: any): { status: string, message: string } { let unwrapped = err; if (err.error) { unwrapped = err.error; @@ -212,7 +174,7 @@ export class HelmEffects { // Wrapped error return { status: jetstreamError.error.statusCode.toString(), - message: this.createHelmErrorMessage(jetstreamError) + message: HelmEffects.createHelmErrorMessage(jetstreamError) }; } return { diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts index 971f63dbf7..5869014585 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts @@ -281,6 +281,7 @@ export class GetKubernetesServicesInNamespace extends GetKubernetesServices { super(kubeGuid); this.paginationKey = getPaginationKey(kubernetesPodsEntityType, namespaceName, kubeGuid); } + type = GET_SERVICES_IN_NAMESPACE_INFO; actions = [ GET_SERVICES_IN_NAMESPACE_INFO, GET_SERVICES_IN_NAMESPACE_INFO_SUCCESS, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts index 56a4505195..d6fe2020f1 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/helm-releases-list-source.ts @@ -10,8 +10,6 @@ import { IListConfig } from 'frontend/packages/core/src/shared/components/list/l import { AppState } from 'frontend/packages/store/src/app-state'; import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types'; -import { kubernetesEntityFactory } from '../../kubernetes-entity-factory'; -import { helmReleaseEntityKey } from '../store/workloads-entity-factory'; import { HelmRelease } from '../workload.types'; import { workloadsEntityCatalog } from '../workloads-entity-catalog'; @@ -33,12 +31,13 @@ export class HelmReleasesDataSource extends ListDataSource { store: Store, listConfig: IListConfig ) { + const action = workloadsEntityCatalog.release.actions.getMultiple(); const transformEntities = [{ type: 'filter' as DataFunctionDefinitionType, field: 'name' }, kubeEndpointFilter]; super({ store, action, - schema: kubernetesEntityFactory(helmReleaseEntityKey), + schema: action.entity[0], getRowUniqueId: row => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts index eb7591f9c5..c325f2b932 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts @@ -1,7 +1,14 @@ import { OrchestratedActionBuilders, } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; -import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions'; +import { HelmInstallValues } from '../../../helm/store/helm.types'; +import { + GetHelmRelease, + GetHelmReleaseGraph, + GetHelmReleaseResource, + GetHelmReleases, + HelmInstall, +} from './workloads.actions'; export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders { get: ( @@ -10,13 +17,15 @@ export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders { extraArgs: { namespace: string } ) => GetHelmRelease; getMultiple: () => GetHelmReleases; + install: (values: HelmInstallValues) => HelmInstall } export const workloadReleaseBuilders: WorkloadReleaseBuilders = { get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => { return new GetHelmRelease(endpointGuid, namespace, title); }, - getMultiple: () => new GetHelmReleases() + getMultiple: () => new GetHelmReleases(), + install: (values: HelmInstallValues) => new HelmInstall(values) } export interface WorkloadGraphBuilders extends OrchestratedActionBuilders { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts index c2adb9e3e2..9fad760fb7 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts @@ -2,6 +2,7 @@ import { EntityRequestAction } from 'frontend/packages/store/src/types/request.t import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; import { MonocularPaginationAction } from '../../../helm/store/helm.actions'; +import { HelmInstallValues } from '../../../helm/store/helm.types'; import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory, @@ -38,6 +39,10 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release'; export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success'; export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure'; +export const HELM_INSTALL = '[Helm] Install'; +export const HELM_INSTALL_SUCCESS = '[Helm] Install Success'; +export const HELM_INSTALL_FAILURE = '[Helm] Install Failure'; + interface HelmReleaseSingleEntity extends EntityRequestAction { guid: string; } @@ -46,6 +51,15 @@ interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction { } +export class HelmInstall implements HelmReleaseSingleEntity { + type = HELM_INSTALL; + endpointType = KUBERNETES_ENDPOINT_TYPE; + entityType = helmReleaseEntityKey; + guid: string; + constructor(public values: HelmInstallValues) { + this.guid = '' + this.values.releaseName; + } +} export class GetHelmReleases implements MonocularPaginationAction { constructor() { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts index 4fcaf2153a..dd9bc41611 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts @@ -6,8 +6,10 @@ import { environment } from 'frontend/packages/core/src/environments/environment import { Observable } from 'rxjs'; import { catchError, flatMap, mergeMap } from 'rxjs/operators'; +import { ClearPaginationOfType } from '../../../../../../store/src/actions/pagination.actions'; import { AppState } from '../../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; +import { ApiRequestTypes } from '../../../../../../store/src/reducers/api-request-reducer/request-helpers'; import { NormalizedResponse } from '../../../../../../store/src/types/api.types'; import { EntityRequestAction, @@ -15,9 +17,17 @@ import { WrapperRequestActionFailed, WrapperRequestActionSuccess, } from '../../../../../../store/src/types/request.types'; +import { HelmEffects } from '../../../helm/store/helm.effects'; import { HelmRelease } from '../workload.types'; import { getHelmReleaseId } from './workloads-entity-factory'; -import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions'; +import { + GET_HELM_RELEASE, + GET_HELM_RELEASES, + GetHelmRelease, + GetHelmReleases, + HELM_INSTALL, + HelmInstall, +} from './workloads.actions'; @Injectable() export class WorkloadsEffects { @@ -81,6 +91,37 @@ export class WorkloadsEffects { }) ); + @Effect() + helmInstall$ = this.actions$.pipe( + ofType(HELM_INSTALL), + flatMap(action => { + const requestType: ApiRequestTypes = 'create'; + const url = '/pp/v1/helm/install'; + this.store.dispatch(new StartRequestAction(action, requestType)); + return this.httpClient.post(url, action.values).pipe( + mergeMap(() => { + return [ + new ClearPaginationOfType(action), + new WrapperRequestActionSuccess(null, action) + ]; + }), + catchError(error => { + const { status, message } = HelmEffects.createHelmError(error); + const errorMessage = `Failed to install helm chart: ${message}`; + return [ + new WrapperRequestActionFailed(errorMessage, action, requestType, { + endpointIds: [action.values.endpoint], + url: error.url || url, + eventCode: status, + message: errorMessage, + error + }) + ]; + }) + ); + }) + ); + private mapHelmRelease(data, endpointId, guid: string) { const helmRelease: HelmRelease = { ...data, @@ -108,15 +149,19 @@ export class WorkloadsEffects { }; return this.httpClient.get(url, requestArgs).pipe( mergeMap((response: any) => [new WrapperRequestActionSuccess(mapResult(response), action)]), - catchError(error => [ - new WrapperRequestActionFailed(error.message, action, 'fetch', { - endpointIds, - url: error.url || url, - eventCode: error.status ? error.status + '' : '500', - message: 'Helm Release API request error', - error - }) - ]) + catchError(error => { + const { status, message } = HelmEffects.createHelmError(error); + const errorMessage = `Failed to fetch helm data: ${message}`; + return [ + new WrapperRequestActionFailed(errorMessage, action, 'fetch', { + endpointIds, + url: error.url || url, + eventCode: status, + message: errorMessage, + error + }) + ] + }) ); } From 81db83c3a3703d776bbbbe20296c576e275dd5d4 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 15 May 2020 15:17:32 +0100 Subject: [PATCH 11/15] Final TODO's --- .../create-release.component.ts | 9 +--- .../app/custom/helm/helm-entity-generator.ts | 21 ++++++-- .../monocular-charts-data-source.ts | 2 +- .../custom/helm/store/helm.action-builders.ts | 11 ++-- .../app/custom/helm/store/helm.actions.ts | 14 +++++ .../app/custom/helm/store/helm.effects.ts | 45 ++++++++++++++-- .../services/kubernetes-endpoint.service.ts | 1 - .../kubernetes-summary.component.ts | 54 +++++++++---------- .../store/workload-action-builders.ts | 13 +---- .../workloads/store/workloads.actions.ts | 15 ------ .../workloads/store/workloads.effects.ts | 42 +-------------- 11 files changed, 112 insertions(+), 115 deletions(-) diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index 283ba6b23c..1c359a71cb 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -18,14 +18,9 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../shared/components import { kubeEntityCatalog } from '../../kubernetes/kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE } from '../../kubernetes/kubernetes-entity-factory'; import { KubernetesNamespace } from '../../kubernetes/store/kube.types'; -import { workloadsEntityCatalog } from '../../kubernetes/workloads/workloads-entity-catalog'; +import { helmEntityCatalog } from '../helm-entity-catalog'; import { HelmInstallValues } from '../store/helm.types'; - -// private pmf: PaginationMonitorFactory, // TODO: RC search and destroy -// private emf: EntityMonitorFactory // TODO: RC search and destroy -// store.dispatch - @Component({ selector: 'app-create-release', templateUrl: './create-release.component.html', @@ -263,7 +258,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { }; // Make the request - return workloadsEntityCatalog.release.api.install(values).pipe( + return helmEntityCatalog.chart.api.install(values).pipe( // Wait for result of request filter(state => !!state), pairwise(), diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts index 928e03e767..380b225a40 100644 --- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts +++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts @@ -12,7 +12,12 @@ import { helmVersionsEntityType, monocularChartsEntityType, } from './helm-entity-factory'; -import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders'; +import { + HelmChartActionBuilders, + helmChartActionBuilders, + HelmVersionActionBuilders, + helmVersionActionBuilders, +} from './store/helm.action-builders'; import { HelmVersion, MonocularChart } from './store/helm.types'; @@ -51,7 +56,12 @@ function generateChartEntity(endpointDefinition: StratosEndpointExtensionDefinit schema: helmEntityFactory(monocularChartsEntityType), endpoint: endpointDefinition }; - helmEntityCatalog.chart = new StratosCatalogEntity(definition); + helmEntityCatalog.chart = new StratosCatalogEntity( + definition, + { + actionBuilders: helmChartActionBuilders + } + ); return helmEntityCatalog.chart; } @@ -61,7 +71,12 @@ function generateVersionEntity(endpointDefinition: StratosEndpointExtensionDefin schema: helmEntityFactory(helmVersionsEntityType), endpoint: endpointDefinition }; - helmEntityCatalog.version = new StratosCatalogEntity(definition); + helmEntityCatalog.version = new StratosCatalogEntity( + definition, + { + actionBuilders: helmVersionActionBuilders + } + ); return helmEntityCatalog.version; } diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts index eebb7ad29b..afefeae64e 100644 --- a/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts +++ b/custom-src/frontend/app/custom/helm/list-types/monocular-charts-data-source.ts @@ -18,7 +18,7 @@ export class MonocularChartsDataSource extends ListDataSource { store, action, schema: action.entity[0], - getRowUniqueId: action.entity[0].getId, + getRowUniqueId: (row) => action.entity[0].getId(row), paginationKey: action.paginationKey, isLocal: true, listConfig, diff --git a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts index 9af72dca3d..53c20f4de9 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts +++ b/custom-src/frontend/app/custom/helm/store/helm.action-builders.ts @@ -1,12 +1,17 @@ import { OrchestratedActionBuilders } from '../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; -import { GetHelmVersions, GetMonocularCharts } from './helm.actions'; +import { GetHelmVersions, GetMonocularCharts, HelmInstall } from './helm.actions'; +import { HelmInstallValues } from './helm.types'; export interface HelmChartActionBuilders extends OrchestratedActionBuilders { - getMultiple: () => GetMonocularCharts + getMultiple: () => GetMonocularCharts, + // Helm install added to chart action builder and not helm release/workload to ensure action & effect are available in this module + // (others may not have loaded) + install: (values: HelmInstallValues) => HelmInstall } export const helmChartActionBuilders: HelmChartActionBuilders = { - getMultiple: () => new GetMonocularCharts() + getMultiple: () => new GetMonocularCharts(), + install: (values: HelmInstallValues) => new HelmInstall(values) } export interface HelmVersionActionBuilders extends OrchestratedActionBuilders { diff --git a/custom-src/frontend/app/custom/helm/store/helm.actions.ts b/custom-src/frontend/app/custom/helm/store/helm.actions.ts index 03bc05a385..d0c0db844e 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.actions.ts +++ b/custom-src/frontend/app/custom/helm/store/helm.actions.ts @@ -6,6 +6,7 @@ import { monocularChartsEntityType, } from '../helm-entity-factory'; import { PaginatedAction } from './../../../../../store/src/types/pagination.types'; +import { HelmInstallValues } from './helm.types'; export const GET_MONOCULAR_CHARTS = '[Monocular] Get Charts'; export const GET_MONOCULAR_CHARTS_SUCCESS = '[Monocular] Get Charts Success'; @@ -15,6 +16,10 @@ export const GET_HELM_VERSIONS = '[Helm] Get Versions'; export const GET_HELM_VERSIONS_SUCCESS = '[Helm] Get Versions Success'; export const GET_HELM_VERSIONS_FAILURE = '[Helm] Get Versions Failure'; +export const HELM_INSTALL = '[Helm] Install'; +export const HELM_INSTALL_SUCCESS = '[Helm] Install Success'; +export const HELM_INSTALL_FAILURE = '[Helm] Install Failure'; + export interface MonocularPaginationAction extends PaginatedAction, EntityRequestAction { } export class GetMonocularCharts implements MonocularPaginationAction { @@ -38,6 +43,15 @@ export class GetMonocularCharts implements MonocularPaginationAction { flattenPagination = true; } +export class HelmInstall implements EntityRequestAction { + type = HELM_INSTALL; + endpointType = HELM_ENDPOINT_TYPE; + entityType = monocularChartsEntityType; + guid: string; + constructor(public values: HelmInstallValues) { + this.guid = '' + this.values.releaseName; + } +} export class GetHelmVersions implements MonocularPaginationAction { constructor() { diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/custom-src/frontend/app/custom/helm/store/helm.effects.ts index 46dcbca74e..dfd8a6db60 100644 --- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts +++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts @@ -15,10 +15,20 @@ import { import { Observable } from 'rxjs'; import { catchError, flatMap, mergeMap } from 'rxjs/operators'; +import { ClearPaginationOfType } from '../../../../../store/src/actions/pagination.actions'; +import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers'; import { environment } from '../../../environments/environment'; import { isJetstreamError } from '../../../jetstream.helpers'; +import { helmEntityCatalog } from '../helm-entity-catalog'; import { getHelmVersionId, getMonocularChartId, HELM_ENDPOINT_TYPE } from '../helm-entity-factory'; -import { GET_HELM_VERSIONS, GET_MONOCULAR_CHARTS, GetHelmVersions, GetMonocularCharts } from './helm.actions'; +import { + GET_HELM_VERSIONS, + GET_MONOCULAR_CHARTS, + GetHelmVersions, + GetMonocularCharts, + HELM_INSTALL, + HelmInstall, +} from './helm.actions'; import { HelmVersion } from './helm.types'; @Injectable() @@ -118,7 +128,36 @@ export class HelmEffects { }) ); - + @Effect() + helmInstall$ = this.actions$.pipe( + ofType(HELM_INSTALL), + flatMap(action => { + const requestType: ApiRequestTypes = 'create'; + const url = '/pp/v1/helm/install'; + this.store.dispatch(new StartRequestAction(action, requestType)); + return this.httpClient.post(url, action.values).pipe( + mergeMap(() => { + return [ + new ClearPaginationOfType(action), + new WrapperRequestActionSuccess(null, action) + ]; + }), + catchError(error => { + const { status, message } = HelmEffects.createHelmError(error); + const errorMessage = `Failed to install helm chart: ${message}`; + return [ + new WrapperRequestActionFailed(errorMessage, action, requestType, { + endpointIds: [action.values.endpoint], + url: error.url || url, + eventCode: status, + message: errorMessage, + error + }) + ]; + }) + ); + }) + ); private makeRequest( action: EntityRequestAction, @@ -204,7 +243,7 @@ export class HelmEffects { this.syncing = syncing; if (remaining !== existing) { // Dispatch action to refresh charts - this.store.dispatch(new GetMonocularCharts()); + helmEntityCatalog.chart.api.getMultiple(); } if (remaining > 0) { this.scheduleSyncStatusCheck(); diff --git a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts index cd6c67b9f3..7bafc4d2ca 100644 --- a/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/services/kubernetes-endpoint.service.ts @@ -188,7 +188,6 @@ export class KubernetesEndpointService { } public refreshKubernetesDashboardStatus() { - // this.store.dispatch(new GetKubernetesDashboard(this.kubeGuid)); // TODO: RC store.dispatch kubeEntityCatalog.dashboard.api.get(this.kubeGuid); } diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts index aa4186c638..fc4b0a9ce5 100644 --- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts @@ -4,13 +4,13 @@ import { SafeResourceUrl } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { combineLatest, interval, Observable, Subscription } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; +import { first, map, startWith } from 'rxjs/operators'; import { AppState } from '../../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; -import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; -import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; +import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types'; +import { PaginatedAction, PaginationEntityState } from '../../../../../../store/src/types/pagination.types'; import { safeUnsubscribe } from '../../../../core/utils.service'; import { IChartThresholds, @@ -113,14 +113,15 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy { ngOnInit() { const guid = this.kubeEndpointService.baseKube.guid; - - - const podCountAction = kubeEntityCatalog.pod.actions.getMultiple(guid); - const nodeCountAction = kubeEntityCatalog.node.actions.getMultiple(guid); - const namespacesCountAction = kubeEntityCatalog.namespace.actions.getMultiple(guid); - const pods$ = this.getPaginationObservable(podCountAction); - const nodes$ = this.getPaginationObservable(nodeCountAction); - const namespaces$ = this.getPaginationObservable(namespacesCountAction); + const podsObs = kubeEntityCatalog.pod.store.getPaginationService(guid); + const pods$ = podsObs.entities$; + this.poll(kubeEntityCatalog.pod.actions.getMultiple(guid), podsObs.pagination$) + const nodesObs = kubeEntityCatalog.node.store.getPaginationService(guid); + const nodes$ = nodesObs.entities$; + this.poll(kubeEntityCatalog.node.actions.getMultiple(guid), nodesObs.pagination$) + const namespacesObs = kubeEntityCatalog.namespace.store.getPaginationService(guid); + const namespaces$ = namespacesObs.entities$; + this.poll(kubeEntityCatalog.namespace.actions.getMultiple(guid), namespacesObs.pagination$) this.podCount$ = this.kubeEndpointService.getCountObservable(pods$); this.nodeCount$ = this.kubeEndpointService.getCountObservable(nodes$); @@ -177,29 +178,22 @@ export class KubernetesSummaryTabComponent implements OnInit, OnDestroy { ); } - private getPaginationObservable(action: PaginatedAction) { - const paginationMonitor = this.paginationMonitorFactory.create( - action.paginationKey, - action, - true - ); - - // TODO: RC this could easily get backed up, would entityService .poll be better?? - this.ngZone.runOutsideAngular(() => { + private poll(action: PaginatedAction, pagination$: Observable) { + this.ngZone.runOutsideAngular(() => this.polls.push( interval(10000).subscribe(() => { - this.ngZone.run(() => { - this.store.dispatch(action); - }); + this.ngZone.run(() => this.updateList(action, pagination$)); }) - ); - }); + ) + ); + } - return getPaginationObservables({ - store: this.store, - action, - paginationMonitor - }).entities$; + private updateList(action: PaginatedAction, pagination$: Observable) { + pagination$.pipe(first()).subscribe(pag => { + if (!getCurrentPageRequestInfo(pag, { busy: true, error: false, message: '' }).busy) { + this.store.dispatch(action); + } + }) } ngOnDestroy() { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts index c325f2b932..eb7591f9c5 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workload-action-builders.ts @@ -1,14 +1,7 @@ import { OrchestratedActionBuilders, } from '../../../../../../store/src/entity-catalog/action-orchestrator/action-orchestrator'; -import { HelmInstallValues } from '../../../helm/store/helm.types'; -import { - GetHelmRelease, - GetHelmReleaseGraph, - GetHelmReleaseResource, - GetHelmReleases, - HelmInstall, -} from './workloads.actions'; +import { GetHelmRelease, GetHelmReleaseGraph, GetHelmReleaseResource, GetHelmReleases } from './workloads.actions'; export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders { get: ( @@ -17,15 +10,13 @@ export interface WorkloadReleaseBuilders extends OrchestratedActionBuilders { extraArgs: { namespace: string } ) => GetHelmRelease; getMultiple: () => GetHelmReleases; - install: (values: HelmInstallValues) => HelmInstall } export const workloadReleaseBuilders: WorkloadReleaseBuilders = { get: (title: string, endpointGuid: string, { namespace }: { namespace: string }) => { return new GetHelmRelease(endpointGuid, namespace, title); }, - getMultiple: () => new GetHelmReleases(), - install: (values: HelmInstallValues) => new HelmInstall(values) + getMultiple: () => new GetHelmReleases() } export interface WorkloadGraphBuilders extends OrchestratedActionBuilders { diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts index 9fad760fb7..319ef74b8b 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.actions.ts @@ -2,7 +2,6 @@ import { EntityRequestAction } from 'frontend/packages/store/src/types/request.t import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; import { MonocularPaginationAction } from '../../../helm/store/helm.actions'; -import { HelmInstallValues } from '../../../helm/store/helm.types'; import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory, @@ -39,10 +38,6 @@ export const UPDATE_HELM_RELEASE = '[Helm] Update Release'; export const UPDATE_HELM_RELEASE_SUCCESS = '[Helm] Update Release Success'; export const UPDATE_HELM_RELEASE_FAILURE = '[Helm] Update Release Failure'; -export const HELM_INSTALL = '[Helm] Install'; -export const HELM_INSTALL_SUCCESS = '[Helm] Install Success'; -export const HELM_INSTALL_FAILURE = '[Helm] Install Failure'; - interface HelmReleaseSingleEntity extends EntityRequestAction { guid: string; } @@ -51,16 +46,6 @@ interface HelmReleasePaginated extends PaginatedAction, EntityRequestAction { } -export class HelmInstall implements HelmReleaseSingleEntity { - type = HELM_INSTALL; - endpointType = KUBERNETES_ENDPOINT_TYPE; - entityType = helmReleaseEntityKey; - guid: string; - constructor(public values: HelmInstallValues) { - this.guid = '' + this.values.releaseName; - } -} - export class GetHelmReleases implements MonocularPaginationAction { constructor() { this.paginationKey = 'helm-releases'; diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts index dd9bc41611..ea7add12fe 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts @@ -6,10 +6,8 @@ import { environment } from 'frontend/packages/core/src/environments/environment import { Observable } from 'rxjs'; import { catchError, flatMap, mergeMap } from 'rxjs/operators'; -import { ClearPaginationOfType } from '../../../../../../store/src/actions/pagination.actions'; import { AppState } from '../../../../../../store/src/app-state'; import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog'; -import { ApiRequestTypes } from '../../../../../../store/src/reducers/api-request-reducer/request-helpers'; import { NormalizedResponse } from '../../../../../../store/src/types/api.types'; import { EntityRequestAction, @@ -20,14 +18,7 @@ import { import { HelmEffects } from '../../../helm/store/helm.effects'; import { HelmRelease } from '../workload.types'; import { getHelmReleaseId } from './workloads-entity-factory'; -import { - GET_HELM_RELEASE, - GET_HELM_RELEASES, - GetHelmRelease, - GetHelmReleases, - HELM_INSTALL, - HelmInstall, -} from './workloads.actions'; +import { GET_HELM_RELEASE, GET_HELM_RELEASES, GetHelmRelease, GetHelmReleases } from './workloads.actions'; @Injectable() export class WorkloadsEffects { @@ -91,37 +82,6 @@ export class WorkloadsEffects { }) ); - @Effect() - helmInstall$ = this.actions$.pipe( - ofType(HELM_INSTALL), - flatMap(action => { - const requestType: ApiRequestTypes = 'create'; - const url = '/pp/v1/helm/install'; - this.store.dispatch(new StartRequestAction(action, requestType)); - return this.httpClient.post(url, action.values).pipe( - mergeMap(() => { - return [ - new ClearPaginationOfType(action), - new WrapperRequestActionSuccess(null, action) - ]; - }), - catchError(error => { - const { status, message } = HelmEffects.createHelmError(error); - const errorMessage = `Failed to install helm chart: ${message}`; - return [ - new WrapperRequestActionFailed(errorMessage, action, requestType, { - endpointIds: [action.values.endpoint], - url: error.url || url, - eventCode: status, - message: errorMessage, - error - }) - ]; - }) - ); - }) - ); - private mapHelmRelease(data, endpointId, guid: string) { const helmRelease: HelmRelease = { ...data, From cfaadc07d12b67d82bc05245d2369ec970738359 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Mon, 1 Jun 2020 11:55:34 +0100 Subject: [PATCH 12/15] Fix left padding on expander rows --- .../packages/core/sass/components/mat-table.scss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss index 6eef03a63d..c623288894 100644 --- a/src/frontend/packages/core/sass/components/mat-table.scss +++ b/src/frontend/packages/core/sass/components/mat-table.scss @@ -16,10 +16,18 @@ $mat-table-header-paginator-font-size: 13px; padding: 10px 10px 10px 0; } - // Use margin, not padding for the left side of the first cell in the row/header/footer - .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type { - margin-left: 20px; - padding-left: 0; + .app-table { + // Use margin, not padding for the left side of the first cell in the row/header/footer + .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type { + margin-left: 20px; + padding-left: 0; + } + .has-expanded-row { + // Override the margin-left from above, there's a lot of white space going on + .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type { + margin-left: 10px; + } + } } // Use margin, not padding for the right side of the first cell in the row/header/footer From e6880465cb091eb18cdf887d01bd6c41d262e41b Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 10 Jun 2020 09:42:09 +0100 Subject: [PATCH 13/15] Fix unit tests --- .../card-autoscaler-default.component.spec.ts | 4 +--- .../cf-app-autoscaler-events-config.service.spec.ts | 4 +--- .../app-autoscaler-metric-chart-card.component.spec.ts | 4 +--- ...app-autoscaler-metric-chart-list-config.service.spec.ts | 7 +------ .../packages/core/test-framework/core-test.helper.ts | 4 +--- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts index c675dec32c..e0b1c180b2 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts @@ -15,9 +15,7 @@ import { } from '../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component'; import { MetadataItemComponent } from '../../../../core/src/shared/components/metadata-item/metadata-item.component'; import { AppTestModule } from '../../../../core/test-framework/core-test.helper'; -import { - EntityCatalogHelper, -} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; +import { EntityCatalogHelper } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service'; import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory'; import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module'; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts index 4a97c65001..a30d9ddc7e 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts @@ -16,9 +16,7 @@ import { CoreModule } from '../../../../../core/src/core/core.module'; import { SharedModule } from '../../../../../core/src/shared/shared.module'; import { AppTestModule } from '../../../../../core/test-framework/core-test.helper'; import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper'; -import { - EntityCatalogHelper, -} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; +import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts index f394b9ec93..7f0a6a1cbf 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts @@ -18,7 +18,7 @@ import { ConfirmationDialogService } from '../../../../../../core/src/shared/com import { AppTestModule } from '../../../../../../core/test-framework/core-test.helper'; import { EntityCatalogHelper, -} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; +} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service'; import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory'; import { CfAutoscalerTestingModule } from '../../../../cf-autoscaler-testing.module'; @@ -26,8 +26,6 @@ import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-c import { AppAutoscalerComboChartComponent } from './combo-chart/combo-chart.component'; import { AppAutoscalerComboSeriesVerticalComponent } from './combo-chart/combo-series-vertical.component'; -/* tslint:disable:max-line-length */ -/* tslint:enable:max-line-length */ describe('AppAutoscalerMetricChartCardComponent', () => { let component: AppAutoscalerMetricChartCardComponent; diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts index fd0a925eb3..4c6669fe61 100644 --- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts +++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts @@ -11,18 +11,13 @@ import { } from '../../../../../cloud-foundry/test-framework/application-service-helper'; import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service'; import { AppTestModule } from '../../../../../core/test-framework/core-test.helper'; -import { - EntityCatalogHelper, -} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; +import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module'; import { AppAutoscalerMetricChartListConfigService } from './app-autoscaler-metric-chart-list-config.service'; -/* tslint:disable:max-line-length */ - -/* tslint:enable:max-line-length */ describe('AppAutoscalerMetricChartListConfigService', () => { beforeEach(() => { diff --git a/src/frontend/packages/core/test-framework/core-test.helper.ts b/src/frontend/packages/core/test-framework/core-test.helper.ts index d9ca7cafe9..99e36a22d7 100644 --- a/src/frontend/packages/core/test-framework/core-test.helper.ts +++ b/src/frontend/packages/core/test-framework/core-test.helper.ts @@ -5,9 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { StoreModule } from '@ngrx/store'; import { createBasicStoreModule } from '@stratos/store/testing'; -import { - EntityCatalogHelper, -} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity/entity-catalog.service'; +import { EntityCatalogHelper } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service'; import { EntityCatalogHelpers } from '../../store/src/entity-catalog/entity-catalog.helper'; import { appReducers } from '../../store/src/reducers.module'; import { CoreModule } from '../src/core/core.module'; From 955c6ff83dabb081079f27ab6a09a758debbdfa7 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Thu, 11 Jun 2020 15:08:57 +0100 Subject: [PATCH 14/15] Improve unit tests --- custom-src/frontend/app/custom/helm/helm-testing.module.ts | 2 ++ .../app/custom/kubernetes/kubernetes.testing.module.ts | 2 ++ .../kubernetes-pod-containers.component.ts | 3 --- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/custom-src/frontend/app/custom/helm/helm-testing.module.ts b/custom-src/frontend/app/custom/helm/helm-testing.module.ts index be42355419..2bace2cf52 100644 --- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts +++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts @@ -7,6 +7,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module'; import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog'; import { createBasicStoreModule } from '../../../../store/testing/public-api'; +import { AppTestModule } from '../../../test-framework/core-test.helper'; import { generateStratosEntities } from '../../base-entity-types'; import { CoreModule } from '../../core/core.module'; import { SharedModule } from '../../shared/shared.module'; @@ -54,6 +55,7 @@ export const HelmReleaseGuidMock = { }; export const HelmBaseTestModules = [ + AppTestModule, HelmTestingModule, RouterTestingModule, CoreModule, diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts index c87f6368fc..9185564ccb 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts @@ -6,6 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module'; import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog'; import { createBasicStoreModule } from '../../../../store/testing/public-api'; +import { AppTestModule } from '../../../test-framework/core-test.helper'; import { generateStratosEntities } from '../../base-entity-types'; import { CoreModule } from '../../core/core.module'; import { SharedModule } from '../../shared/shared.module'; @@ -34,6 +35,7 @@ import { HelmReleaseHelperService } from './workloads/release/tabs/helm-release- export class KubernetesTestingModule { } export const KubernetesBaseTestModules = [ + AppTestModule, KubernetesTestingModule, RouterTestingModule, CoreModule, diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts index 03295227db..d838567a71 100644 --- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts @@ -1,11 +1,9 @@ import { TitleCasePipe } from '@angular/common'; import { Component, Input } from '@angular/core'; -import { Store } from '@ngrx/store'; import * as moment from 'moment'; import { of } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import { AppState } from '../../../../../../../store/src/app-state'; import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component'; import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types'; import { @@ -55,7 +53,6 @@ export class KubernetesPodContainersComponent extends CardCell { } constructor( - private store: Store, private titleCase: TitleCasePipe, ) { super(); From fc197cd99fdd46f90fbdf3fce8ef37a8f9fe2e58 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Fri, 12 Jun 2020 17:17:52 +0100 Subject: [PATCH 15/15] Changes following review --- .../create-release/create-release.component.ts | 5 ----- .../app/custom/helm/helm-entity-catalog.ts | 4 ++-- .../kubernetes-certs-auth-form.component.scss | 2 +- .../kubernetes/kubernetes-entity-catalog.ts | 3 --- .../kubernetes/kubernetes-entity-factory.ts | 7 ------- .../kubernetes/kubernetes-entity-generator.ts | 17 ----------------- .../action-builders/kube.action-builders.ts | 7 ------- .../app/custom/kubernetes/store/kube.getIds.ts | 2 +- .../kube-namespaces-filter-config.service.ts | 3 +-- .../helm-release-tab-base.component.ts | 14 +++++--------- .../release/tabs/helm-release-helper.service.ts | 9 ++++----- .../workloads/workloads-entity-catalog.ts | 4 ++-- .../backup-endpoints.component.html | 2 ++ 13 files changed, 18 insertions(+), 61 deletions(-) diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts index 42474594ff..45793d2149 100644 --- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts +++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts @@ -3,12 +3,9 @@ import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/co import { FormControl, FormGroup, Validators } from '@angular/forms'; import { MatTextareaAutosize } from '@angular/material/input'; import { ActivatedRoute } from '@angular/router'; -import { Store } from '@ngrx/store'; import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators'; -import { AppState } from '../../../../../store/src/app-state'; -import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service'; import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types'; import { EndpointsService } from '../../../core/endpoints.service'; import { safeUnsubscribe } from '../../../core/utils.service'; @@ -60,10 +57,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, public endpointsService: EndpointsService, - private store: Store, private httpClient: HttpClient, private confirmDialog: ConfirmationDialogService, - private emf: EntityMonitorFactory ) { const chart = this.route.snapshot.params; this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`; diff --git a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts index cb1bcde3d7..288b527982 100644 --- a/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts +++ b/custom-src/frontend/app/custom/helm/helm-entity-catalog.ts @@ -1,7 +1,7 @@ import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { MonocularChart, HelmVersion } from './store/helm.types'; import { HelmChartActionBuilders, HelmVersionActionBuilders } from './store/helm.action-builders'; /** - * A strongly typed collection of Kube Catalog Entities. + * A strongly typed collection of Helm Catalog Entities. * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc */ export class HelmEntityCatalog { @@ -11,7 +11,7 @@ export class HelmEntityCatalog { } /** - * A strongly typed collection of Kube Catalog Entities. + * A strongly typed collection of Helm Catalog Entities. * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc */ export const helmEntityCatalog: HelmEntityCatalog = new HelmEntityCatalog(); diff --git a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss index 23498e9eca..5385ee9711 100644 --- a/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss +++ b/custom-src/frontend/app/custom/kubernetes/auth-forms/kubernetes-certs-auth-form/kubernetes-certs-auth-form.component.scss @@ -14,7 +14,7 @@ &__content { & > * { - padding-bottom: 10px; + margin-bottom: 10px; } textarea { max-height: 75px; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts index a59854a6f1..816ab0bd47 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-catalog.ts @@ -4,7 +4,6 @@ import { } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types'; import { - KubeAppActionBuilders, KubeDashboardActionBuilders, KubeDeploymentActionBuilders, KubeNamespaceActionBuilders, @@ -14,7 +13,6 @@ import { KubeStatefulSetsActionBuilders, } from './store/action-builders/kube.action-builders'; import { - KubernetesApp, KubernetesDeployment, KubernetesNamespace, KubernetesNode, @@ -29,7 +27,6 @@ import { */ export class KubeEntityCatalog { public endpoint: StratosCatalogEndpointEntity; - public app: StratosCatalogEntity; public statefulSet: StratosCatalogEntity; public pod: StratosCatalogEntity; public deployment: StratosCatalogEntity; diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts index 2f2892c23a..a30402dfaa 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts @@ -21,7 +21,6 @@ export const kubernetesNamespacesEntityType = 'kubernetesNamespace'; export const kubernetesServicesEntityType = 'kubernetesService'; export const kubernetesStatefulSetsEntityType = 'kubernetesStatefulSet'; export const kubernetesDeploymentsEntityType = 'kubernetesDeployment'; -export const kubernetesAppsEntityType = 'kubernetesApp'; export const kubernetesDashboardEntityType = 'kubernetesDashboard'; export const getKubeAppId = (object: KubernetesApp) => object.name; @@ -57,12 +56,6 @@ entityCache[kubernetesEntityType] = new KubernetesEntitySchema( { idAttribute: getAPIResourceGuid } ); -entityCache[kubernetesAppsEntityType] = new KubernetesEntitySchema( - kubernetesAppsEntityType, - {}, - { idAttribute: getKubeAppId } -); - entityCache[kubernetesStatefulSetsEntityType] = new KubernetesEntitySchema( kubernetesStatefulSetsEntityType, {}, diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts index 45a20854e0..eac9f993c0 100644 --- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts +++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts @@ -23,7 +23,6 @@ import { KubernetesGKEAuthFormComponent } from './auth-forms/kubernetes-gke-auth import { kubeEntityCatalog } from './kubernetes-entity-catalog'; import { KUBERNETES_ENDPOINT_TYPE, - kubernetesAppsEntityType, kubernetesDashboardEntityType, kubernetesDeploymentsEntityType, kubernetesEntityFactory, @@ -34,8 +33,6 @@ import { kubernetesStatefulSetsEntityType, } from './kubernetes-entity-factory'; import { - KubeAppActionBuilders, - kubeAppActionBuilders, KubeDashboardActionBuilders, kubeDashboardActionBuilders, KubeDeploymentActionBuilders, @@ -52,7 +49,6 @@ import { kubeStatefulSetsActionBuilders, } from './store/action-builders/kube.action-builders'; import { - KubernetesApp, KubernetesDeployment, KubernetesNamespace, KubernetesNode, @@ -161,7 +157,6 @@ export function generateKubernetesEntities(): StratosBaseCatalogEntity[] { }; return [ generateEndpointEntity(endpointDefinition), - generateAppEntity(endpointDefinition), generateStatefulSetsEntity(endpointDefinition), generatePodsEntity(endpointDefinition), generateDeploymentsEntity(endpointDefinition), @@ -182,18 +177,6 @@ function generateEndpointEntity(endpointDefinition: StratosEndpointExtensionDefi return kubeEntityCatalog.endpoint; } -function generateAppEntity(endpointDefinition: StratosEndpointExtensionDefinition) { - const definition: IStratosEntityDefinition = { - type: kubernetesAppsEntityType, - schema: kubernetesEntityFactory(kubernetesAppsEntityType), - endpoint: endpointDefinition, - }; - kubeEntityCatalog.app = new StratosCatalogEntity(definition, { - actionBuilders: kubeAppActionBuilders - }); - return kubeEntityCatalog.app; -} - function generateStatefulSetsEntity(endpointDefinition: StratosEndpointExtensionDefinition) { const definition: IStratosEntityDefinition = { type: kubernetesStatefulSetsEntityType, diff --git a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts index 51f1bc53c9..58ad75827c 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/action-builders/kube.action-builders.ts @@ -20,13 +20,6 @@ import { KubeHealthCheck, } from '../kubernetes.actions'; -export interface KubeAppActionBuilders extends OrchestratedActionBuilders { - -} - -export const kubeAppActionBuilders: KubeAppActionBuilders = { -} - export interface KubeStatefulSetsActionBuilders extends OrchestratedActionBuilders { getMultiple: ( kubeGuid: string, diff --git a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts index 6639f6f509..ef66c673df 100644 --- a/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts +++ b/custom-src/frontend/app/custom/kubernetes/store/kube.getIds.ts @@ -1,4 +1,4 @@ -import { environment } from '../../../environments/environment.prod'; +import { environment } from '../../../environments/environment'; import { BasicKubeAPIResource, KubernetesDeployment, diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts index fe9ca2f1e3..846848fc7a 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts @@ -36,7 +36,6 @@ export class KubernetesNamespacesFilterService implements OnDestroy { public kube: KubernetesNamespacesFilterItem; public namespace: KubernetesNamespacesFilterItem; - // private isLoading$: Observable; private subs: Subscription[] = []; private allNamespaces = this.getNamespacesObservable(); @@ -50,7 +49,7 @@ export class KubernetesNamespacesFilterService implements OnDestroy { this.kube = this.createKube(); this.namespace = this.createNamespace(); - // Start watching the cf/org/space plus automatically setting values only when we actually have values to auto select + // Start watching the namespace plus automatically setting values only when we actually have values to auto select this.namespace.list$.pipe(first()).subscribe(() => this.setupAutoSelectors()); } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts index 7f8e317b9a..3c62493c90 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts @@ -104,11 +104,7 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { prefix = messageObj.data; } else if (messageObj.kind === 'Pods') { const pods: KubernetesPod[] = messageObj.data || []; - const podsWithInfo: KubernetesPod[] = pods.map(pod => { - const res = KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod); - res.metadata.kubeId = this.helmReleaseHelper.endpointGuid; - return res; - }); + const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod)); const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload( this.helmReleaseHelper.endpointGuid, this.helmReleaseHelper.releaseTitle @@ -127,7 +123,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { // Store ALL resources for the release manifest.forEach(resource => { if (resource.kind === 'Service' && prefix) { - resource.metadata.kubeId = this.helmReleaseHelper.endpointGuid; svcs.push(resource); } }); @@ -170,7 +165,6 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { private populateList(action: KubePaginationAction, resources: any) { const entity = entityCatalog.getEntity(action); - const entityKey = entity.entityKey; const newResources = {}; resources.forEach(resource => { const newResource: HelmReleasePod | HelmReleaseService = { @@ -179,12 +173,14 @@ export class HelmReleaseTabBaseComponent implements OnDestroy { ...resource }; newResource.metadata.kubeId = action.kubeGuid; - const entityId = entity.getSchema(action.schemaKey).getId(resource) + // The service entity from manifest is missing this, but apply here to ensure any others are caught + newResource.metadata.namespace = this.helmReleaseHelper.namespace; + const entityId = action.entity[0].getId(resource) newResources[entityId] = newResource; }); const releasePods = { - entities: { [entityKey]: newResources }, + entities: { [entity.entityKey]: newResources }, result: Object.keys(newResources) }; const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1); diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts index 0f193ea044..bcdef4478b 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts @@ -71,11 +71,10 @@ export class HelmReleaseHelperService { public fetchReleaseResources(): Observable { // Get helm release - return workloadsEntityCatalog.resource.store.getPaginationMonitor( - this.endpointGuid, - null, - { releaseTitle: this.releaseTitle } - ).currentPage$.pipe( + const action = workloadsEntityCatalog.resource.actions.get(this.releaseTitle, this.endpointGuid) + return workloadsEntityCatalog.resource.store.getEntityMonitor( + action.guid + ).entity$.pipe( filter(resources => !!resources) ); } diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts index ba37ba0821..06d3a33c04 100644 --- a/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts +++ b/custom-src/frontend/app/custom/kubernetes/workloads/workloads-entity-catalog.ts @@ -4,7 +4,7 @@ import { WorkloadGraphBuilders, WorkloadReleaseBuilders, WorkloadResourceBuilder import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from './workload.types'; /** - * A strongly typed collection of Kube Catalog Entities. + * A strongly typed collection of Workload Catalog Entities. * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc */ export class WorkloadsEntityCatalog { @@ -14,7 +14,7 @@ export class WorkloadsEntityCatalog { } /** - * A strongly typed collection of Kube Catalog Entities. + * A strongly typed collection of Workload Catalog Entities. * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc */ export const workloadsEntityCatalog: WorkloadsEntityCatalog = new WorkloadsEntityCatalog(); diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html index f11198e59d..b86b52acc0 100644 --- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html +++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html @@ -14,6 +14,8 @@

Backup Endpoints

+