Skip to content

Commit 6ecd4a9

Browse files
spadgettspadgett
authored
Merge pull request #442 from spadgett/remove-alpha-prefix
Bug 1492991 - Remove alpha prefix from service catalog properties
2 parents 6a5ca29 + 2bc3b09 commit 6ecd4a9

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎app/mockServices/mockData/services.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const servicesData = {
77
},
88
bindable: true,
99
description: 'BUILDS SOURCE CODE',
10-
alphaTags: ['java', 'nodejs'],
10+
tags: ['java', 'nodejs'],
1111
externalMetadata: {
1212
displayName: 'Test ServiceClass Java-Node.js',
1313
longDescription: 'Build and run Java applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -72,7 +72,7 @@ export const servicesData = {
7272
},
7373
bindable: true,
7474
description: 'BUILDS SOURCE CODE',
75-
alphaTags: ['nodejs'],
75+
tags: ['nodejs'],
7676
externalMetadata: {
7777
displayName: 'Test ServiceClass Node.js',
7878
longDescription: 'run nodejs applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -90,7 +90,7 @@ export const servicesData = {
9090
},
9191
bindable: true,
9292
description: 'BUILDS SOURCE CODE',
93-
alphaTags: ['perl'],
93+
tags: ['perl'],
9494
externalMetadata: {
9595
displayName: 'Test ServiceClass Perl',
9696
longDescription: 'run Perl applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -108,7 +108,7 @@ export const servicesData = {
108108
},
109109
bindable: true,
110110
description: 'BUILDS SOURCE CODE',
111-
alphaTags: ['ruby', 'mongodb'],
111+
tags: ['ruby', 'mongodb'],
112112
externalMetadata: {
113113
displayName: 'Test ServiceClass Ruby-Mongo',
114114
longDescription: 'run ruby applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -126,7 +126,7 @@ export const servicesData = {
126126
},
127127
bindable: true,
128128
description: 'BUILDS SOURCE CODE',
129-
alphaTags: ['php'],
129+
tags: ['php'],
130130
externalMetadata: {
131131
displayName: 'Test ServiceClass PHP',
132132
longDescription: 'run PHP applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -144,7 +144,7 @@ export const servicesData = {
144144
},
145145
bindable: true,
146146
description: 'BUILDS SOURCE CODE',
147-
alphaTags: ['mongodb'],
147+
tags: ['mongodb'],
148148
externalMetadata: {
149149
displayName: 'Test ServiceClass MongoDB',
150150
longDescription: 'run MongoDB applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -162,7 +162,7 @@ export const servicesData = {
162162
},
163163
bindable: true,
164164
description: 'BUILDS SOURCE CODE',
165-
alphaTags: ['mysql'],
165+
tags: ['mysql'],
166166
externalMetadata: {
167167
displayName: 'Test ServiceClass mySQL',
168168
longDescription: 'run MongoDB applications. For more information about using this builder image, including OpenShift considerations, see https://github.com/openshift-s2i/s2i-wildfly/blob/mast…',
@@ -180,7 +180,7 @@ export const servicesData = {
180180
},
181181
bindable: true,
182182
description: 'BUILDS SOURCE CODE',
183-
alphaTags: ['fooBar'],
183+
tags: ['fooBar'],
184184
externalMetadata: {
185185
displayName: 'Test ServiceClass Other',
186186
longDescription: 'some other service',
@@ -198,7 +198,7 @@ export const servicesData = {
198198
},
199199
bindable: true,
200200
description: 'BUILDS SOURCE CODE',
201-
alphaTags: ['jenkins'],
201+
tags: ['jenkins'],
202202
externalMetadata: {
203203
displayName: 'Test ServiceClass jenkins',
204204
longDescription: 'some other service',
@@ -216,7 +216,7 @@ export const servicesData = {
216216
},
217217
bindable: true,
218218
description: 'TEST APB SERVICE',
219-
alphaTags: ['databases', 'postgresql'],
219+
tags: ['databases', 'postgresql'],
220220
externalMetadata: {
221221
displayName: 'Test ServiceClass PostgreSQL DB APB',
222222
longDescription: 'A sample APB which deploys a PostgreSQL Database',
@@ -271,7 +271,7 @@ export const servicesData = {
271271
}
272272
}
273273
},
274-
alphaInstanceCreateParameterSchema: {
274+
instanceCreateParameterSchema: {
275275
"$schema": "http://json-schema.org/draft-04/schema",
276276
additionalProperties: false,
277277
properties: {
@@ -298,7 +298,7 @@ export const servicesData = {
298298
],
299299
type: "object"
300300
},
301-
alphaServiceInstanceCredentialCreateParameterSchema: {
301+
serviceInstanceCredentialCreateParameterSchema: {
302302
"$schema": "http://json-schema.org/draft-04/schema",
303303
additionalProperties: false,
304304
properties: {

‎dist/origin-web-catalogs.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
55
}, function(e, t) {
66
e.exports = $;
77
}, function(e, t) {}, function(e, t) {
8-
e.exports = '<a href="" class="catalog-search-match" ng-class="{\'no-matches\': match.model.id === \'viewNone\'}">\n <span class="catalog-search-match-icon" ng-if="match.model.id !== \'viewAll\' && match.model.id !== \'viewNone\'">\n <span ng-if="match.model.imageUrl"><img ng-src="{{match.model.imageUrl}}"></span>\n <span ng-if="!match.model.imageUrl && match.model.iconClass" ng-class="match.model.iconClass" class="icon"></span>\n </span>\n <div class="catalog-search-match-info" ng-if="match.model.id !== \'viewAll\' && match.model.id !== \'viewNone\'">\n <div class="catalog-search-match-label">\n {{match.label}}\n </div>\n <div class="catalog-search-match-description">\n <span ng-repeat="tag in (match.model.tags || match.model.resource.alphaTags)" class="tag small text-muted">\n {{tag}}\n </span>\n </div>\n </div>\n <span ng-if="match.model.id === \'viewNone\'" class="catalog-search-show-none">\n {{match.model.text}}\n </span>\n <span ng-if="match.model.id === \'viewAll\'" class="catalog-search-show-all">\n {{match.model.text}} <span class="fa fa-angle-right"></span>\n </span>\n</a>\n';
8+
e.exports = '<a href="" class="catalog-search-match" ng-class="{\'no-matches\': match.model.id === \'viewNone\'}">\n <span class="catalog-search-match-icon" ng-if="match.model.id !== \'viewAll\' && match.model.id !== \'viewNone\'">\n <span ng-if="match.model.imageUrl"><img ng-src="{{match.model.imageUrl}}"></span>\n <span ng-if="!match.model.imageUrl && match.model.iconClass" ng-class="match.model.iconClass" class="icon"></span>\n </span>\n <div class="catalog-search-match-info" ng-if="match.model.id !== \'viewAll\' && match.model.id !== \'viewNone\'">\n <div class="catalog-search-match-label">\n {{match.label}}\n </div>\n <div class="catalog-search-match-description">\n <span ng-repeat="tag in (match.model.tags || match.model.resource.tags)" class="tag small text-muted">\n {{tag}}\n </span>\n </div>\n </div>\n <span ng-if="match.model.id === \'viewNone\'" class="catalog-search-show-none">\n {{match.model.text}}\n </span>\n <span ng-if="match.model.id === \'viewAll\'" class="catalog-search-show-all">\n {{match.model.text}} <span class="fa fa-angle-right"></span>\n </span>\n</a>\n';
99
}, function(e, t) {
1010
e.exports = '<bind-application-form application-name="$ctrl.name"\n form-name="$ctrl.bindForm"\n allow-no-binding="true"\n service-instances="$ctrl.serviceInstances"\n service-classes="$ctrl.serviceClasses"\n service-to-bind="$ctrl.serviceToBind">\n</bind-application-form>\n';
1111
}, function(e, t) {
@@ -805,7 +805,7 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
805805
}, e.prototype.getLongDescription = function() {
806806
return i.get(this.resource, "externalMetadata.longDescription") || "";
807807
}, e.prototype.getTags = function() {
808-
return i.get(this.resource, "alphaTags") || [];
808+
return i.get(this.resource, "tags") || [];
809809
}, e.prototype.getVendor = function() {
810810
var e = i.get(this.resource, "externalMetadata.providerDisplayName");
811811
return this.catalogSrv.getPublisherSynonym(e);
@@ -1496,11 +1496,11 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
14961496
this.bindParametersStep.hidden = this.bindStep.hidden || "none" === this.ctrl.bindType || !i.has(this.ctrl, "bindParameterSchema.properties"),
14971497
this.bindParametersStep.allowed = this.bindStep.valid;
14981498
}, e.prototype.updateParameterSchema = function(t) {
1499-
var r = i.get(t, "alphaInstanceCreateParameterSchema");
1499+
var r = i.get(t, "instanceCreateParameterSchema");
15001500
i.has(r, [ "properties", e.REQUESTER_USERNAME_PARAM_NAME ]) ? (r = n.copy(r), delete r.properties[e.REQUESTER_USERNAME_PARAM_NAME],
15011501
this.sendRequesterUsername = !0) : this.sendRequesterUsername = !1, this.ctrl.parameterSchema = r,
15021502
this.ctrl.parameterFormDefinition = i.get(this, "ctrl.selectedPlan.externalMetadata.schemas.service_instance.create.openshift_form_definition"),
1503-
this.ctrl.bindParameterSchema = i.get(t, "alphaServiceInstanceCredentialCreateParameterSchema");
1503+
this.ctrl.bindParameterSchema = i.get(t, "serviceInstanceCredentialCreateParameterSchema");
15041504
}, e.prototype.getParameters = function() {
15051505
var t = i.omitBy(this.ctrl.parameterData, function(e) {
15061506
return "" === e;

‎src/components/catalog-search/catalog-search-result.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{match.label}}
99
</div>
1010
<div class="catalog-search-match-description">
11-
<span ng-repeat="tag in (match.model.tags || match.model.resource.alphaTags)" class="tag small text-muted">
11+
<span ng-repeat="tag in (match.model.tags || match.model.resource.tags)" class="tag small text-muted">
1212
{{tag}}
1313
</span>
1414
</div>

‎src/components/order-service/order-service.controller.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ export class OrderServiceController implements angular.IController {
372372
};
373373

374374
private updateParameterSchema(plan: any) {
375-
let schema: any = _.get(plan, 'alphaInstanceCreateParameterSchema');
375+
let schema: any = _.get(plan, 'instanceCreateParameterSchema');
376376
if (_.has(schema, ['properties', OrderServiceController.REQUESTER_USERNAME_PARAM_NAME])) {
377377
schema = angular.copy(schema);
378378
delete schema.properties[OrderServiceController.REQUESTER_USERNAME_PARAM_NAME];
@@ -383,7 +383,7 @@ export class OrderServiceController implements angular.IController {
383383
this.ctrl.parameterSchema = schema;
384384
this.ctrl.parameterFormDefinition = _.get(this, 'ctrl.selectedPlan.externalMetadata.schemas.service_instance.create.openshift_form_definition');
385385

386-
this.ctrl.bindParameterSchema = _.get(plan, 'alphaServiceInstanceCredentialCreateParameterSchema');
386+
this.ctrl.bindParameterSchema = _.get(plan, 'serviceInstanceCredentialCreateParameterSchema');
387387
}
388388

389389
private onProjectUpdate = () => {

‎src/services/catalog.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ export class ServiceItem implements IServiceItem {
363363
}
364364

365365
private getTags(): string[] {
366-
return _.get(this.resource, 'alphaTags') as string[] || [];
366+
return _.get(this.resource, 'tags') as string[] || [];
367367
}
368368

369369
private getVendor(): string {

‎test/services-view.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ describe('servicesView', () => {
153153
"name": "mycat-database",
154154
"uid": "10",
155155
},
156-
alphaTags: [
156+
tags: [
157157
"mycat",
158158
"database"
159159
]
@@ -164,7 +164,7 @@ describe('servicesView', () => {
164164
"name": "mycat-other",
165165
"uid": "11",
166166
},
167-
alphaTags: [
167+
tags: [
168168
"mycat",
169169
"foobar"
170170
]
@@ -214,7 +214,7 @@ describe('servicesView', () => {
214214
"name": "mycat-database",
215215
"uid": "10",
216216
},
217-
alphaTags: [
217+
tags: [
218218
"mycata",
219219
"mycatb",
220220
"database"

0 commit comments

Comments
 (0)