From 1693b7ebc794c7ff17645fa7af9e0b57f21b3f53 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Fri, 2 Sep 2022 11:35:32 +0530 Subject: [PATCH 1/2] conflict resolved for certificate image --- .../pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts b/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts index 5b25cd43a..60e146d3a 100644 --- a/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts +++ b/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts @@ -12,13 +12,16 @@ export class PipeCertificateImageURL implements PipeTransform { const mainUrl = value && value.split('/content').pop() || '' const finalURL = `${environment.contentHost}/${environment.certificateassets}/content${mainUrl}` return value ? finalURL : '' - } else - { + } + else { const mainUrl = value && value.split('/content').pop() || '' // const finalURL = `${environment.contentHost}/${environment.contentBucket}/content${mainUrl}` const finalURL = `${environment.contentHost}/${environment.certificateassets}/content${mainUrl}` return value ? finalURL : '' } + + + } if (value.indexOf('/public/content') === -1) { From 0d300f292fb578824310269a3baa5a2dd7011322 Mon Sep 17 00:00:00 2001 From: nitin raj Date: Fri, 2 Sep 2022 12:03:07 +0530 Subject: [PATCH 2/2] conflict resolved for certificate image 2 --- .../pipe-certimage-URL.pipe.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts b/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts index 60e146d3a..7cfc50f1e 100644 --- a/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts +++ b/library/ws-widget/utils/src/lib/pipes/pipe-certificate-image-URL/pipe-certimage-URL.pipe.ts @@ -13,15 +13,6 @@ export class PipeCertificateImageURL implements PipeTransform { const finalURL = `${environment.contentHost}/${environment.certificateassets}/content${mainUrl}` return value ? finalURL : '' } - else { - const mainUrl = value && value.split('/content').pop() || '' - // const finalURL = `${environment.contentHost}/${environment.contentBucket}/content${mainUrl}` - const finalURL = `${environment.contentHost}/${environment.certificateassets}/content${mainUrl}` - return value ? finalURL : '' - } - - - } if (value.indexOf('/public/content') === -1) { @@ -41,6 +32,5 @@ export class PipeCertificateImageURL implements PipeTransform { return value ? finalURL : '' } } - } }