From 8d46073d91354a1ce53de80c9dcb68d9715b4bd2 Mon Sep 17 00:00:00 2001 From: mathieu-lessard Date: Thu, 21 Mar 2024 08:11:14 -0700 Subject: [PATCH 1/5] Changed folder for uploaded assets (#52) Co-authored-by: Mathieu Lessard --- contenthub/hydration/hydration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contenthub/hydration/hydration.js b/contenthub/hydration/hydration.js index 2074fcd6..f3ecc720 100644 --- a/contenthub/hydration/hydration.js +++ b/contenthub/hydration/hydration.js @@ -90,7 +90,7 @@ export async function openUploadDialog() { dialogBody.appendChild(container); const folderUUID = crypto.randomUUID(); - const targetUploadPath = `/content/dam/hydrated-assets/${folderUUID.substring(0, 2)}/${folderUUID.substring( + const targetUploadPath = `/content/dam/gmo/upload/${folderUUID.substring(0, 2)}/${folderUUID.substring( 2, 4, )}/${folderUUID}`; From 2936818c245e5ed4e3014f2cad9ca4bbf66a59f3 Mon Sep 17 00:00:00 2001 From: Samruddhi <150183547+staware30@users.noreply.github.com> Date: Thu, 28 Mar 2024 09:01:03 -0700 Subject: [PATCH 2/5] updated hydration-utils.js (#54) MH: Added Firefly product to AA Modal 'Product' Field List --- contenthub/hydration/hydration-utils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/contenthub/hydration/hydration-utils.js b/contenthub/hydration/hydration-utils.js index bdcf6216..8f828a3d 100644 --- a/contenthub/hydration/hydration-utils.js +++ b/contenthub/hydration/hydration-utils.js @@ -145,6 +145,7 @@ export function getMetadataSchema(facetOptions){ { name: 'Digital Editions', id: 'digital-editions' }, { name: 'Dreamweaver', id: 'dreamweaver' }, { name: 'Fill Sign', id: 'fill-sign' }, + { name: 'Firefly', id: 'firefly' }, { name: 'Frame.io', id: 'frame-io' }, { name: 'Fresco', id: 'fresco' }, { name: 'Http Dynamic Streaming', id: 'http-dynamic-streaming' }, From f6462cd83ef3d19eb747166ed8407b4ad1d56989 Mon Sep 17 00:00:00 2001 From: Samruddhi Date: Tue, 2 Apr 2024 15:29:45 -0700 Subject: [PATCH 3/5] MH: Add 'Asset Owner' Field to Add Assets Modal --- contenthub/hydration/hydration-utils.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contenthub/hydration/hydration-utils.js b/contenthub/hydration/hydration-utils.js index 8f828a3d..0d5e2736 100644 --- a/contenthub/hydration/hydration-utils.js +++ b/contenthub/hydration/hydration-utils.js @@ -294,6 +294,12 @@ export function getMetadataSchema(facetOptions){ { property: 'gmo:licensedContent', expectedValue: '', operator: '!==' } ], }, + { + mapToProperty: 'gmo:owner', + label:'Campaign/Asset Owner', + element: 'textarea', + required: true, + }, { mapToProperty: 'gmo:contentType', label: 'Content Type', From 7b0ead35f6a7f5629e0638bbe000ed846e8bff15 Mon Sep 17 00:00:00 2001 From: Samruddhi Date: Wed, 3 Apr 2024 07:37:31 -0700 Subject: [PATCH 4/5] Update hydration-utils.js --- contenthub/hydration/hydration-utils.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/contenthub/hydration/hydration-utils.js b/contenthub/hydration/hydration-utils.js index 0d5e2736..96345bc5 100644 --- a/contenthub/hydration/hydration-utils.js +++ b/contenthub/hydration/hydration-utils.js @@ -31,9 +31,10 @@ export function formIsComplete(metadataSchema, formValues) { if(formValues['gmo:campaignName']){ if(!formValues['gmo:programName']) return false; - if(!formValues['gmo:deliverableType']) return false; } + if(!formValues['gmo:deliverableType']) return false; + if(formValues['gmo:licensedContent'] !== 'no'){ if(!formValues['gmo:usageTerms']) return false; if(formValues['gmo:licensedContent'] === 'yes-expire' && !formValues['gmo:licenseExpiryDate']) return false; @@ -255,11 +256,6 @@ export function getMetadataSchema(facetOptions){ name: 'Tutorial', }, ], - requires: [{ - property: 'gmo:campaignName', - expectedValue: '', - operator: '!==' - }] }, { mapToProperty: 'gmo:licensedContent', From 1e9f0c4cd6d1e8bcca4e8a1b9aed6a776ce07db8 Mon Sep 17 00:00:00 2001 From: Samruddhi Date: Wed, 3 Apr 2024 11:03:45 -0700 Subject: [PATCH 5/5] Comment Update --- contenthub/hydration/hydration-utils.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contenthub/hydration/hydration-utils.js b/contenthub/hydration/hydration-utils.js index 96345bc5..a4b36809 100644 --- a/contenthub/hydration/hydration-utils.js +++ b/contenthub/hydration/hydration-utils.js @@ -32,9 +32,7 @@ export function formIsComplete(metadataSchema, formValues) { if(formValues['gmo:campaignName']){ if(!formValues['gmo:programName']) return false; } - - if(!formValues['gmo:deliverableType']) return false; - + if(formValues['gmo:licensedContent'] !== 'no'){ if(!formValues['gmo:usageTerms']) return false; if(formValues['gmo:licensedContent'] === 'yes-expire' && !formValues['gmo:licenseExpiryDate']) return false;