[RELEASE] create version v0.4.1

This reverts commit 60d9ea0a5714b174685c40cb0e1c3e632a724894.

.island/release.bash

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+version_file="version.txt"
+
+new_version=$(cat $version_file)
+sed -i "s|\"version\":.*\".*\"|\"version\":\"$new_version\"|" package.json
+
+if grep -q "dev" "$version_file"; then
+    # update all dependency
+    pnpm install
+    pnpm run update_packages
+else
+    # in case of release ==> can not do it automatically ...
+    echo not implemented
+fi
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kangaroo-and-rabbit/kar-cw",
-  "version": "0.2.0",
+  "version": "0.4.1",
   "sideEffects": false,
   "scripts": {
     "dev": "ng build kar-cw --watch --configuration development",
@@ -10,26 +10,26 @@
     "lint": "ng lint",
     "style": "prettier --write .",
     "update_packages": "ncu --upgrade",
-    "install_dependency": "pnpm install"
+    "install_dependency": "pnpm install --force"
   },
   "peerDependencies": {
-    "@angular/common": "^17.3.3",
-    "@angular/compiler": "^17.3.3",
-    "@angular/core": "^17.3.3",
-    "@angular/forms": "^17.3.3",
-    "@angular/platform-browser": "^17.3.3",
-    "@angular/platform-browser-dynamic": "^17.3.3",
-    "@angular/router": "^17.3.3",
-    "rxjs": "~7.8.0",
-    "zone.js": "~0.14.3"
+    "@angular/common": "^18.0.0",
+    "@angular/compiler": "^18.0.0",
+    "@angular/core": "^18.0.0",
+    "@angular/forms": "^18.0.0",
+    "@angular/platform-browser": "^18.0.0",
+    "@angular/platform-browser-dynamic": "^18.0.0",
+    "@angular/router": "^18.0.0",
+    "rxjs": "~7.8.1",
+    "zone.js": "~0.14.5"
   },
   "dependencies": {
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.3",
-    "@angular/cli": "^17.3.3",
-    "@angular/compiler-cli": "^17.3.3",
+    "@angular-devkit/build-angular": "^18.0.1",
+    "@angular/cli": "^18.0.1",
+    "@angular/compiler-cli": "^18.0.0",
     "@types/jasmine": "~5.1.4",
     "jasmine-core": "~5.1.2",
     "karma": "~6.4.3",
@@ -37,9 +37,9 @@
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "ng-packagr": "^17.3.3",
-    "typescript": "~5.4.4",
-    "npm-check-updates": "^16.14.18"
+    "ng-packagr": "^18.0.0",
+    "typescript": "~5.4.5",
+    "npm-check-updates": "^16.14.20"
   },
   "maintainers": [
     {

src/component/async-action-status/async-status-component.ts

@@ -22,7 +22,7 @@ export class AsyncActionStatusComponent {
 	@Input() value: AsyncActionState = AsyncActionState.IDLE;
 
 	public getImage(): string {
-		switch(this.value) {
+		switch (this.value) {
 			case AsyncActionState.IDLE:
 				return '';
 			case AsyncActionState.LOADING:

src/component/checkbox/checkbox.html

@@ -1,6 +1,7 @@
 <div class="elem-checkbox">
 	<input
 		type="checkbox"
+		[disabled]="isDisable"
 		[checked]="value"
 		(change)="onChange($event.target.checked)" />
 	{{comment}}

src/component/checkbox/checkbox.ts

@@ -11,18 +11,20 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 	styleUrls: ['checkbox.less'],
 })
 export class CheckboxComponent {
+	/// Checkbox value
+	@Input() isDisable: boolean = false;
 	/// Checkbox value
 	@Input() value: boolean = false;
 	/// Description of the checkbox
 	@Input() comment: string = "";
 	/// event when change the value of the password
-    @Output() changeValue: EventEmitter<boolean> = new EventEmitter();
+	@Output() changeValue: EventEmitter<boolean> = new EventEmitter();
 
 	/**
 	 * When input value change, need update the display and change the internal value.
 	 * @param newValue  New value set on the password
 	 */
-	 onChange(newValue: boolean): void {
+	onChange(newValue: boolean): void {
 		this.value = newValue;
 		this.changeValue.emit(this.value);
 	}

src/component/index.ts

@@ -1,17 +1,24 @@
-import { AsyncActionState, AsyncActionStatusComponent } from './async-action-status/async-status-component';
-import { BurgerPropertyComponent } from './burger-property/burger-property';
-import { CheckboxComponent } from './checkbox/checkbox';
-import { EntryNumberComponent } from './entry-number/entry-number';
-import { EntryValidatorComponent } from './entry-validator/entry-validator';
-import { EntryComponent } from './entry/entry';
-import { ErrorMessageStateComponent } from './error-message-state/error-message-state';
-import { ErrorComponent } from './error/error';
-import { PasswordEntryComponent } from './password-entry/password-entry';
-import { PopInComponent } from './popin/popin';
-import { RenderFormComponent } from './render-settings/render-form';
-import { RenderSettingsComponent } from './render-settings/render-settings';
-import { SpinnerComponent } from './spinner/spinner';
-import { EventOnMenu, TopMenuComponent } from './top-menu/top-menu';
-import { UploadFileComponent } from './upload-file/upload-file';
-
-export { EventOnMenu, BurgerPropertyComponent, EntryNumberComponent, CheckboxComponent, RenderFormComponent, RenderSettingsComponent, ErrorMessageStateComponent, AsyncActionState, AsyncActionStatusComponent, EntryValidatorComponent, PopInComponent, TopMenuComponent, UploadFileComponent, ErrorComponent, SpinnerComponent, PasswordEntryComponent, EntryComponent };
+export { AsyncActionState, AsyncActionStatusComponent } from './async-action-status/async-status-component';
+export { BurgerPropertyComponent } from './burger-property/burger-property';
+export { CheckboxComponent } from './checkbox/checkbox';
+export { EntryNumberComponent } from './entry-number/entry-number';
+export { EntryValidatorComponent } from './entry-validator/entry-validator';
+export { EntryComponent } from './entry/entry';
+export { ErrorMessageStateComponent } from './error-message-state/error-message-state';
+export { ErrorComponent } from './error/error';
+export { PasswordEntryComponent } from './password-entry/password-entry';
+export { PopInComponent } from './popin/popin';
+export { RenderFormComponent } from './render-settings/render-form';
+export {
+    RenderSettingsComponent,
+    SettingsItem,
+    isSettingsItem,
+    SettingType,
+    isSettingType,
+    CheckerParameter,
+    CheckerParameterType,
+    ReturnFunction,
+} from './render-settings/render-settings';
+export { SpinnerComponent } from './spinner/spinner';
+export { EventOnMenu, TopMenuComponent } from './top-menu/top-menu';
+export { UploadFileComponent } from './upload-file/upload-file';

src/component/popin/popin.html

@@ -3,7 +3,7 @@
 		<div class="element {{popSize}}">
 			<div class="header">
 				<label class="unselectable">{{popTitle}}</label>
-				@if(closeTopRight === true) {
+				@if(closeTopRight) {
 					<div class="close">
 						<button class="button-close color-shadow-black" (click)="onCloseTop()" type="submit">
 							<label class="unselectable"><i class="material-icons">close</i></label>
@@ -15,28 +15,28 @@
 				<ng-content></ng-content>
 			</div>
 			<div class="footer">
-				@if(validateTitle !== null) {
+				@if(validateTitle) {
 					<div class="action">
 						<button class="button color-shadow-black" (click)="onValidate()" type="submit">
 							<label class="unselectable"><i class="material-icons">done</i> {{validateTitle}}</label>
 						</button>
 					</div>
 				}
-				@if(saveTitle != null) {
+				@if(saveTitle) {
 					<div class="action">
 						<button class="button color-shadow-black" (click)="onSave()" type="submit">
 							<label class="unselectable"><i class="material-icons">save_alt</i> {{saveTitle}}</label>
 						</button>
 					</div>
 				}
-				@if(otherTitle != null) {
+				@if(otherTitle) {
 					<div class="action">
 						<button class="button color-shadow-black" (click)="onOther()" type="submit">
 							<label class="unselectable"><i class="material-icons">star</i> {{otherTitle}}</label>
 						</button>
 					</div>
 				}
-				@if(closeTitle != null) {
+				@if(closeTitle) {
 					<div class="action">
 						<button class="button color-shadow-black" (click)="onClose()" type="submit">
 							<label class="unselectable"><i class="material-icons">close</i> {{closeTitle}}</label>

src/component/popin/popin.ts

@@ -21,10 +21,10 @@ export class PopInComponent implements OnInit, OnDestroy {
 	@Input() popSize: string = 'medium';
 
 	@Output() callback: EventEmitter<any> = new EventEmitter();
-	@Input() closeTitle: any = null;
-	@Input() validateTitle: any = null;
-	@Input() saveTitle: any = null;
-	@Input() otherTitle: any = null;
+	@Input() closeTitle?: string;
+	@Input() validateTitle?: string;
+	@Input() saveTitle?: string;
+	@Input() otherTitle?: string;
 
 	public displayPopIn: boolean = false;
 

src/model/settings-item.ts

@@ -0,0 +1,79 @@
+import { CheckerParameter } from "../component/entry-validator/entry-validator";
+import { isInArray, isNullOrUndefined, isObject, isString, isOptionalOf, isBoolean, isNumber, isUndefined } from "../utils";
+
+
+export enum SettingType {
+    VALUE = 'VALUE',
+    LINE = 'LINE',
+    BOOLEAN = 'BOOLEAN',
+    NUMBER = 'NUMBER',
+    STRING = 'STRING',
+    PASSWORD = 'PASSWORD',
+}
+export function isSettingType(data: any): data is SettingType {
+    return isInArray(data, ['VALUE', 'LINE', 'NUMBER', 'BOOLEAN', 'STRING', 'PASSWORD']);
+}
+
+export interface SettingsItem {
+    // Type of the menu Node
+    type: SettingType;
+    // Unique key reference
+    key?: string;
+    // Displayed Title
+    title?: string;
+    // Description of the parameter
+    description?: string;
+    // placeholder of the parameter
+    placeholder?: string;
+    // Parameter key to SET/GET or the sub-menu
+    value?: boolean | string | Number;
+    // when data is change the value is set here undefined if not correct (must be set @ undefined):
+    newValue?: boolean | string | Number;
+    // checker to validate the data:
+    checker?: CheckerParameter
+    // result of the checker (must be set @ undefined):
+    state?: boolean | string;
+    // The element is require to have a valid form.
+    require?: boolean
+}
+
+export function isSettingsItem(data: any): data is SettingsItem {
+    if (isNullOrUndefined(data)) {
+        return false;
+    }
+    if (!isObject(data)) {
+        return false;
+    }
+    if (!isSettingType(data.type)) {
+        return false;
+    }
+    if (!isString(data.key)) {
+        return false;
+    }
+    if (!isOptionalOf(data.title, isString)) {
+        return false;
+    }
+    if (!isOptionalOf(data.description, isString)) {
+        return false;
+    }
+    if (!isOptionalOf(data.placeholder, isString)) {
+        return false;
+    }
+    if (
+        !isOptionalOf(data.value, isBoolean) &&
+        !isOptionalOf(data.value, isString) &&
+        !isOptionalOf(data.value, isNumber)
+    ) {
+        return false;
+    }
+    if (!isUndefined(data.newValue)) {
+        return false;
+    }
+    if (!isOptionalOf(data.state, isString)) {
+        return false;
+    }
+    if (!isOptionalOf(data.require, isBoolean)) {
+        return false;
+    }
+    return true;
+}

src/popin/upload-progress/upload-progress.html

@@ -10,35 +10,33 @@
 		<p class="expand">
 			<label class="unselectable"><b>{{mediaTitle}}</b></label>
 		</p>
-		@if(progress != 100) {
+		@if(error) {
+			<div>
+				<label class="unselectable"><b>Get an error From the server:</b></label
+				><br />
+				<label class="unselectable">{{error}}</label>
+			</div>
+		}
+		@else if(progress != 100) {
 			<div class="progress-back">
-				<div class="progress-bar" style="width:{{progress}}%">&nbsp;&nbsp;&nbsp;{{progress}}%</div>
+				<div class="progress-bar" style="width:{{progress??0}}%">&nbsp;&nbsp;&nbsp;{{progress}}%</div>
 			</div>
 			<div>
 				<label class="unselectable">Upload:</label><label style="text-align: right">{{uploadDisplay}}</label><br />
 				<label class="unselectable">Size:</label><label style="text-align: right">{{sizeDisplay}}</label>
 			</div>
 		}
-		@else if (error == null && result == null) {
+		@else if(result) {
+			<div>
+				<label class="unselectable"><b>Upload finished:</b></label
+				><br />
+				<label class="unselectable">{{result}}</label>
+			</div>
+		}
+		@else {
 			<div>
 				<label class="unselectable">Upload done ... waiting server answer</label>
 			</div>
 		}
-		@else {
-			@if(error != null) {
-				<div>
-					<label class="unselectable"><b>Get an error From the server:</b></label
-					><br />
-					<label class="unselectable">{{error}}</label>
-				</div>
-			}
-			@if(result != null) {
-				<div>
-					<label class="unselectable"><b>Upload finished:</b></label
-					><br />
-					<label class="unselectable">{{result}}</label>
-				</div>
-			}
-		}
 	</app-popin>
 </div>

src/popin/upload-progress/upload-progress.ts

@@ -4,9 +4,28 @@
  * @license PROPRIETARY (see license file)
  */
 
-import { Component, OnInit, Input, SimpleChanges } from '@angular/core';
+import { Component, OnInit, Input, SimpleChanges, EventEmitter, Output } from '@angular/core';
 import { Router } from '@angular/router';
 import { PopInService } from '../../service';
+import { isNullOrUndefined } from '../../utils';
+
+
+export class UploadProgress {
+	labelMediaTitle: string = '';
+	mediaSendSize: number = 0;
+	mediaSize: number = 99999999999999;
+	result?: string;
+	error?: string;
+	clear() {
+		this.labelMediaTitle = '';
+		this.mediaSendSize = 0;
+		this.mediaSize = 99999999999999;
+		this.result = undefined;
+		this.error = undefined;
+	}
+}
+
+
 
 @Component({
 	selector: 'upload-progress',
@@ -19,6 +38,7 @@ export class PopInUploadProgress implements OnInit {
 	@Input() mediaSize: number = 999999999999;
 	@Input() result?: string;
 	@Input() error?: string;
+	@Output() abort: EventEmitter<void> = new EventEmitter();
 	public closeButtonTitle?: string = 'Abort';
 	public otherButtonTitle?: string;
 	public validateButtonTitle?: string;
@@ -29,8 +49,14 @@ export class PopInUploadProgress implements OnInit {
 	OnDestroy() { }
 	ngOnInit() { }
 	eventPopUp(_event: string): void {
-		console.log(`GET event: ${_event}`);
-		this.popInService.close('popin-upload-progress');
+		if (_event == "close") {
+			if (this.abort) {
+				this.abort.emit();
+			}
+		} else {
+			console.log(`GET event: ${_event}`);
+			this.popInService.close('popin-upload-progress');
+		}
 	}
 	updateNeedSend(): void { }
 
@@ -80,11 +106,11 @@ export class PopInUploadProgress implements OnInit {
 		this.progress = Math.trunc((this.mediaUploaded * 100) / this.mediaSize);
 		this.uploadDisplay = this.convertInHuman(this.mediaUploaded);
 		this.sizeDisplay = this.convertInHuman(this.mediaSize);
-		if (this.error === null && this.result === null) {
+		if (isNullOrUndefined(this.error) && isNullOrUndefined(this.result)) {
 			this.closeButtonTitle = 'Abort';
 			this.otherButtonTitle = undefined;
 			this.validateButtonTitle = undefined;
-		} else if (this.result === null) {
+		} else if (isNullOrUndefined(this.result)) {
 			this.closeButtonTitle = undefined;
 			this.otherButtonTitle = 'Close';
 			this.validateButtonTitle = undefined;
@@ -95,18 +121,3 @@ export class PopInUploadProgress implements OnInit {
 		}
 	}
 }
-
-export class UploadProgress {
-	labelMediaTitle: string = '';
-	mediaSendSize: number = 0;
-	mediaSize: number = 99999999999999;
-	result?: string;
-	error?: string;
-	clear() {
-		this.labelMediaTitle = '';
-		this.mediaSendSize = 0;
-		this.mediaSize = 99999999999999;
-		this.result = undefined;
-		this.error = undefined;
-	}
-}

src/service/sso.ts

@@ -47,7 +47,7 @@ export class SSOService {
 		) {
 			return this.utf8_to_b64(data);
 		}
-		const pathName = getApplicationLocation();
+		const pathName = getApplicationLocation(this.environment);
 		if (isInArray(pathName, ['sso', '/sso', '/sso/'])) {
 			return this.utf8_to_b64('home');
 		}

src/service/user.ts

@@ -13,6 +13,7 @@ import { SSOService } from './sso';
 import { getApplicationLocation, isNullOrUndefined, sha512 } from '../utils';
 import { HttpWrapperService, HTTPRequestModel, HTTPMimeType, ModelResponseHttp } from './http-wrapper_kjdhqslkjf';
 import { Environment } from '../model/environment';
+import { APP_BASE_HREF } from '@angular/common';
 
 
 @Injectable()
@@ -76,7 +77,7 @@ export class UserService {
 	 * Check if the system can be connected
 	 */
 	checkAutoConnect(): Promise<void> {
-		let locationOrigin = getApplicationLocation();
+		let locationOrigin = getApplicationLocation(this.environment);
 		const self = this;
 		return new Promise<void>((resolve, reject) => {
 			// Need to use the windows global route to prevent the log in cycle ...
@@ -91,7 +92,7 @@ export class UserService {
 			}
 			console.log('    ==> Check if need reconnect?');
 			let rememberMe = self.getRememberMe();
-			// TODO: in case of jest reload ==> no need to manage the SSO ==> just keep the token ... it in enought...
+			// TODO: in case of jest reload ==> no need to manage the SSO ==> just keep the token ... it in enough...
 			let token: undefined | string = undefined;
 			if (
 				isNullOrUndefined(this.environment.tokenStoredInPermanentStorage) ||
@@ -109,7 +110,7 @@ export class UserService {
 				self.startSession(token ?? '', rememberMe)
 					.then(() => {
 						self.router.navigateByUrl(locationOrigin);
-						console.log(`update global URL = ${locationOrigin}`);
+						console.log(`update global URL = ${locationOrigin} APP_BASE_HREF=${APP_BASE_HREF}`);
 						resolve();
 					})
 					.catch(() => {

src/utils/applPath.ts

@@ -1,12 +1,11 @@
 //import { environment } from 'environments/environment';
 
-export function getApplicationLocation(): string {
+import { Environment } from "../model";
+
+export function getApplicationLocation(environment: Environment): string {
 	let pathName = location.pathname;
-	return pathName;
 	//console.log("start Path-name: '" + pathName  + "'");
 	//console.log("check with:      '" + environment.applName + "/sso/" + "'");
-	/*
-	
 	if (pathName.startsWith('/' + environment.applName + '/')) {
 		pathName = pathName.substring(environment.applName.length + 2);
 	} else if (pathName.startsWith('/' + environment.applName)) {
@@ -17,5 +16,4 @@ export function getApplicationLocation(): string {
 		pathName = pathName.substring(environment.applName.length);
 	}
 	return pathName;
-	*/
 }

src/utils/data-store.ts

@@ -34,7 +34,7 @@ export class DataStore<TYPE> {
 					}
 					resolve(self.data);
 				}).catch(error => {
-					console.log(`[E] ${self.constructor.name}: can not get data from remote server:`);
+					console.log(`[E] ${self.constructor.name}: can not get data from remote server: ${JSON.stringify(error, null, 2)}`);
 					if (self.dataPromise) {
 						for (let iii = 0; iii < self.dataPromise.length; iii++) {
 							self.dataPromise[iii].reject(error);

tsconfig.json

@@ -23,11 +23,11 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "ES2022",
-    "module": "ES2022",
+    "target": "ES2018",
+    "module": "ES2015",
     "useDefineForClassFields": false,
     "lib": [
-      "ES2022",
+      "ES2018",
       "dom"
     ],
     "emitDecoratorMetadata": true,

version.txt

@@ -0,0 +1 @@
+0.4.1