Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Blitz - Add table view to marketplace service table #4064

Merged
merged 47 commits into from
Jan 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
c6a507e
Follow redirect - needed for repo move
nwmac Oct 31, 2019
173df4b
Update metric used for cells (#4009)
richard-cox Nov 7, 2019
7a2bfc6
Fix incorrect SSO behaviour following 2.4.0 --> 2.6.0 upgrade (#4015)
richard-cox Nov 8, 2019
110b721
2.6.1 Release preparation
nwmac Nov 25, 2019
b9e8bef
Merge pull request #4020 from cloudfoundry/release-261
richard-cox Nov 25, 2019
d499609
Ingress fix (#4024)
nwmac Nov 28, 2019
ab90987
Show more service instance last operation details
richard-cox Dec 2, 2019
ce42b8d
Show service instance service broker
richard-cox Dec 2, 2019
0d8129c
Handle last operation & broker in table view
richard-cox Dec 2, 2019
b38d075
Show the service broker name in the service list service card
richard-cox Dec 2, 2019
b38a8dd
Mention STRATOS_BP_DEBUG to troubleshoot staging (#4039)
gberche-orange Dec 4, 2019
70238bb
Merge pull request #4041 from cloudfoundry/v2-buildpack-verbose-logging
richard-cox Dec 4, 2019
707a547
Backend changs to support long-running requests
nwmac Dec 4, 2019
cdc401e
Fix create service instance from service instance page
richard-cox Dec 4, 2019
24a0130
Fix unit tests
richard-cox Dec 4, 2019
b7415c8
Merge remote-tracking branch 'origin/long-running-support' into fix-l…
richard-cox Dec 4, 2019
4713b9f
Ensure service plans are sorted by display name
richard-cox Dec 4, 2019
a404126
Fix helm chart issue with semver (#4046)
nwmac Dec 5, 2019
f875131
Handle Long Running Service Instance Operations
richard-cox Dec 5, 2019
0c17c6f
Merge pull request #4043 from cloudfoundry/long-running-support
richard-cox Dec 5, 2019
3a83422
Merge remote-tracking branch 'origin/v2-master' into merge-v2-master
richard-cox Dec 5, 2019
abeebbc
Merge remote-tracking branch 'origin/v2-master' into fix-long-running…
richard-cox Dec 5, 2019
bb923ae
Merge remote-tracking branch 'origin/fix-long-running-service-actions…
richard-cox Dec 5, 2019
87ec4b6
Fixes post merge
richard-cox Dec 5, 2019
94ddb22
Changes and tidy up post review
richard-cox Dec 6, 2019
8b7b1c7
Merge remote-tracking branch 'origin/fix-long-running-service-actions…
richard-cox Dec 9, 2019
c034acf
Fixes post merge
richard-cox Dec 9, 2019
43a3bcd
Fix failing unit tests
richard-cox Dec 9, 2019
56cf03d
Improvements to error/notification process
richard-cox Dec 9, 2019
5032621
Merge remote-tracking branch 'origin/error-notification-improvements'…
richard-cox Dec 9, 2019
4ab831c
Treat calls to multiple endpoints as `global`
richard-cox Dec 9, 2019
c178206
Merge remote-tracking branch 'origin/error-notification-improvements'…
richard-cox Dec 9, 2019
d51801d
More fixes
richard-cox Dec 9, 2019
f37e0ba
Merge remote-tracking branch 'origin/fix-long-running-service-actions…
richard-cox Dec 11, 2019
f2aef89
Merge remote-tracking branch 'origin/master' into merge-v2-master
richard-cox Dec 11, 2019
f73253d
Fix failing e2e test
richard-cox Dec 12, 2019
1038247
Add table view to marketplace service table
richard-cox Dec 12, 2019
9861efd
Show last operation and service broker info for service instances (#4…
richard-cox Dec 13, 2019
92d6f23
Merge remote-tracking branch 'origin/v2-master' into fix-long-running…
richard-cox Dec 13, 2019
a735f53
Fix unit tests
richard-cox Dec 13, 2019
5ae7fb6
Merge remote-tracking branch 'origin/master' into blitz-services-table
richard-cox Dec 13, 2019
6c12d25
Fix bad merge
richard-cox Dec 13, 2019
cba8480
Merge remote-tracking branch 'origin/fix-long-running-service-actions…
richard-cox Dec 18, 2019
9d51009
Fix unit tests
richard-cox Dec 18, 2019
f909921
Fix e2e tests
richard-cox Dec 18, 2019
55313b1
Merge remote-tracking branch 'origin/master' into blitz-services-table
richard-cox Jan 6, 2020
866dbb5
Fix removal of `cf` column when there's only one connected cf
richard-cox Jan 6, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
import { CustomImportModule } from '../../../../../core/src/custom-import.module';
import { TabNavService } from '../../../../../core/tab-nav.service';
import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ import {
import {
CloudFoundryQuotasComponent,
} from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
import { EndpointListHelper } from '../../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
import {
EndpointsListConfigService,
} from '../../../../core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service';
import { SharedModule } from '../../../../core/src/shared/shared.module';
import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,21 @@ import {
CreateApplicationStep1Component,
} from '../../create-application/create-application-step1/create-application-step1.component';
import { CfServiceCardComponent } from '../../list/list-types/cf-services/cf-service-card/cf-service-card.component';
import {
TableCellServiceActiveComponent,
} from '../../list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component';
import {
TableCellServiceBindableComponent,
} from '../../list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
import {
TableCellServiceCfBreadcrumbsComponent,
} from '../../list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
import {
TableCellServiceReferencesComponent,
} from '../../list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component';
import {
TableCellServiceTagsComponent,
} from '../../list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component';
import { SchemaFormComponent } from '../../schema-form/schema-form.component';
import { SelectServiceComponent } from '../../select-service/select-service.component';
import { ServiceIconComponent } from '../../service-icon/service-icon.component';
Expand Down Expand Up @@ -99,7 +114,12 @@ describe('AddServiceInstanceComponent', () => {
ServicePlanPublicComponent,
ServicePlanPriceComponent,
FocusDirective,
SpecifyUserProvidedDetailsComponent
SpecifyUserProvidedDetailsComponent,
TableCellServiceActiveComponent,
TableCellServiceBindableComponent,
TableCellServiceReferencesComponent,
TableCellServiceCfBreadcrumbsComponent,
TableCellServiceTagsComponent
],
imports: [
...generateCfBaseTestModulesNoShared(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// tslint:disable:max-line-length
import { CommonModule } from '@angular/common';
import { ApplicationModule, NgModule } from '@angular/core';
import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
Expand Down Expand Up @@ -108,6 +107,24 @@ import {
CfSecurityGroupsCardComponent,
} from './list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component';
import { CfServiceCardComponent } from './list/list-types/cf-services/cf-service-card/cf-service-card.component';
import {
TableCellServiceActiveComponent,
} from './list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component';
import {
TableCellServiceBindableComponent,
} from './list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
import {
TableCellServiceCfBreadcrumbsComponent,
} from './list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
import {
TableCellServiceProviderComponent,
} from './list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component';
import {
TableCellServiceReferencesComponent,
} from './list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component';
import {
TableCellServiceTagsComponent,
} from './list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component';
import {
TableCellServiceInstanceAppsAttachedComponent,
} from './list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component';
Expand Down Expand Up @@ -159,6 +176,7 @@ import { ServiceIconComponent } from './service-icon/service-icon.component';
import { ServicePlanPriceComponent } from './service-plan-price/service-plan-price.component';
import { ServicePlanPublicComponent } from './service-plan-public/service-plan-public.component';

// tslint:disable:max-line-length
// tslint:enable:max-line-length

@NgModule({
Expand Down Expand Up @@ -250,7 +268,13 @@ import { ServicePlanPublicComponent } from './service-plan-public/service-plan-p
TableCellUsageComponent,
TableCellQuotaComponent,
TableCellServiceComponent,
TableCellServiceLastOpComponent
TableCellServiceLastOpComponent,
TableCellServiceTagsComponent,
TableCellServiceCfBreadcrumbsComponent,
TableCellServiceProviderComponent,
TableCellServiceBindableComponent,
TableCellServiceActiveComponent,
TableCellServiceReferencesComponent
],
exports: [
ServiceIconComponent,
Expand Down Expand Up @@ -336,6 +360,13 @@ import { ServicePlanPublicComponent } from './service-plan-public/service-plan-p
TableCellUsageComponent,
TableCellQuotaComponent,
TableCellServiceComponent,
TableCellServiceLastOpComponent,
TableCellServiceTagsComponent,
TableCellServiceCfBreadcrumbsComponent,
TableCellServiceProviderComponent,
TableCellServiceBindableComponent,
TableCellServiceActiveComponent,
TableCellServiceReferencesComponent,
TableCellServiceLastOpComponent
]
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,35 +27,20 @@
<app-meta-card-item>
<app-meta-card-key>Active</app-meta-card-key>
<app-meta-card-value>
<app-boolean-indicator [isTrue]="serviceEntity.entity.active" type="yes-no">
</app-boolean-indicator>
<app-table-cell-service-active [row]="serviceEntity"></app-table-cell-service-active>
</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item>
<app-meta-card-key>Bindable</app-meta-card-key>
<app-meta-card-value>
<app-boolean-indicator [isTrue]="serviceEntity.entity.bindable" type="yes-no">
</app-boolean-indicator>
<app-table-cell-service-bindable [row]="serviceEntity"></app-table-cell-service-bindable>
</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item>
<app-meta-card-key>References</app-meta-card-key>
<app-meta-card-value>
<div class="service-card__links">
<div class="service-card__link" *ngIf="hasDocumentationUrl()">
<a class="service-card__icon-link" [href]="getDocumentationUrl()" target="_blank" appClickStopPropagation>
<mat-icon>launch</mat-icon>
</a>
<a [href]="getDocumentationUrl()" target="_blank" appClickStopPropagation>Docs</a>
</div>
<div class="service-card__link" *ngIf="hasSupportUrl()">
<a class="service-card__icon-link" [href]="getSupportUrl()" target="_blank" appClickStopPropagation>
<mat-icon>launch</mat-icon>
</a>
<a [href]="getSupportUrl()" target="_blank" appClickStopPropagation>Support</a>
</div>
</div>
<div *ngIf="!hasDocumentationUrl() && !hasSupportUrl()">-</div>
<app-table-cell-service-references [row]="serviceEntity">
</app-table-cell-service-references>
</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item *ngIf="extraInfo?.providerDisplayName">
Expand All @@ -65,14 +50,13 @@
<app-meta-card-item *ngIf="cfOrgSpace.multipleConnectedEndpoints$ | async">
<app-meta-card-key>CF Endpoint</app-meta-card-key>
<app-meta-card-value>
<app-cf-org-space-links [service]="cfOrgSpace" [spaceBreadCrumbs]="getSpaceBreadcrumbs()">
</app-cf-org-space-links>
<app-table-cell-service-cf-breadcrumbs [row]="serviceEntity"></app-table-cell-service-cf-breadcrumbs>
</app-meta-card-value>
</app-meta-card-item>
<app-meta-card-item customStyle="column">
<app-meta-card-key>Tags</app-meta-card-key>
<app-meta-card-value>
<app-chips [chips]="tags"></app-chips>
<app-table-cell-service-tags [row]="serviceEntity"></app-table-cell-service-tags>
</app-meta-card-value>
</app-meta-card-item>
</app-meta-card>
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,6 @@
justify-content: space-between;
width: 100%;
}
&__links {
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
}
&__link {
display: flex;
flex-direction: row;
justify-content: center;
&:not(:first-child) {
margin-left: 6px;
}
mat-icon {
font-size: 16px;
height: 16px;
margin-right: 2px;
text-decoration: none;
width: 16px;
&:focus,
&:active {
text-decoration: none;
}
}
}
&__icon-link {
align-items: center;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ import {
} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
import { CfOrgSpaceLinksComponent } from '../../../../cf-org-space-links/cf-org-space-links.component';
import { ServiceIconComponent } from '../../../../service-icon/service-icon.component';
import { TableCellServiceActiveComponent } from '../table-cell-service-active/table-cell-service-active.component';
import { TableCellServiceBindableComponent } from '../table-cell-service-bindable/table-cell-service-bindable.component';
import {
TableCellServiceCfBreadcrumbsComponent,
} from '../table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
import {
TableCellServiceReferencesComponent,
} from '../table-cell-service-references/table-cell-service-references.component';
import { TableCellServiceTagsComponent } from '../table-cell-service-tags/table-cell-service-tags.component';
import { CfServiceCardComponent } from './cf-service-card.component';

describe('CfServiceCardComponent', () => {
Expand All @@ -25,7 +34,12 @@ describe('CfServiceCardComponent', () => {
MetadataCardTestComponents,
BooleanIndicatorComponent,
AppChipsComponent,
ServiceIconComponent
ServiceIconComponent,
TableCellServiceActiveComponent,
TableCellServiceBindableComponent,
TableCellServiceReferencesComponent,
TableCellServiceCfBreadcrumbsComponent,
TableCellServiceTagsComponent
],
imports: generateCfBaseTestModulesNoShared(),
providers: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Input } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable, of as observableOf } from 'rxjs';
import { Observable } from 'rxjs';

import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
import { IService, IServiceExtra } from '../../../../../../../../core/src/core/cf-api-svc.types';
Expand Down Expand Up @@ -41,12 +41,6 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
this.extraInfo = JSON.parse(this.serviceEntity.entity.extra);
} catch { }
}
this.serviceEntity.entity.tags.forEach(t => {
this.tags.push({
value: t,
hideClearButton$: observableOf(true)
});
});

if (!this.cfOrgSpace) {
this.cfOrgSpace = new CfOrgSpaceLabelService(this.store, this.serviceEntity.entity.cfGuid);
Expand All @@ -73,23 +67,6 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
return getServiceName(this.serviceEntity);
}

hasDocumentationUrl() {
return !!(this.getDocumentationUrl());
}
getDocumentationUrl() {
return this.extraInfo && this.extraInfo.documentationUrl;
}

hasSupportUrl() {
return !!(this.getSupportUrl());
}

getSupportUrl() {
return this.extraInfo && this.extraInfo.supportUrl;
}

getSpaceBreadcrumbs = () => ({ breadcrumbs: 'services-wall' });

goToServiceInstances = () =>
this.store.dispatch(new RouterNav({
path: ['marketplace', this.serviceEntity.entity.cfGuid, this.serviceEntity.metadata.guid]
Expand Down
Loading