diff --git a/app/mockServices/mockData/openshift-images.ts b/app/mockServices/mockData/openshift-images.ts index 68a97d6d..f01ceb2e 100644 --- a/app/mockServices/mockData/openshift-images.ts +++ b/app/mockServices/mockData/openshift-images.ts @@ -2,15 +2,15 @@ export const imagesData = { 'jenkins': { 'metadata': { 'name': 'jenkins', - 'namespace': 'openshift', - 'selfLink': '/oapi/v1/namespaces/openshift/imagestreams/jenkins', - 'uid': 'jenkins', - 'resourceVersion': '658', - 'generation': 2, - 'creationTimestamp': '2017-03-15T15:46:25Z', - 'annotations': { - 'openshift.io/display-name': 'Jenkins', - 'openshift.io/image.dockerRepositoryCheck': '2017-03-15T15:46:49Z' + 'namespace': 'openshift', + 'selfLink': '/oapi/v1/namespaces/openshift/imagestreams/jenkins', + 'uid': 'jenkins', + 'resourceVersion': '658', + 'generation': 2, + 'creationTimestamp': '2017-03-15T15:46:25Z', + 'annotations': { + 'openshift.io/display-name': 'Jenkins', + 'openshift.io/image.dockerRepositoryCheck': '2017-03-15T15:46:49Z' } }, 'spec': { @@ -424,17 +424,20 @@ export const imagesData = { 'apiVersion': 'v1' }, 'nodejs': { - 'metadata': { + 'metadata': { 'name': 'nodejs', - 'namespace': 'openshift', - 'selfLink': '/oapi/v1/namespaces/openshift/imagestreams/nodejs', - 'uid': 'nodejs', - 'resourceVersion': '594', - 'generation': 2, - 'creationTimestamp': '2017-03-15T15:46:24Z', - 'annotations': { - 'openshift.io/display-name': 'Node.js', - 'openshift.io/image.dockerRepositoryCheck': '2017-03-15T15:46:36Z' + 'namespace': 'openshift', + 'selfLink': '/oapi/v1/namespaces/openshift/imagestreams/nodejs', + 'uid': 'nodejs', + 'resourceVersion': '594', + 'generation': 2, + 'creationTimestamp': '2017-03-15T15:46:24Z', + 'annotations': { + 'openshift.io/display-name': 'Node.js', + 'openshift.io/provider-display-name': 'Red Hat, Inc.', + 'openshift.io/documentation-url': 'https://nodejs.org/en/docs/', + 'openshift.io/support-url': 'https://access.redhat.com', + 'openshift.io/image.dockerRepositoryCheck': '2017-03-15T15:46:36Z' } }, 'spec': { diff --git a/dist/origin-web-catalogs.js b/dist/origin-web-catalogs.js index 98d480b2..b39a98d7 100644 --- a/dist/origin-web-catalogs.js +++ b/dist/origin-web-catalogs.js @@ -11,7 +11,7 @@ webpackJsonp([ 0, 1 ], [ function(e, t) { }, function(e, t) { e.exports = '
\n
\n
\n
\n \n \n \n {{$select.selected.name}}\n \n \n {{tag.name}}\n \n — {{otherTag}},\n \n \n \n
\n \n
\n \n
\n \n \x3c!-- Wait until users leave the field to avoid flashing errors as they type. --\x3e\n
\n
\n \n Application name is required.\n \n
\n
\n \n Application name consists of lower-case letters, numbers, and dashes. It must start with a letter and can\'t end with a -.\n \n
\n
\n \n Application name must be at least 2 characters.\n \n
\n
\n \n Application name can\'t be more than 24 characters.\n \n
\n
\n
\n
\n\n
\n \n
\n \n
\n Try Sample Repository\n \n
\n
\n \n Git repository is required.\n \n
\n
\n \n This might not be a valid Git URL. Check that it is the correct URL to a remote Git repository.\n \n
\n
\n
\n\n \x3c!--\n Only show the link for existing projects. It will be broken for new\n projects. Use class `invisible` when the project list is still loading\n so the dialog doesn\'t resize.\n --\x3e\n
\n If you have a private Git repository or need to change application defaults, view\n advanced options.\n
\n
\n
\n
\n'; }, function(e, t) { - e.exports = '
\n
\n
\n \n \n
\n
\n
\n {{$ctrl.imageStream.name}}\n {{$ctrl.istag.name}}\n
\n
\n \n {{tag}}\n \n
\n
\n
\n
\n

\n

\n Sample Repository:\n \x3c!-- TODO: Use Git link filter, needs to be added to origin-web-common --\x3e\n \n

\n
\n
\n'; + e.exports = '
\n
\n
\n \n \n
\n
\n
\n {{$ctrl.imageStream.name}}\n {{$ctrl.istag.name}}\n
\n
\n {{$ctrl.imageStream.vendor}}\n
\n
\n \n {{tag}}\n \n
\n \n
\n
\n
\n

\n

\n Sample Repository:\n \x3c!-- TODO: Use Git link filter, needs to be added to origin-web-common --\x3e\n \n

\n
\n
\n'; }, function(e, t) { e.exports = '
\n
\n
\n \n Pending\n
\n

\n {{$ctrl.name}} is being created in {{$ctrl.selectedProject | displayName}}.\n

\n
\n
\n
\n
\n
\n \n Success\n
\n

\n {{$ctrl.name}} has been created in {{$ctrl.selectedProject | displayName}} successfully.\n

\n
\n
\n
\n
\n \n \n
\n
\n

\n Continue to the project overview to check the status of your application as it builds and deploys.\n

\n
\n
\n
\n \n
\n

\n {{$ctrl.name}} failed to create in {{$ctrl.selectedProject | displayName}}.\n

\n
\n
\n
\n \n {{$ctrl.error.data.message | upperFirst}}\n \n \n An error occurred creating the application.\n \n
\n \x3c!-- TODO: Improve error message presentation --\x3e\n \n
\n
\n'; }, function(e, t) { @@ -21,7 +21,7 @@ webpackJsonp([ 0, 1 ], [ function(e, t) { }, function(e, t) { e.exports = '
\n
\n
\n \n \n \n \n
\n {{$ctrl.error}}\n
\n
\n
\n'; }, function(e, t) { - e.exports = '
\n
\n
\n \n \n
\n
\n
\n {{$ctrl.serviceName}}\n
\n
\n {{$ctrl.serviceClass.vendor}}\n
\n
\n \n {{tag}}\n \n
\n \n
\n
\n
\n

\n \n Plan {{$ctrl.selectedPlan.spec.externalMetadata.displayName}}\n –\n \n {{$ctrl.selectedPlan.spec.description}}\n

\n

No description provided.

\n

\n

\n
\n
\n'; + e.exports = '
\n
\n
\n \n \n
\n
\n
\n {{$ctrl.serviceName}}\n
\n
\n {{$ctrl.serviceClass.vendor}}\n
\n
\n \n {{tag}}\n \n
\n \n
\n
\n
\n

\n \n Plan {{$ctrl.selectedPlan.spec.externalMetadata.displayName}}\n –\n \n {{$ctrl.selectedPlan.spec.description}}\n

\n

No description provided.

\n

\n

\n
\n
\n'; }, function(e, t) { e.exports = '
\n
\n
\n

Select a Plan

\n
\n \n
\n
\n
\n
\n'; }, function(e, t) { @@ -856,7 +856,8 @@ webpackJsonp([ 0, 1 ], [ function(e, t) { var e = this.catalogSrv.$filter("displayName")(this.resource); return e || (e = this.resource.metadata.name), e; }, e.prototype.getVendor = function() { - return ""; + var e = i.get(this.resource, [ "metadata", "annotations", "openshift.io/provider-display-name" ], ""); + return this.catalogSrv.getPublisherSynonym(e); }, e.prototype.getDescription = function() { return null; }, e.prototype.getLongDescription = function() { @@ -882,11 +883,11 @@ webpackJsonp([ 0, 1 ], [ function(e, t) { }, e.prototype.getDescription = function() { return i.get(this.resource, "metadata.annotations.description", ""); }, e.prototype.getLongDescription = function() { - return i.get(this.resource, [ "metadata", "annotations", "template.openshift.io/long-description" ], ""); + return i.get(this.resource, [ "metadata", "annotations", "openshift.io/long-description" ], ""); }, e.prototype.getTags = function() { return i.get(this.resource, "metadata.annotations.tags", "").split(/\s*,\s*/); }, e.prototype.getVendor = function() { - var e = i.get(this.resource, [ "metadata", "annotations", "template.openshift.io/provider-display-name" ]) || ""; + var e = i.get(this.resource, [ "metadata", "annotations", "openshift.io/provider-display-name" ]) || ""; return this.catalogSrv.getPublisherSynonym(e); }, e; }(); @@ -1202,8 +1203,11 @@ webpackJsonp([ 0, 1 ], [ function(e, t) { this.ctrl.versions = this.getVersions(), this.ctrl.istag = i.head(this.ctrl.versions), this.ctrl.nameMaxLength = 24, this.ctrl.namePattern = /^[a-z]([-a-z0-9]*[a-z0-9])?$/, this.ctrl.repositoryPattern = /^[a-z][a-z0-9+.-@]*:(\/\/)?[0-9a-z_-]+/, this.ctrl.wizardDone = !1, - this.ctrl.serviceToBind = null, this.ctrl.updating = !1, this.ctrl.serviceInstances = [], - this.selectedProjectWatch = this.$scope.$watch(function() { + this.ctrl.serviceToBind = null, this.ctrl.updating = !1; + var t = this.$filter("annotation"); + this.ctrl.documentationUrl = t(this.ctrl.imageStream.resource, "openshift.io/documentation-url"), + this.ctrl.supportUrl = t(this.ctrl.imageStream.resource, "openshift.io/support-url"), + this.ctrl.serviceInstances = [], this.selectedProjectWatch = this.$scope.$watch(function() { return e.ctrl.selectedProject; }, this.onProjectUpdate), this.ctrl.showPodPresets ? (this.getServiceClassesAndPlans(), this.instancesSupported = !!this.APIService.apiInfo(this.APIService.getPreferredVersion("serviceinstances"))) : this.instancesSupported = !1; diff --git a/src/components/create-from-builder/create-from-builder-info.html b/src/components/create-from-builder/create-from-builder-info.html index 5b449cba..cb994937 100644 --- a/src/components/create-from-builder/create-from-builder-info.html +++ b/src/components/create-from-builder/create-from-builder-info.html @@ -1,5 +1,5 @@
-
+
@@ -9,11 +9,22 @@ {{$ctrl.imageStream.name}} {{$ctrl.istag.name}}
+
+ {{$ctrl.imageStream.vendor}} +
{{tag}}
+
@@ -21,7 +32,7 @@

Sample Repository: - +

diff --git a/src/components/create-from-builder/create-from-builder.controller.ts b/src/components/create-from-builder/create-from-builder.controller.ts index 18bb246f..797acd87 100644 --- a/src/components/create-from-builder/create-from-builder.controller.ts +++ b/src/components/create-from-builder/create-from-builder.controller.ts @@ -114,6 +114,10 @@ export class CreateFromBuilderController implements angular.IController { this.ctrl.serviceToBind = null; this.ctrl.updating = false; + let annotation = this.$filter('annotation'); + this.ctrl.documentationUrl = annotation(this.ctrl.imageStream.resource, 'openshift.io/documentation-url'); + this.ctrl.supportUrl = annotation(this.ctrl.imageStream.resource, 'openshift.io/support-url'); + this.ctrl.serviceInstances = []; this.selectedProjectWatch = this.$scope.$watch( () => { diff --git a/src/components/order-service/order-service-info.html b/src/components/order-service/order-service-info.html index 585c9984..51d77c6a 100644 --- a/src/components/order-service/order-service-info.html +++ b/src/components/order-service/order-service-info.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/services/catalog.service.ts b/src/services/catalog.service.ts index ba657025..ed8b1dfc 100644 --- a/src/services/catalog.service.ts +++ b/src/services/catalog.service.ts @@ -482,7 +482,8 @@ export class ImageItem implements IServiceItem { } private getVendor(): string { - return ''; + let provider = _.get(this.resource, ['metadata', 'annotations', 'openshift.io/provider-display-name'], ''); + return this.catalogSrv.getPublisherSynonym(provider); } private getDescription() { @@ -542,7 +543,7 @@ export class TemplateItem implements IServiceItem { } private getLongDescription() { - return _.get(this.resource, ['metadata', 'annotations', 'template.openshift.io/long-description'], ''); + return _.get(this.resource, ['metadata', 'annotations', 'openshift.io/long-description'], ''); } private getTags() { @@ -550,7 +551,7 @@ export class TemplateItem implements IServiceItem { } private getVendor(): string { - var rawVendor = _.get(this.resource, ['metadata', 'annotations', 'template.openshift.io/provider-display-name']) as string || ''; + var rawVendor = _.get(this.resource, ['metadata', 'annotations', 'openshift.io/provider-display-name']) as string || ''; return this.catalogSrv.getPublisherSynonym(rawVendor); } } diff --git a/test/services-view.spec.ts b/test/services-view.spec.ts index 91a29d55..9993ac90 100644 --- a/test/services-view.spec.ts +++ b/test/services-view.spec.ts @@ -395,7 +395,7 @@ describe('servicesView', () => { var element = componentTest.rawElement; var vendorFilters = jQuery(element).find('.category-option-label'); - expect(vendorFilters.length).toBe(3); - expect(jQuery(vendorFilters[1]).text()).toBe('Vendor B, Inc.'); + expect(vendorFilters.length).toBe(4); + expect(jQuery(vendorFilters[2]).text()).toBe('Vendor B, Inc.'); }); });