inviton-powerduck 0.0.184 → 0.0.186

package/common/ajax-xhr.ts

@@ -2,7 +2,7 @@ import type { AjaxRequestProvider, AjaxRequestProviderRequestArgs, AjaxRequestPr
 import { globalState } from '../app/global-state';
 
 export class AjaxProviderXhr implements AjaxRequestProvider {
-	sendRequest<T>(args: AjaxRequestProviderRequestArgs): Promise<AjaxRequestProviderRequestResponse> {
+	sendRequest<T> (args: AjaxRequestProviderRequestArgs): Promise<AjaxRequestProviderRequestResponse> {
 		return new Promise((resolve) => {
 			const x = new XMLHttpRequest();
 
@@ -11,6 +11,9 @@ export class AjaxProviderXhr implements AjaxRequestProvider {
 				args.url,
 				true,
 			);
+
+			x.withCredentials = args.withCredentials === true;
+
 			x.onreadystatechange = function () {
 				if (x.readyState == 4) {
 					let status = x.status;

package/common/api-http.ts

@@ -47,6 +47,11 @@ export interface AjaxDefinition<T> {
 	 * The type of request to make ("POST" or "GET"), default is "GET". Note: Other HTTP request methods, such as PUT and DELETE, can also be used here, but they are not supported by all browsers.
 	 */
 	type?: string;
+
+	/**
+	 * Determines whether cross-site Access-Control requests should be made using credentials such as cookies.
+	 */
+	withCredentials?: boolean;
 }
 
 export interface AjaxDefinitionWithUrl<T> extends AjaxDefinition<T> {
@@ -179,6 +184,7 @@ export interface AjaxRequestProviderRequestArgs {
 	headers: AjaxHeader[];
 	timeout: number;
 	url: string;
+	withCredentials?: boolean;
 }
 
 export interface AjaxRequestProviderRequestResponse {
@@ -223,6 +229,7 @@ export class AppHttpProvider {
 			blockArgument: null,
 		}),
 		headers: <Array<AjaxHeader>>[],
+		withCredentials: false,
 	};
 
 	static getRequestProvider(): AjaxRequestProvider {
@@ -414,6 +421,7 @@ export class AppHttpProvider {
 						query,
 						timeout: args.timeout,
 						url,
+						withCredentials: args.withCredentials ?? this.ajaxDefaults?.withCredentials,
 					})
 					.then(async (resp) => {
 						if (blockUiEnabled) {

package/components/photos/photo-manager.tsx

@@ -14,12 +14,52 @@ import FormItemWrapper from '../form/form-item-wrapper';
 import NotificationProvider from '../ui/notification';
 
 interface PhotoManagerArgs {
+	/**
+	 * The photos to manage
+	 */
 	photos: Photo[];
+
+	/**
+	 * Whether to show the upload button
+	 */
 	showUploadButton?: boolean;
+
+	/**
+	 * The URL to upload photos to
+	 */
 	uploadUrl?: string;
+
+	/**
+	 * The URL where photos are stored
+	 */
 	photosUrl?: string;
+
+	/**
+	 * Whether at least one photo is mandatory
+	 */
 	mandatory?: boolean;
-	changed: (args: { action: 'addition' | 'removal' }) => void;
+
+	/**
+	 * Key in server response where file data is located after upload
+	 */
+	responseFileKey?: string;
+
+	/**
+	 * Called when the photo collection has changed
+	 */
+	changed: (args: PhotoManagerChangedArgs) => void;
+}
+
+interface PhotoManagerChangedArgs {
+	/**
+	 * The action that occurred
+	 */
+	action: 'addition' | 'removal';
+
+	/**
+	 * The current photos
+	 */
+	photos: Photo[];
 }
 
 class PhotoManagerUberModel extends Photo {
@@ -28,10 +68,6 @@ class PhotoManagerUberModel extends Photo {
 	SortOrder: number = null;
 }
 
-class TsxComponentExtended<P> extends TsxComponentExtendedBase<P> {
-
-}
-
 const rootValidations: ValidationRuleset<PhotoManagerComponent> = {
 	photos: new ValidationBuilder().customRule('atLeastOnePhoto', function (this: PhotoManagerComponent) {
 		if (this.mandatory == true) {
@@ -43,13 +79,14 @@ const rootValidations: ValidationRuleset<PhotoManagerComponent> = {
 };
 
 @Component({ validations: rootValidations })
-class PhotoManagerComponent extends TsxComponentExtended<PhotoManagerArgs> implements PhotoManagerArgs {
+class PhotoManagerComponent extends TsxComponentExtendedBase<PhotoManagerArgs> implements PhotoManagerArgs {
 	@Prop() photos!: Photo[];
 	@Prop() mandatory?: boolean;
 	@Prop() uploadUrl!: string;
 	@Prop() photosUrl!: string;
 	@Prop() showUploadButton!: boolean;
-	@Prop() changed!: (args: { action: 'addition' | 'removal' }) => void;
+	@Prop() responseFileKey?: string;
+	@Prop() changed!: (args: PhotoManagerChangedArgs) => void;
 
 	translateItems(): DropzoneGalleryItem[] {
 		if (isNullOrEmpty(this.photos)) {
@@ -68,22 +105,16 @@ class PhotoManagerComponent extends TsxComponentExtended<PhotoManagerArgs> imple
 	}
 
 	parseServerResponse(resp): DropzoneGalleryItem {
-		if (resp.fileData == null) {
-			throw new Error('break');
+		const key = this.responseFileKey || 'fileData';
+		if (resp[key] == null) {
+			throw new Error(`Invalid server response, missing key ${key}`);
 		}
 
-		const retVal: PhotoManagerUberModel = resp.fileData;
-		retVal.Id = resp.fileData.id;
-		retVal.ImageUrl = this.getFullPath(resp.fileData);
+		const retVal: PhotoManagerUberModel = resp[key];
+		retVal.Id = retVal.id;
+		retVal.ImageUrl = this.getFullPath(retVal);
 		retVal.SortOrder = this.photos.length + 1;
 		return retVal;
-		// console.log(resp.fileData);
-
-		// return {
-		//     Id: resp.fileData.id,
-		//     ImageUrl: this.getFullPath(resp.fileData),
-		//     SortOrder: this.photos.length + 1,
-		// };
 	}
 
 	render(h) {
@@ -124,7 +155,10 @@ class PhotoManagerComponent extends TsxComponentExtended<PhotoManagerArgs> imple
 					}}
 					removedFile={(item) => {
 						if (this.changed != null) {
-							this.changed({ action: 'removal' });
+							this.changed({
+								action: 'removal',
+								photos: this.photos,
+							});
 						}
 					}}
 					changed={(items) => {
@@ -141,7 +175,10 @@ class PhotoManagerComponent extends TsxComponentExtended<PhotoManagerArgs> imple
 						}
 
 						if (this.changed != null) {
-							this.changed({ action: 'addition' });
+							this.changed({
+								action: 'addition',
+								photos: this.photos,
+							});
 						}
 					}}
 				/>

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "inviton-powerduck",
 	"type": "module",
-	"version": "0.0.184",
+	"version": "0.0.186",
 	"files": [
 		"app/",
 		"common/",