From c9ab69a3802a4f1904d2650dcbf72e8e0a5b2da3 Mon Sep 17 00:00:00 2001 From: Alexa Snyder Date: Thu, 13 Aug 2020 16:54:14 -0500 Subject: [PATCH 1/5] fix toggling back and forth on asset types --- .../asset-list/asset-list.component.ts | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/projects/lib/src/admin/components/asset-list/asset-list.component.ts b/projects/lib/src/admin/components/asset-list/asset-list.component.ts index 3baea9d..b128a04 100644 --- a/projects/lib/src/admin/components/asset-list/asset-list.component.ts +++ b/projects/lib/src/admin/components/asset-list/asset-list.component.ts @@ -56,6 +56,7 @@ export class AssetListComponent implements OnInit { async ngOnInit(): Promise { if (this.resourceID && this.resourceType) { this.assets = await this.listAssetsPerResource() + .then((assets) => assets.filter(a => a.Type === this.selectedTab)) .catch((ex) => ex) .finally(() => { this.loading = false; @@ -66,24 +67,34 @@ export class AssetListComponent implements OnInit { } } - listAssets(assetType: AssetType, searchTerm: string) { - this.spinner.show(); - let options: ListArgs = { - filters: { Type: assetType }, - }; - if (searchTerm) { - options = { ...options, search: searchTerm, searchOn: ['Title'] }; - } - this.loading = true; - this.spinner.show(); - return HeadStartSDK.Assets.List(options) - .then((assets) => { - this.assets = assets.Items; - }) + async listAssets(assetType: AssetType, searchTerm: string) { + if (this.resourceID && this.resourceType) { + this.assets = await this.listAssetsPerResource() + .then((assets) => assets.filter(a => a.Type === this.selectedTab)) + .catch((ex) => ex) .finally(() => { this.loading = false; this.spinner.hide(); }); + } else { + this.spinner.show(); + let options: ListArgs = { + filters: { Type: assetType }, + }; + if (searchTerm) { + options = { ...options, search: searchTerm, searchOn: ['Title'] }; + } + this.loading = true; + this.spinner.show(); + return HeadStartSDK.Assets.List(options) + .then((assets) => { + this.assets = assets.Items; + }) + .finally(() => { + this.loading = false; + this.spinner.hide(); + }); + } } async listAssetsPerResource(): Promise> { From b7951d794653cb79ed26ce27361e619b1b894dc2 Mon Sep 17 00:00:00 2001 From: Alexa Snyder Date: Fri, 14 Aug 2020 11:56:09 -0500 Subject: [PATCH 2/5] refactor asset list to only list assets per resource --- .../asset-list/asset-list.component.ts | 48 +++++++------------ .../lib/src/stories/asset-list.stories.ts | 2 +- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/projects/lib/src/admin/components/asset-list/asset-list.component.ts b/projects/lib/src/admin/components/asset-list/asset-list.component.ts index b128a04..cdb9d6b 100644 --- a/projects/lib/src/admin/components/asset-list/asset-list.component.ts +++ b/projects/lib/src/admin/components/asset-list/asset-list.component.ts @@ -54,47 +54,31 @@ export class AssetListComponent implements OnInit { ) {} async ngOnInit(): Promise { - if (this.resourceID && this.resourceType) { - this.assets = await this.listAssetsPerResource() - .then((assets) => assets.filter(a => a.Type === this.selectedTab)) - .catch((ex) => ex) - .finally(() => { - this.loading = false; - this.spinner.hide(); - }) - } else { - this.listAssets(this.assetTypes[0], null); + if (!this.resourceType || !this.resourceID) { + throw new Error( + 'cms-asset-list is missing required props resourceType or resourceID' + ); } + await this.listAssets(this.selectedTab, null); } async listAssets(assetType: AssetType, searchTerm: string) { - if (this.resourceID && this.resourceType) { - this.assets = await this.listAssetsPerResource() - .then((assets) => assets.filter(a => a.Type === this.selectedTab)) + console.log('this is hit'); + this.spinner.show(); + // TODO: options are not used yet - either handle searchTerm client side or wait for Oliver's updated endpoints + let options: ListArgs = { + filters: { Type: assetType } + } + if (searchTerm) { + options = { ...options, search: searchTerm, searchOn: ['Title'] }; + } + this.assets = await this.listAssetsPerResource() + .then((assets) => assets.filter(a => a.Type === assetType)) .catch((ex) => ex) .finally(() => { this.loading = false; this.spinner.hide(); }); - } else { - this.spinner.show(); - let options: ListArgs = { - filters: { Type: assetType }, - }; - if (searchTerm) { - options = { ...options, search: searchTerm, searchOn: ['Title'] }; - } - this.loading = true; - this.spinner.show(); - return HeadStartSDK.Assets.List(options) - .then((assets) => { - this.assets = assets.Items; - }) - .finally(() => { - this.loading = false; - this.spinner.hide(); - }); - } } async listAssetsPerResource(): Promise> { diff --git a/projects/lib/src/stories/asset-list.stories.ts b/projects/lib/src/stories/asset-list.stories.ts index d365079..7a0f84b 100644 --- a/projects/lib/src/stories/asset-list.stories.ts +++ b/projects/lib/src/stories/asset-list.stories.ts @@ -25,6 +25,6 @@ export default { export const FullExample = () => ({ component: AssetListComponent, - template: ``, + template: ``, props: {}, }); From 2a7934c68b346f4f0ed7d2c7d47e86b8625ef2a3 Mon Sep 17 00:00:00 2001 From: Alexa Snyder Date: Fri, 14 Aug 2020 12:03:00 -0500 Subject: [PATCH 3/5] refactor asset update to assign asset to resource type/id --- .../asset-list/asset-list.component.html | 4 +++ .../asset-list/asset-list.component.ts | 18 +++++------ .../asset-update/asset-update.component.ts | 32 +++++++++++++------ .../asset-upload/asset-upload.component.html | 4 ++- .../asset-upload/asset-upload.component.ts | 4 ++- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/projects/lib/src/admin/components/asset-list/asset-list.component.html b/projects/lib/src/admin/components/asset-list/asset-list.component.html index 5f89b3a..49c95c4 100644 --- a/projects/lib/src/admin/components/asset-list/asset-list.component.html +++ b/projects/lib/src/admin/components/asset-list/asset-list.component.html @@ -30,6 +30,8 @@

Assets

Assets { - this.isNew = false; - this.onSubmit.emit({ - action: 'UploadAsset', - asset: updatedAsset - }); + return HeadStartSDK.Upload.UploadAsset(updatedAsset).then((response) => { + const assignment: AssetAssignment = { + ResourceType: this.resourceType, + ResourceID: this.resourceID, + AssetID: response.ID + } + return HeadStartSDK.Assets.SaveAssetAssignment(assignment).then(() => { + this.isNew = false; + this.onSubmit.emit({ + action: 'UploadAsset', + asset: response + }); + }) }) } else { return HeadStartSDK.Assets.Update(updatedAsset.ID, updatedAsset).then(() => { diff --git a/projects/lib/src/admin/components/asset-upload/asset-upload.component.html b/projects/lib/src/admin/components/asset-upload/asset-upload.component.html index b9869de..967d0dd 100644 --- a/projects/lib/src/admin/components/asset-upload/asset-upload.component.html +++ b/projects/lib/src/admin/components/asset-upload/asset-upload.component.html @@ -1,7 +1,9 @@

New {{assetType}}

-
diff --git a/projects/lib/src/admin/components/asset-upload/asset-upload.component.ts b/projects/lib/src/admin/components/asset-upload/asset-upload.component.ts index 35eb920..b7e84df 100644 --- a/projects/lib/src/admin/components/asset-upload/asset-upload.component.ts +++ b/projects/lib/src/admin/components/asset-upload/asset-upload.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; @Component({ selector: 'cms-asset-upload', @@ -7,6 +7,8 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; }) export class AssetUploadComponent implements OnInit { @Input() assetType; + @Input() resourceType: 'Products' | 'Categories' | 'Catalogs' | 'Promotions' | 'Suppliers' | 'Buyers' | 'ProductFacets'; + @Input() resourceID: string; @Output() cancel = new EventEmitter(); @Output() submit = new EventEmitter(); From 4205c043205a31832eab394c41f2c81caa2e4346 Mon Sep 17 00:00:00 2001 From: Alexa Snyder Date: Fri, 14 Aug 2020 12:06:09 -0500 Subject: [PATCH 4/5] update endpoint to update documents --- .../admin/components/page-editor/page-editor.component.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/lib/src/admin/components/page-editor/page-editor.component.ts b/projects/lib/src/admin/components/page-editor/page-editor.component.ts index 5a21737..55f4fc0 100644 --- a/projects/lib/src/admin/components/page-editor/page-editor.component.ts +++ b/projects/lib/src/admin/components/page-editor/page-editor.component.ts @@ -14,7 +14,6 @@ import { JDocument, HeadStartSDK } from '@ordercloud/headstart-sdk'; import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PAGE_SCHEMA } from '../../constants/page-schema.constants'; import { RequiredDeep } from '@ordercloud/headstart-sdk/dist/models/RequiredDeep'; -import { ResourceType } from 'projects/lib/src/shared/models/resource-type.interface'; export const EMPTY_PAGE_CONTENT_DOC: Partial = { Title: '', @@ -36,7 +35,7 @@ export class PageEditorComponent implements OnInit, OnChanges { @Input() document?: JDocument; @Input() renderSiteUrl?: string; // optional @Input() editorOptions?: any; // optional - @Input() resourceType?: ResourceType = null; // optional + @Input() resourceType?: "Categories" | "Catalogs" | "Products" | "ProductFacets" | "Buyers" | "Suppliers" | "Promotions" = null; // optional @Input() resourceID?: string = null; // optional @Input() parentResourceID?: string = null; // optional @Output() backClicked = new EventEmitter(); @@ -119,7 +118,7 @@ export class PageEditorComponent implements OnInit, OnChanges { let updated: RequiredDeep; if (this.document && this.document.ID) { - updated = await HeadStartSDK.Documents.SAve( + updated = await HeadStartSDK.Documents.Update( PAGE_SCHEMA.ID, this.document.ID, { From 6ddc9da9e3c0e7d998d98db7610a74d59f002781 Mon Sep 17 00:00:00 2001 From: Alexa Snyder Date: Mon, 17 Aug 2020 08:09:34 -0500 Subject: [PATCH 5/5] revert changes from an outdated headstart package --- package-lock.json | 2 +- .../src/admin/components/asset-list/asset-list.component.ts | 5 +++-- .../admin/components/asset-update/asset-update.component.ts | 5 +++-- .../admin/components/page-editor/page-editor.component.ts | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index d0b7944..5da9317 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ordercloud/angular-cms-components", - "version": "1.0.0-beta.13", + "version": "1.0.0-beta.15", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/projects/lib/src/admin/components/asset-list/asset-list.component.ts b/projects/lib/src/admin/components/asset-list/asset-list.component.ts index 291226d..1d2d12c 100644 --- a/projects/lib/src/admin/components/asset-list/asset-list.component.ts +++ b/projects/lib/src/admin/components/asset-list/asset-list.component.ts @@ -10,6 +10,7 @@ import { } from '@ordercloud/headstart-sdk'; import { RequiredDeep } from '@ordercloud/headstart-sdk/dist/models/RequiredDeep'; import { NgxSpinnerService } from 'ngx-spinner'; +import { ResourceType } from 'projects/lib/src/shared/models/resource-type.interface'; const ASSET_TYPE_IMAGE = 'Image'; type ASSET_TYPE_IMAGE = typeof ASSET_TYPE_IMAGE; @@ -32,8 +33,8 @@ type AssetType = styleUrls: ['./asset-list.component.scss'], }) export class AssetListComponent implements OnInit { - @Input() resourceType?: 'Products' | 'Categories' | 'Catalogs' | 'Promotions' | 'Suppliers' | 'Buyers' | 'ProductFacets'; - @Input() resourceID?: string; + @Input() resourceType?: ResourceType = null; + @Input() resourceID?: string = null; @Input() parentResourceID?: string = null; assets: any; modalReference: NgbModalRef; diff --git a/projects/lib/src/admin/components/asset-update/asset-update.component.ts b/projects/lib/src/admin/components/asset-update/asset-update.component.ts index fde5d34..747a89d 100644 --- a/projects/lib/src/admin/components/asset-update/asset-update.component.ts +++ b/projects/lib/src/admin/components/asset-update/asset-update.component.ts @@ -1,6 +1,7 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AssetAssignment, HeadStartSDK } from '@ordercloud/headstart-sdk'; +import { ResourceType } from 'projects/lib/src/shared/models/resource-type.interface'; @Component({ selector: 'cms-asset-update', @@ -13,7 +14,7 @@ export class AssetUpdateComponent implements OnInit { @Input() asset?: any; @Input() assetType: any; - @Input() resourceType: 'Products' | 'Categories' | 'Catalogs' | 'Promotions' | 'Suppliers' | 'Buyers' | 'ProductFacets'; + @Input() resourceType: ResourceType; @Input() resourceID: string; @Input() isNew: boolean; @Output() onSubmit = new EventEmitter(); @@ -83,7 +84,7 @@ export class AssetUpdateComponent implements OnInit { }) }) } else { - return HeadStartSDK.Assets.Update(updatedAsset.ID, updatedAsset).then(() => { + return HeadStartSDK.Assets.Save(updatedAsset.ID, updatedAsset).then(() => { this.onSubmit.emit({ action: 'Update', asset: updatedAsset diff --git a/projects/lib/src/admin/components/page-editor/page-editor.component.ts b/projects/lib/src/admin/components/page-editor/page-editor.component.ts index 55f4fc0..5a21737 100644 --- a/projects/lib/src/admin/components/page-editor/page-editor.component.ts +++ b/projects/lib/src/admin/components/page-editor/page-editor.component.ts @@ -14,6 +14,7 @@ import { JDocument, HeadStartSDK } from '@ordercloud/headstart-sdk'; import { NgbModalRef, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PAGE_SCHEMA } from '../../constants/page-schema.constants'; import { RequiredDeep } from '@ordercloud/headstart-sdk/dist/models/RequiredDeep'; +import { ResourceType } from 'projects/lib/src/shared/models/resource-type.interface'; export const EMPTY_PAGE_CONTENT_DOC: Partial = { Title: '', @@ -35,7 +36,7 @@ export class PageEditorComponent implements OnInit, OnChanges { @Input() document?: JDocument; @Input() renderSiteUrl?: string; // optional @Input() editorOptions?: any; // optional - @Input() resourceType?: "Categories" | "Catalogs" | "Products" | "ProductFacets" | "Buyers" | "Suppliers" | "Promotions" = null; // optional + @Input() resourceType?: ResourceType = null; // optional @Input() resourceID?: string = null; // optional @Input() parentResourceID?: string = null; // optional @Output() backClicked = new EventEmitter(); @@ -118,7 +119,7 @@ export class PageEditorComponent implements OnInit, OnChanges { let updated: RequiredDeep; if (this.document && this.document.ID) { - updated = await HeadStartSDK.Documents.Update( + updated = await HeadStartSDK.Documents.SAve( PAGE_SCHEMA.ID, this.document.ID, {