5htp-core 0.4.9-1 → 0.4.9-5

package/src/client/components/inputv3/Rte/style.less

@@ -84,8 +84,6 @@
     .editor-input {
         min-height: 150px;
         resize: none;
-        font-size: 15px;
-        caret-color: rgb(5, 5, 5);
         position: relative;
         tab-size: 1;
         outline: 0;

package/src/client/components/inputv3/Rte/themes/PlaygroundEditorTheme.ts

@@ -76,7 +76,7 @@ const theme: EditorThemeClasses = {
             listitem: 'PlaygroundEditorTheme__nestedListItem',
         },
         olDepth: [
-            'PlaygroundEditorTheme__ol1',
+            'steps',
             'PlaygroundEditorTheme__ol2',
             'PlaygroundEditorTheme__ol3',
             'PlaygroundEditorTheme__ol4',

package/src/client/components/inputv3/base.less

@@ -47,12 +47,6 @@
 
     padding: 0;
 
-    > * {
-        + * {
-            border-top: solid 1px var(--cLine);;
-        }
-    }
-
     .input.text {
         border: none;
         box-shadow: none;

package/src/client/components/inputv3/base.tsx

@@ -69,7 +69,7 @@ export function useInput<TValue>(
         if (state.changed === false)
             return;
 
-        //console.log(`[input] Commit value:`, state.value, externalValue);
+        console.log(`[input] Commit value:`, state.value, externalValue);
         if (onChange !== undefined)
             onChange(state.value);
     }
@@ -78,7 +78,7 @@ export function useInput<TValue>(
     React.useEffect(() => {
 
         if (externalValue !== undefined && externalValue !== state.value) {
-            //console.log("External value change", externalValue);
+            console.log("External value change", externalValue);
             setState({ value: externalValue, valueSource: 'external', changed: true })
         }
         

package/src/client/components/inputv3/file/index.tsx

@@ -8,7 +8,8 @@ import { ComponentChild } from 'preact';
 // Composants généraux
 import Bouton from '@client/components/button';
 
-// Libs
+// Core libs
+import { InputWrapper } from '../base';
 import useContext from '@/client/context';
 
 // specific
@@ -59,7 +60,7 @@ const normalizeFile = (file: File) => new FileToUpload({
 export type Props = {
 
     // Input
-    title: ComponentChild,
+    title: string,
     value?: string | FileToUpload, // string = already registered 
 
     // Display
@@ -75,25 +76,25 @@ export type Props = {
 /*----------------------------------
 - COMPOSANT
 ----------------------------------*/
-export default ({
-
-    // Input
-    title,
-    value: file, 
-    className, 
-
-    // Display
-    emptyText = 'Click here to select a File',
-    previewUrl: previewUrlInit,
-
-    // Actions
-    onChange
-}: Props) => {
+export default (props: Props) => {
 
     /*----------------------------------
     - INITIALIZE
     ----------------------------------*/
 
+    let {
+        // Input
+        value: file,
+        className,
+
+        // Display
+        emptyText = 'Click here to select a File',
+        previewUrl: previewUrlInit,
+
+        // Actions
+        onChange
+    } = props;
+
     const [previewUrl, setPreviewUrl] = React.useState<string | undefined>(previewUrlInit);
 
     className = 'input upload ' + (className === undefined ? '' : ' ' + className);
@@ -125,39 +126,40 @@ export default ({
     /*----------------------------------
     - RENDER
     ----------------------------------*/
-    return <>
-        <label>{title}</label>
-
-        <div class={className}>
-
-            {file && <>
-                <div class="preview">
-
-                    {previewUrl ? (
-                        <img src={previewUrl} />
-                    ) : typeof file === 'string' ? <>
-                        <strong>A file has been selected</strong>
-                    </> : file ? <>
-                        <strong>{file.name}</strong>
-                    </> : null}
+    return (
+        <InputWrapper {...props}>
+
+            <div class={className}>
+
+                {file && <>
+                    <div class="preview">
+
+                        {previewUrl ? (
+                            <img src={previewUrl} />
+                        ) : typeof file === 'string' ? <>
+                            <strong>A file has been selected</strong>
+                        </> : file ? <>
+                            <strong>{file.name}</strong>
+                        </> : null}
+                    </div>
+
+                    <div class="row actions sp-05">
+
+                        {typeof file === 'string' && <>
+                            <Bouton type="secondary" icon="eye" shape="pill" size="s" link={file} />
+                        </>}
+                        
+                        <Bouton class='bg error' icon="trash" shape="pill" size="s"  
+                            async onClick={() => onChange(undefined)} />
+                    </div>
+                </>}
+
+                <div class="indication col al-center">
+                    {emptyText}
                 </div>
 
-                <div class="row actions sp-05">
-
-                    {typeof file === 'string' && <>
-                        <Bouton type="secondary" icon="eye" shape="pill" size="s" link={file} />
-                    </>}
-                    
-                    <Bouton class='bg error' icon="trash" shape="pill" size="s"  
-                        async onClick={() => onChange(undefined)} />
-                </div>
-            </>}
-
-            <div class="indication col al-center">
-                {emptyText}
+                <input type="file" onChange={selectFile} />
             </div>
-
-            <input type="file" onChange={selectFile} />
-        </div>
-    </>
+        </InputWrapper>
+    )
 }

package/src/client/services/router/request/api.ts

@@ -3,19 +3,19 @@
 ----------------------------------*/
 
 // Core
-import type { TApiResponseData } from '@server/services/router';
+import type ClientApplication from '@client/app';
+import { fromJson as errorFromJson, NetworkError } from '@common/errors';
 import ApiClientService, { 
-    TPostData,
+    TPostData, TPostDataWithoutFile,
     TApiFetchOptions, TFetcherList, TFetcherArgs, TFetcher,
     TDataReturnedByFetchers
 } from '@common/router/request/api';
-import { fromJson as errorFromJson, NetworkError } from '@common/errors';
-import type ClientApplication from '@client/app';
 
-import { toMultipart } from './multipart';
 
 // Specific
 import type { default as Router, Request } from '..';
+import { toMultipart } from './multipart';
+import FileToUpload from '@client/components/inputv3/file/FileToUpload';
 
 /*----------------------------------
 - TYPES
@@ -187,29 +187,45 @@ export default class ApiClient implements ApiClientService {
         return { ...alreadyLoadedData, ...fetchedData }
     }
 
-    public configure = (...[method, path, data, options]: TFetcherArgs) => {
-        const { onProgress, captcha } = options || {};
+    public configure = (...[method, path, data, options = {}]: TFetcherArgs) => {
     
-        const url = this.router.url(path, {}, false);
+        let url = this.router.url(path, {}, false);
     
         debug && console.log(`[api] Sending request`, method, url, data);
     
         // Create Fetch config
-        const config = {
+        const config: With<RequestInit, 'headers'> = {
             method: method,
             headers: {
                 'Accept': "application/json",
             }
         };
     
-        // Format request data
+        // Update options depending on data
         if (data) {
+
+            // If file included in data, need to use multipart
+            // TODO: deep check
+            const hasFile = Object.values(data).some((value) => value instanceof FileToUpload);
+            if (hasFile) {
+                // GET request = Can't send files
+                if (method === "GET")
+                    throw new Error("Cannot send file in GET request");
+                // Auto switch to multiplart
+                else if (options.encoding === undefined)
+                    options.encoding = 'multipart';
+                else if (options.encoding !== 'multipart')
+                // Encoding set to JSON = Can't send files
+                    throw new Error("Cannot send file in non-multipart request");
+            }
+
+            // Data encoding
             if (method === "GET") {
 
-                const params = new URLSearchParams(data).toString();
-                config.url = `${url}?${params}`;
+                const params = new URLSearchParams( data as unknown as TPostDataWithoutFile ).toString();
+                url = `${url}?${params}`;
 
-            } else if (options?.encoding === 'multipart') {
+            } else if (options.encoding === 'multipart') {
 
                 console.log("[api] Multipart request", data);
                 // Browser will automatically choose the right headers

package/src/common/router/request/api.ts

@@ -22,14 +22,14 @@ export type TFetcher<TData extends any = unknown> = {
     
     method: HttpMethod,
     path: string,
-    data?: TPostData,
+    data?: TPostDataWithFile,
     options?: TApiFetchOptions
 }
 
 export type TFetcherArgs = [
     method: HttpMethod,
     path: string,
-    data?: TPostData,
+    data?: TPostDataWithFile,
     options?: TApiFetchOptions
 ]
 
@@ -40,9 +40,11 @@ export type TApiFetchOptions = {
     encoding?: 'json' | 'multipart'
 }
 
-export type TPostData = {[key: string]: PrimitiveValue}
+export type TPostData = TPostDataWithFile
 
-export type TPostDataWithFile = {[key: string]: PrimitiveValue | FileToUpload}
+export type TPostDataWithFile = { [key: string]: PrimitiveValue | FileToUpload }
+
+export type TPostDataWithoutFile = { [key: string]: PrimitiveValue }
 
 // https://stackoverflow.com/questions/44851268/typescript-how-to-extract-the-generic-parameter-from-a-type
 type TypeWithGeneric<T> = TFetcher<T>

package/src/common/validation/schema.ts

@@ -14,7 +14,7 @@ import defaultValidators, { SchemaValidators, getFieldValidator } from './valida
 ----------------------------------*/
 
 export type TSchemaFields = { 
-    [fieldName: string]: TSchemaFields | Schema<{}> | TValidatorDefinition
+    [fieldName: string]: TSchemaFields | Schema<{}> | Validator<any> | TValidatorDefinition
 }
 
 type TSchemaOptions = {
@@ -42,9 +42,15 @@ export type TSchemaData<TSchema extends Schema<{}>> =
 
 export type TValidatedData<TFields extends TSchemaFields> = {
     // For each field, the values returned by validator.validate()
-    [name in keyof TFields]: ReturnType<TFields[name]["validate"]>
+    [name in keyof TFields]: TFieldReturnType<TFields[name]>
 }
 
+type TFieldReturnType<TField> = TField extends TValidatorDefinition
+    ? TField[2]
+    : TField extends Schema<infer T>
+    ? TValidatedData<T>
+    : never
+
 /*----------------------------------
 - CONST
 ----------------------------------*/

package/src/common/validation/validator.ts

@@ -18,9 +18,9 @@ import type { InputBaseProps } from '@client/components/inputv3/base';
 ----------------------------------*/
 
 export type TValidatorDefinition<K extends keyof SchemaValidators = keyof SchemaValidators> = [
-    type: K, 
-    args: Parameters<SchemaValidators[K]>, 
-    returnType: ReturnType<SchemaValidators[K]> 
+    type: string, 
+    args: any[], 
+    returnType: string
 ]
 
 // TODO: remove

package/src/server/services/disks/driver.ts

@@ -92,6 +92,8 @@ export default abstract class FsDriver<
 
     public abstract delete( bucketName: TBucketName, filename: string ): Promise<boolean>;
 
+    public abstract deleteDir( bucketName: TBucketName, dirname: string ): Promise<boolean>;
+
     public abstract unmount(): Promise<void>;
 
 }

package/src/server/services/disks/drivers/s3/index.ts

@@ -244,7 +244,6 @@ export default class S3Driver<
                 Bucket: bucket,
                 Key: filename,
                 Body: content,
-                ACL: 'public-read'
             }, (err, data) => {
 
                 if (err) return reject(err);
@@ -289,4 +288,34 @@ export default class S3Driver<
         })
     }
 
+    public async deleteDir( bucketName: TBucketName, directoryPath: string ) {
+        const bucket = this.config.buckets[bucketName];
+        debug && console.log(`delete ${bucket}/${directoryPath}`);
+        try {
+            // Liste des objets dans le répertoire
+            const listedObjects = await this.s3.listObjectsV2({
+                Bucket: bucket,
+                Prefix: directoryPath
+            }).promise();
+
+            if (!listedObjects.Contents?.length) return;
+
+            // Supprimer les objets
+            await this.s3.deleteObjects({
+                Bucket: bucket,
+                Delete: {
+                    Objects: listedObjects.Contents.map(({ Key }) => ({ Key }))
+                }
+            }).promise();
+
+            // Récursivement, traiter d'autres pages d'objets si elles existent
+            //if (listedObjects.IsTruncated) await deleteDirectory();
+
+            console.log(`Le répertoire ${directoryPath} a été supprimé.`);
+            
+        } catch (error) {
+            console.error("Erreur lors de la suppression :", error);
+        }
+    }
+
 }

package/src/server/services/router/request/index.ts

@@ -44,7 +44,7 @@ export default class ServerRequest<
 
     // Requete
     public method: HttpMethod;
-    public ip: string;
+    public ip?: string;
     public locale: string;
     public domain: string;
     public headers: HttpHeaders = {};