firstly 0.0.8 → 0.0.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # firstly
 
+## 0.0.9
+
+### Patch Changes
+
+- [#43](https://github.com/jycouet/firstly/pull/43)
+  [`46cfc39`](https://github.com/jycouet/firstly/commit/46cfc39090fc448a22c5ca95e45507a31ab8e2e0)
+  Thanks [@jycouet](https://github.com/jycouet)! - better enum filter, grid action left/right, bump
+  deps, opti session check, action after createOptionWhenNoResult
+
 ## 0.0.8
 
 ### Patch Changes

package/esm/BaseEnum.d.ts

@@ -1,4 +1,3 @@
-import { type IdFilter } from 'remult';
 import type { FindOptionsBase, Repository } from 'remult';
 export type FF_Icon = {
     data?: string | string[];
@@ -21,24 +20,14 @@ export type BaseItem = BaseEnumOptions & {
 export type BaseEnumOptions<Entity = any> = {
     caption?: string;
     icon?: FF_Icon;
-    where?: IdFilter<Entity> | FindOptionsBase<Entity>['where'];
+    where?: FindOptionsBase<Entity>['where'];
     class?: string;
 };
 export declare class BaseEnum<Entity = any> {
     id: string;
     caption?: string;
     icon?: FF_Icon;
-    where?: IdFilter<Entity> | FindOptionsBase<Entity>['where'];
+    where?: FindOptionsBase<Entity>['where'];
     class?: string;
     constructor(_id: string | number, options?: BaseEnumOptions<Entity>);
-    getWhere: () => this | Entity[] | {
-        $ne?: Entity | Entity[] | undefined;
-        '!='?: Entity | Entity[] | undefined;
-        $in?: Entity[] | undefined;
-        $nin?: Entity[] | undefined;
-    } | {
-        $id: import("remult").ValueFilter<Entity extends {
-            id?: number | undefined;
-        } ? number : string>;
-    } | import("remult").EntityFilter<Entity> | NonNullable<Entity>;
 }

package/esm/BaseEnum.js

@@ -1,4 +1,3 @@
-import {} from 'remult';
 export class BaseEnum {
     id;
     caption;
@@ -15,7 +14,4 @@ export class BaseEnum {
             options.icon.caption = options?.caption;
         }
     }
-    getWhere = () => {
-        return this.where ? this.where : this;
-    };
 }

package/esm/api/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types=".pnpm/@sveltejs+kit@2.5.24_@sveltejs+vite-plugin-svelte@3.1.2_svelte@4.2.18_vite@5.4.1_@types+node@_lnml5jetshdinsnlj53joqxhde/node_modules/@sveltejs/kit" />
-import { type Handle, type MaybePromise, type RequestEvent } from '@sveltejs/kit';
+import type { Handle, RequestEvent } from '@sveltejs/kit';
 import { type ClassType } from 'remult';
 import type { RemultServerOptions } from 'remult/server';
 import { type MailOptions } from '../mail';
@@ -15,7 +15,7 @@ export type Module = {
     initRequest?: RemultServerOptions<RequestEvent>['initRequest'];
     handlePreRemult?: Handle;
     handlePosRemult?: Handle;
-    earlyReturn?: (input: Parameters<Handle>[0]) => MaybePromise<{
+    earlyReturn?: (input: Parameters<Handle>[0]) => Promise<{
         early: false;
         resolve?: undefined;
     } | {

package/esm/api/index.js

@@ -1,4 +1,3 @@
-import {} from '@sveltejs/kit';
 import nodemailer from 'nodemailer';
 import { remult } from 'remult';
 import { remultSveltekit } from 'remult/remult-sveltekit';
@@ -23,9 +22,10 @@ export const firstly = (o) => {
             error: o.error
                 ? o.error
                 : async (e) => {
-                    // if 500 we move to 501 to avoid the default retry mechanism
-                    if (e.httpStatusCode == 500) {
-                        e.sendError(501, e.responseBody);
+                    // REMULT P2: validation error should probably be 409
+                    // if 400 we move to 409
+                    if (e.httpStatusCode == 400) {
+                        e.sendError(409, e.responseBody);
                     }
                 },
             // Add user configuration

package/esm/auth/RoleHelpers.d.ts

@@ -9,4 +9,4 @@ export declare const mergeRoles: (existing: string[], newOnes: string[] | undefi
     roles: string[];
     changed: boolean;
 };
-export declare const initRoleFromEnv: (log: Log, userEntity: ClassType<FFAuthUser>, envValue: string | undefined, role: string) => Promise<void>;
+export declare const initRoleFromEnv: (log: Log, userEntity: ClassType<FFAuthUser>, envKey: string, role: string) => Promise<void>;

package/esm/auth/RoleHelpers.js

@@ -1,5 +1,6 @@
 import { repo } from 'remult';
 import { cyan, green, Log, yellow } from '@kitql/helpers';
+import { env } from '$env/dynamic/private';
 import { FFAuthUser } from './client/Entities';
 /**
  * will merge the roles and remove duplicates
@@ -16,7 +17,8 @@ export const mergeRoles = (existing, newOnes) => {
     }
     return { roles: Array.from(result), changed };
 };
-export const initRoleFromEnv = async (log, userEntity, envValue, role) => {
+export const initRoleFromEnv = async (log, userEntity, envKey, role) => {
+    const envValue = envKey ? env[envKey] : '';
     const identifiers = envValue === undefined ? [] : (envValue ?? '').split(',').map((c) => c.trim());
     for (let i = 0; i < identifiers.length; i++) {
         const identifier = identifiers[i].trim();
@@ -35,9 +37,9 @@ export const initRoleFromEnv = async (log, userEntity, envValue, role) => {
         }
     }
     if (identifiers.length > 0) {
-        log.info(`${cyan(role)}: ${identifiers.map((c) => green(c.trim())).join(', ')} added via ${yellow(`.env`)}.`);
+        log.info(`${cyan(envKey)}: ${identifiers.map((c) => green(c.trim())).join(', ')} added via ${yellow(`.env`)}.`);
     }
     else {
-        log.info(`${cyan(role)}: No users added via ${yellow(`.env`)}.`);
+        log.info(`${cyan(envKey)}: No users added via ${yellow(`.env`)}.`);
     }
 };

package/esm/auth/client/Auth.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { BackendMethod } from 'remult';
+import { Allow, BackendMethod } from 'remult';
 export class Auth {
     // Do not show for firstly users ?
     /** DO NOT USE */
@@ -104,7 +104,7 @@ __decorate([
     BackendMethod({ allowed: true })
 ], Auth, "signInDemo", null);
 __decorate([
-    BackendMethod({ allowed: true })
+    BackendMethod({ allowed: Allow.authenticated })
 ], Auth, "invite", null);
 __decorate([
     BackendMethod({ allowed: true })

package/esm/auth/client/Entities.d.ts

@@ -1,7 +1,7 @@
 import { BaseEnum } from '../..';
 import type { BaseEnumOptions } from '../..';
-export declare const FF_Auth_Role: {
-    readonly Admin: "FF_Auth_Role.Admin";
+export declare const FF_Role_Auth: {
+    readonly Admin: "FF_Role_Auth.Admin";
 };
 export declare class FFAuthUser {
     id: string;

package/esm/auth/client/Entities.js

@@ -7,8 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var FFAuthProvider_1;
 import { Fields, Relations, Validators, ValueListFieldType } from 'remult';
 import { BaseEnum, FF_Entity, FF_Role } from '../..';
-export const FF_Auth_Role = {
-    Admin: 'FF_Auth_Role.Admin',
+export const FF_Role_Auth = {
+    Admin: 'FF_Role_Auth.Admin',
 };
 let FFAuthUser = class FFAuthUser {
     id;
@@ -65,7 +65,7 @@ __decorate([
 ], FFAuthUser.prototype, "sessions", void 0);
 FFAuthUser = __decorate([
     FF_Entity('ff_auth.users', {
-        allowApiCrud: [FF_Auth_Role.Admin, FF_Role.Admin],
+        allowApiCrud: [FF_Role_Auth.Admin, FF_Role.Admin],
         caption: 'FF Auth - Users',
     })
 ], FFAuthUser);
@@ -118,7 +118,7 @@ __decorate([
 ], FFAuthAccount.prototype, "lastVerifiedAt", void 0);
 FFAuthAccount = __decorate([
     FF_Entity('ff_auth.accounts', {
-        allowApiCrud: [FF_Auth_Role.Admin, FF_Role.Admin],
+        allowApiCrud: [FF_Role_Auth.Admin, FF_Role.Admin],
         caption: 'FF Auth - Accounts',
         // id: { provider: true, userId: true },
         changeLog: {
@@ -149,7 +149,7 @@ __decorate([
 ], FFAuthUserSession.prototype, "user", void 0);
 FFAuthUserSession = __decorate([
     FF_Entity('ff_auth.users_sessions', {
-        allowApiCrud: [FF_Auth_Role.Admin, FF_Role.Admin],
+        allowApiCrud: [FF_Role_Auth.Admin, FF_Role.Admin],
         caption: 'FF Auth - Users sessions',
         changeLog: false,
     })

package/esm/auth/client/index.d.ts

@@ -2,6 +2,6 @@ import { Log } from '@kitql/helpers';
 import { Auth } from './Auth';
 import { FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession } from './Entities';
 export declare const logAuth: Log;
-export { FF_Auth_Role } from './Entities';
+export { FF_Role_Auth } from './Entities';
 export { Auth };
 export { FFAuthUser, FFAuthAccount, FFAuthProvider, FFAuthUserSession };

package/esm/auth/client/index.js

@@ -2,6 +2,6 @@ import { Log } from '@kitql/helpers';
 import { Auth } from './Auth';
 import { FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession } from './Entities';
 export const logAuth = new Log('firstly | auth');
-export { FF_Auth_Role } from './Entities';
+export { FF_Role_Auth } from './Entities';
 export { Auth };
 export { FFAuthUser, FFAuthAccount, FFAuthProvider, FFAuthUserSession };

package/esm/auth/index.d.ts

@@ -4,6 +4,7 @@ import type { ClassType, UserInfo } from 'remult';
 import type { Module } from '../api';
 import type { RecursivePartial, ResolvedType } from '../utils/types';
 import { FFAuthAccount, FFAuthUser, FFAuthUserSession } from './client/Entities';
+import { initRoleFromEnv } from './RoleHelpers';
 import type { firstlyData, firstlyDataAuth } from './types';
 export type { firstlyData };
 export type AuthorizationURLOptions = Record<string, {
@@ -129,6 +130,7 @@ export declare const getSafeOptions: () => {
  * _Info: index: -777_
  */
 export declare const auth: (o: AuthOptions) => Module;
+export { initRoleFromEnv };
 export declare let lucia: Lucia<Record<any, any>, UserInfo>;
 declare module 'lucia' {
     interface Register {

package/esm/auth/index.js

@@ -4,12 +4,11 @@ import { Lucia, TimeSpan } from 'lucia';
 import { remult } from 'remult';
 import { red } from '@kitql/helpers';
 import { getRelativePackagePath, read } from '@kitql/internals';
-import { env } from '$env/dynamic/private';
 import { FF_Role } from '../';
 import { RemultLuciaAdapter } from './Adapter';
 import { AuthControllerServer } from './AuthController.server';
 import { Auth, logAuth } from './client';
-import { FF_Auth_Role, FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession, } from './client/Entities';
+import { FF_Role_Auth, FFAuthAccount, FFAuthProvider, FFAuthUser, FFAuthUserSession, } from './client/Entities';
 import { createOrExtendSession } from './helper';
 import { initRoleFromEnv } from './RoleHelpers';
 export let AUTH_OPTIONS = { ui: {} };
@@ -24,7 +23,7 @@ const buildUrlOrDefault = (base, userSetting, fallback) => {
 };
 export const getSafeOptions = () => {
     const signUp = AUTH_OPTIONS.signUp ?? true;
-    const base = AUTH_OPTIONS.ui === false ? 'NO_BASE_PATH' : AUTH_OPTIONS.ui?.paths?.base ?? '/ff/auth';
+    const base = AUTH_OPTIONS.ui === false ? 'NO_BASE_PATH' : (AUTH_OPTIONS.ui?.paths?.base ?? '/ff/auth');
     const firstlyData = {
         module: 'auth',
         debug: AUTH_OPTIONS.debug,
@@ -150,14 +149,25 @@ export const auth = (o) => {
         entities: [oSafe.User, oSafe.Session, oSafe.Account],
         controllers: [Auth],
         initRequest: async (event) => {
-            // std session
-            const sessionId = event.cookies.get(lucia.sessionCookieName);
-            if (sessionId) {
-                const { session, user } = await lucia.validateSession(sessionId);
-                if (session && session.fresh) {
-                    await createOrExtendSession(session.id, session);
+            // REMULT: storing user in local should probably be done in remult directly
+            if (event?.locals?.user) {
+                // console.log('initRequest OK')
+                remult.user = event.locals.user;
+            }
+            else {
+                // console.log('initRequest WORK...')
+                // std session
+                const sessionId = event.cookies.get(lucia.sessionCookieName);
+                if (sessionId) {
+                    const { session, user } = await lucia.validateSession(sessionId);
+                    if (session && session.fresh) {
+                        await createOrExtendSession(session.id, session);
+                    }
+                    remult.user = user ?? undefined;
+                    if (event.locals) {
+                        event.locals.user = user ?? undefined;
+                    }
                 }
-                remult.user = user ?? undefined;
             }
         },
         earlyReturn: async ({ event, resolve }) => {
@@ -296,10 +306,11 @@ export const auth = (o) => {
             return { early: false };
         },
         initApi: async () => {
-            await initRoleFromEnv(logAuth, oSafe.User, env.FF_ADMIN, FF_Role.Admin);
-            await initRoleFromEnv(logAuth, oSafe.User, env.FF_AUTH_ADMIN, FF_Auth_Role.Admin);
+            await initRoleFromEnv(logAuth, oSafe.User, 'FF_ROLE_ADMIN', FF_Role.Admin);
+            await initRoleFromEnv(logAuth, oSafe.User, 'FF_ROLE_AUTH_ADMIN', FF_Role_Auth.Admin);
         },
     };
 };
+export { initRoleFromEnv };
 // Maybe moving this to /auth/server.ts would be better, people will be able to import from firstly all the time
 export let lucia;

package/esm/cellsBuildor.d.ts

@@ -1,10 +1,10 @@
 import type { SvelteComponent } from 'svelte';
-import { type EntityFilter, type FieldMetadata, type Repository } from 'remult';
+import { type ClassType, type EntityFilter, type FieldMetadata, type Repository } from 'remult';
 import type { UnArray } from './utils/types.js';
 export type VisibilityMode = 'view' | 'edit' | 'hide';
 type CellInternal<Entity> = {
     col?: keyof Entity;
-    kind?: 'field' | 'field_link' | 'entity_link' | 'slot' | 'header' | 'component';
+    kind?: 'field' | 'field_link' | 'entity_link' | 'slot' | 'header' | 'component' | 'baseItem';
     class?: string;
     header?: string;
     headerSlot?: boolean;
@@ -40,7 +40,7 @@ export declare function cellsBuildor<Entity>(repo: Repository<Entity>, inputBuil
 export declare function cellBuildor<Entity>(repo: Repository<Entity>, inputBuildor: UnArray<CellsInput<Entity>>): Cell<Entity>;
 export declare const fieldsOf: <Entity>(b: Cell<Entity>[]) => FieldMetadata<any, Entity>[];
 export declare const getPlaceholder: <Entity>(fields: FieldMetadata<any, Entity>[]) => string;
-export declare const buildSearchWhere: <Entity>(entity: Entity | undefined, fields: FieldMetadata<any, Entity>[], search?: string | null) => EntityFilter<Entity>[];
+export declare const buildSearchWhere: <Entity>(entity: ClassType<Entity> | undefined, fields: FieldMetadata<any, Entity>[], search?: string | null) => EntityFilter<Entity>[];
 export declare const containsWords: <Entity>(fields: FieldMetadata<any, Entity>[], search: string) => EntityFilter<Entity>;
-export declare const buildWhere: <Entity>(entity: Entity | undefined, defaultWhere: EntityFilter<Entity> | undefined, fields_filter: FieldMetadata<any, Entity>[], fields_search: FieldMetadata<any, Entity>[], obj: Record<string, string>) => EntityFilter<Entity>;
+export declare const buildWhere: <Entity>(entity: ClassType<Entity> | undefined, defaultWhere: EntityFilter<Entity> | undefined, fields_filter: FieldMetadata<any, Entity>[], fields_search: FieldMetadata<any, Entity>[], obj: Record<string, string>) => EntityFilter<Entity>;
 export {};

package/esm/cellsBuildor.js

@@ -77,7 +77,7 @@ export const buildSearchWhere = (entity, fields, search) => {
     return f;
 };
 export const containsWords = (fields, search) => {
-    const sSplitted = search.split(' ');
+    const sSplitted = search.split(' ').filter((s) => s.length > 0);
     if (fields.length === 1) {
         return {
             $and: sSplitted.map((s) => ({ [fields[0].key]: { $contains: s } })),
@@ -106,12 +106,25 @@ export const buildWhere = (entity, defaultWhere, fields_filter, fields_search, o
                 and.push({ [field.key]: obj[field.key] });
             }
             else if (field.inputType === 'selectEnum') {
+                const fnName = field.key + 'Filter';
                 // @ts-ignore
-                const theEnum = getEnum(field, obj[field.key]);
-                // Take the where of the enum if it exists, or it's using this selection as a filter
-                const wheretoUse = theEnum?.where ?? new BaseEnum(obj[field.key]);
-                // @ts-ignore
-                and.push({ [field.key]: wheretoUse });
+                if (entity && entity[fnName]) {
+                    // @ts-ignore
+                    and.push(entity[fnName](obj[field.key]));
+                }
+                else {
+                    // @ts-ignore
+                    const theEnum = getEnum(field, obj[field.key]);
+                    // Take the where of the enum if it exists, or it's using this selection as a filter
+                    if (theEnum?.where) {
+                        and.push(theEnum.where);
+                    }
+                    else {
+                        const wheretoUse = theEnum?.where ?? new BaseEnum(obj[field.key]);
+                        // @ts-ignore
+                        and.push({ [field.key]: wheretoUse });
+                    }
+                }
             }
             else if (rfi?.type === 'toOne') {
                 // @ts-ignore (setting the id of the relation)

package/esm/feedback/FeedbackController.js

@@ -21,13 +21,11 @@ async function getGitHub(query, variables) {
         const response = await fetch(GITHUB_GRAPHQL_ENDPOINT, { method: 'POST', headers, body });
         const result = await response.json();
         if (result.errors) {
-            /* eslint-disable */
             console.error(`result ERRORS`, body, stry(result));
         }
         return result.data;
     }
     catch (error) {
-        /* eslint-disable */
         console.error(`error`, error);
     }
     return null;

package/esm/feedback/ui/DialogIssue.svelte

@@ -83,11 +83,11 @@ const disableButton = (issueNumber2, title2, content2) => {
             ).toLocaleTimeString()}</time
           >
         </div>
-        <div class="chat-bubble">{@html item.bodyHTML}</div>
+        <div class="chat-bubble prose">{@html item.bodyHTML}</div>
         <!-- <div class="chat-footer opacity-50">Delivered</div> -->
       </div>
     {/each}
-    {#if issue?.highlight}
+    {#if issue?.highlight && issue.state === 'OPEN'}
       <span class="badge badge-warning">En attente de réponse de TA part 😉, oui 🫵!</span>
     {/if}
     {#if issueNumber}
@@ -106,15 +106,15 @@ const disableButton = (issueNumber2, title2, content2) => {
       ></Textarea>
       <div class="flex justify-between">
         {#if issueNumber}
-          <Button on:click={close} tabIndex={-1} class="btn-outline btn-error">
-            Clore le feedback
-          </Button>
+          <Button on:click={close} tabIndex={-1} class="btn-outline btn-error"
+            >Clore le feedback</Button
+          >
         {:else}
           <div></div>
         {/if}
-        <Button on:click={send} disabled={disableButton(issueNumber, title, content)}>
-          Envoyer
-        </Button>
+        <Button on:click={send} disabled={disableButton(issueNumber, title, content)}
+          >Envoyer</Button
+        >
       </div>
     {/if}
   {/if}

package/esm/helper.js

@@ -22,7 +22,8 @@ export const getEntityDisplayValue = (repo, row) => {
     }
     const field = getFirstInterestingField(repo);
     // REMULT P3 JYC: If it's an enum, it's not working...
-    return { caption: row ? field.displayValue(row) : '-', id: '' };
+    // @ts-ignore (added for row?.id)
+    return { caption: row ? field.displayValue(row) : '-', id: row?.id ? row.id : '' };
 };
 export const getFieldLinkDisplayValue = (field, row) => {
     const caption = field.displayValue(row);
@@ -89,7 +90,7 @@ export const displayWithDefaultAndSuffix = (field, value) => {
     }
     else {
         // toRet.push(value ?? '-')
-        toRet.push(field?.displayValue ? field?.displayValue({ [field.key]: value }) : value ?? '-');
+        toRet.push(field?.displayValue ? field?.displayValue({ [field.key]: value }) : (value ?? '-'));
     }
     if (value === undefined || value === null) {
         return '';

package/esm/index.d.ts

@@ -10,6 +10,7 @@ import { storeItem } from './storeItem.js';
 import { storeList } from './storeList.js';
 import { default as Button } from './ui/Button.svelte';
 import { default as Clipboardable } from './ui/Clipboardable.svelte';
+import type { dialog } from './ui/dialog/dialog.js';
 import { default as DialogManagement } from './ui/dialog/DialogManagement.svelte';
 import { default as FormEditAction } from './ui/dialog/FormEditAction.svelte';
 import { default as Field } from './ui/Field.svelte';
@@ -72,7 +73,11 @@ declare module 'remult' {
         href?: (item: entityType) => string;
         findOptionsForEdit?: ((entity: entityType) => FindOptionsBase<valueType>) | FindOptionsBase<valueType>;
         findOptionsLimit?: number;
-        createOptionWhenNoResult?: boolean;
+        createOptionWhenNoResult?: {
+            onCreateRequest: (item: entityType, strCreateNew: string) => Parameters<typeof dialog.form>;
+            onSuccess: (entity: entityType, newItem: any) => Promise<void>;
+            onError?: () => void;
+        };
         multiSelect?: boolean;
         skipForDefaultField?: boolean;
     }

package/esm/mail/index.js

@@ -14,16 +14,21 @@ export const mailInit = async (nodemailer, o) => {
     else {
         try {
             nodemailer.createTestAccount(globalOptions?.apiUrl ?? '', (err, account) => {
-                globalOptions = { ...globalOptions, from: account.user };
-                transporter = nodemailer.createTransport({
-                    host: account.smtp.host,
-                    port: account.smtp.port,
-                    secure: account.smtp.secure,
-                    auth: {
-                        user: account.user,
-                        pass: account.pass,
-                    },
-                });
+                if (account) {
+                    globalOptions = { ...globalOptions, from: account.user };
+                    transporter = nodemailer.createTransport({
+                        host: account.smtp.host,
+                        port: account.smtp.port,
+                        secure: account.smtp.secure,
+                        auth: {
+                            user: account.user,
+                            pass: account.pass,
+                        },
+                    });
+                }
+                else {
+                    log.error("Error nodemailer.createTestAccount() can't be done.");
+                }
             });
         }
         catch (error) {

package/esm/storeList.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="svelte" />
-import type { FindOptions, Repository } from 'remult';
+import type { FindOptions, GroupByOptions, MembersOnly, Repository } from 'remult';
 type TheStoreList<T> = {
     items: T[];
     loading: boolean;
     totalCount: number | undefined;
+    agg: any | undefined;
 };
 export type FF_FindOptions<T> = FindOptions<T> & {
     withCount?: boolean;
     withItems?: boolean;
+    aggregate?: GroupByOptions<T, (keyof MembersOnly<T>)[], any, any, any, any, any>;
 };
 /**
  * @param repo remult repository to listen to

package/esm/storeList.js

@@ -15,7 +15,7 @@ import { writable } from 'svelte/store';
  * $: browser && tasks.listen(data.options)
  * ```
  */
-export const storeList = (repo, initValues = { items: [], loading: true, totalCount: undefined }) => {
+export const storeList = (repo, initValues = { items: [], loading: true, totalCount: undefined, agg: undefined }) => {
     const { subscribe, set, update } = writable(initValues);
     let unSub = null;
     onDestroy(async () => {
@@ -43,27 +43,36 @@ export const storeList = (repo, initValues = { items: [], loading: true, totalCo
                     throw new Error(`xxx.fetch() withItems and withCount can't be both false!`);
                 }
                 else if (!withItems && withCount) {
-                    const totalCount = await repo.count(options?.where);
-                    set({ loading: false, items: [], totalCount });
+                    let optionsToUse = { where: options?.where };
+                    if (options?.aggregate) {
+                        optionsToUse = { ...options.aggregate, where: options?.where };
+                    }
+                    // const agg = await repo.aggregate({ ...options?.aggregate, where: options?.where })
+                    const agg = await repo.aggregate(optionsToUse);
+                    set({ loading: false, items: [], totalCount: agg.$count, agg });
                     if (onNewData) {
-                        onNewData(undefined, totalCount);
+                        onNewData(undefined, agg.$count);
                     }
                 }
                 else if (withItems && !withCount) {
                     const items = await repo.find(options);
-                    set({ loading: false, items, totalCount: undefined });
+                    set({ loading: false, items, totalCount: undefined, agg: undefined });
                     if (onNewData) {
                         onNewData(items, undefined);
                     }
                 }
                 else {
-                    const [items, totalCount] = await Promise.all([
+                    let optionsToUse = { where: options?.where };
+                    if (options?.aggregate) {
+                        optionsToUse = { ...options.aggregate, where: options?.where };
+                    }
+                    const [items, agg] = await Promise.all([
                         repo.find({ ...options }),
-                        repo.count(options?.where),
+                        repo.aggregate(optionsToUse),
                     ]);
-                    set({ loading: false, items, totalCount });
+                    set({ loading: false, items, totalCount: agg.$count, agg });
                     if (onNewData) {
-                        onNewData(items, totalCount);
+                        onNewData(items, agg.$count);
                     }
                 }
             }
@@ -75,7 +84,8 @@ export const storeList = (repo, initValues = { items: [], loading: true, totalCo
                     const withCount = options?.withCount ?? false;
                     let totalCount = undefined;
                     if (withCount) {
-                        totalCount = await repo.count(options?.where);
+                        const agg = await repo.aggregate({ where: options?.where });
+                        totalCount = agg.$count;
                     }
                     update((c) => {
                         return { ...c, items: info.items, loading: false, ...(withCount ? { totalCount } : {}) };

package/esm/ui/Field.svelte

@@ -101,7 +101,8 @@ const getLoadOptions = async (cellsValues2, str) => {
   );
   let totalCount = arr.length;
   if (totalCount === limit) {
-    totalCount = await metaTypeObj.repoTarget.count(findToUse.where);
+    const agg = await metaTypeObj.repoTarget.aggregate({ where: findToUse.where });
+    totalCount = agg.$count;
   }
   if (!cell.field?.options.multiSelect) {
     if (str === "" && getId() && !arr.find((r) => String(r.id) === String(getId()))) {
@@ -196,7 +197,7 @@ const calcSuffix = (value2) => {
         on:issue={(e) => {
           error = e.detail
         }}
-        createOptionWhenNoResult={cell.field?.options.createOptionWhenNoResult}
+        createOptionWhenNoResult={!!cell.field?.options.createOptionWhenNoResult}
         on:createRequest
       />
     {/if}
@@ -237,7 +238,12 @@ const calcSuffix = (value2) => {
         type="checkbox"
         {...{ ...common(cell.field), required: undefined }}
         class="checkbox"
-        bind:checked={value}
+        checked={value}
+        on:input={(e) => {
+          // @ts-ignore
+          value = e.target.checked
+          dispatchSelected(value)
+        }}
       />
     </div>
   {:else if metaType.subKind === 'text' || metaType.subKind === 'email' || metaType.subKind === 'password' || metaType.subKind === 'dateOnly' || metaType.subKind === 'number'}

package/esm/ui/FieldGroup.svelte

@@ -10,9 +10,11 @@ export let store;
 export let focusKey = null;
 const getError = (errors, field) => {
   const fo = getRelationFieldInfo(field);
-  const keyToUse = fo?.options?.field ?? field.key;
-  if (errors && errors[keyToUse]) {
+  const keyToUse = fo?.options?.field;
+  if (errors && keyToUse && errors[keyToUse]) {
     return errors[keyToUse];
+  } else if (errors && errors[field.key]) {
+    return errors[field.key];
   }
   return void 0;
 };

package/esm/ui/Grid.svelte

@@ -31,6 +31,7 @@ export let classes = {
 };
 export let orderBy = void 0;
 export let orderByCols = void 0;
+export let settingsLeft = false;
 export let dicoNoResult = "Aucun r\xE9sultat !";
 const dispatch = createEventDispatcher();
 const sorting = (toSort, b) => {
@@ -62,19 +63,55 @@ const sortingIcon = (toSort, b, _orderBy) => {
 const cellsToTake = (cells2) => {
   return cells2.filter((c) => c.modeView !== "hide");
 };
+const classForRounding = (i) => {
+  if (settingsLeft && (withEdit || withDelete || withAdd)) {
+    if (i === 0) {
+      return "";
+    } else if (i === cells.length - 1) {
+      return "rounded-tr-lg";
+    }
+  }
+  if (!settingsLeft && (withEdit || withDelete || withAdd)) {
+    if (i === 0) {
+      return "rounded-tl-lg";
+    } else if (i === cells.length - 1) {
+      return "";
+    }
+  }
+  if (i === 0) {
+    return "rounded-tl-lg";
+  } else if (i === cells.length - 1) {
+    return "rounded-tr-lg";
+  }
+};
 </script>
 
 <div class="overflow-x-auto">
   <table class="table {classes.table}">
     <thead>
       <tr>
+        {#if settingsLeft && (withEdit || withDelete || withAdd)}
+          <th class="rounded-tl-lg">
+            <div class="flex justify-start">
+              {#if !withAdd}
+                <Icon data={LibIcon_Settings}></Icon>
+              {:else}
+                <Button
+                  permission={store.getRepo().metadata.options.permissionApiInsert}
+                  disabled={!store.getRepo().metadata.apiInsertAllowed()}
+                  class="btn btn-square btn-ghost btn-xs"
+                  on:click={() => dispatch('add', {})}
+                >
+                  <Icon data={LibIcon_Add} />
+                </Button>
+              {/if}
+            </div>
+          </th>
+        {/if}
+
         {#each cellsToTake(cells) as b, i}
           {@const al = align(b.field, b.kind === 'slot')}
-          <th
-            class="{al} 
-									{i === 0 ? 'rounded-tl-lg' : ''}
-									{i === cells.length - 1 && !withEdit && !withDelete ? 'rounded-tr-lg' : ''}"
-          >
+          <th class="{al} {classForRounding(i)}">
             {#if b.headerSlot}
               <slot name="header" field={b.field} />
             {:else}
@@ -98,20 +135,22 @@ const cellsToTake = (cells2) => {
           </th>
         {/each}
 
-        {#if withEdit || withDelete || withAdd}
-          <th class="flex justify-end rounded-tr-lg">
-            {#if withAdd}
-              <Button
-                permission={store.getRepo().metadata.options.permissionApiInsert}
-                disabled={!store.getRepo().metadata.apiInsertAllowed()}
-                class="btn btn-square btn-ghost btn-xs"
-                on:click={() => dispatch('add', {})}
-              >
-                <Icon data={LibIcon_Add} />
-              </Button>
-            {:else}
-              <Icon data={LibIcon_Settings}></Icon>
-            {/if}
+        {#if !settingsLeft && (withEdit || withDelete || withAdd)}
+          <th class="rounded-tr-lg">
+            <div class="flex justify-end">
+              {#if withAdd}
+                <Button
+                  permission={store.getRepo().metadata.options.permissionApiInsert}
+                  disabled={!store.getRepo().metadata.apiInsertAllowed()}
+                  class="btn btn-square btn-ghost btn-xs"
+                  on:click={() => dispatch('add', {})}
+                >
+                  <Icon data={LibIcon_Add} />
+                </Button>
+              {:else}
+                <Icon data={LibIcon_Settings}></Icon>
+              {/if}
+            </div>
           </th>
         {/if}
       </tr>
@@ -123,6 +162,34 @@ const cellsToTake = (cells2) => {
       {:else}
         {#each $store.items as row}
           <tr on:click={() => dispatch('rowclick', row)} class="hover:bg-base-content/20">
+            <!-- BECARFULL THIS CODE IS DUPLICATED -->
+            {#if settingsLeft && (withEdit || withDelete)}
+              <td class="text-left">
+                <div class="flex justify-start gap-2">
+                  {#if withEdit}
+                    <Button
+                      permission={store.getRepo().metadata.options.permissionApiUpdate}
+                      disabled={!store.getRepo().metadata.apiUpdateAllowed()}
+                      class="btn btn-square btn-ghost btn-xs"
+                      on:click={() => dispatch('edit', row)}
+                    >
+                      <Icon data={LibIcon_Edit} />
+                    </Button>
+                  {/if}
+                  {#if withDelete}
+                    <Button
+                      permission={store.getRepo().metadata.options.permissionApiDelete}
+                      disabled={!store.getRepo().metadata.apiDeleteAllowed()}
+                      class="btn btn-square btn-ghost btn-xs"
+                      on:click={() => dispatch('delete', row)}
+                    >
+                      <Icon data={LibIcon_Delete} />
+                    </Button>
+                  {/if}
+                </div>
+              </td>
+            {/if}
+
             {#each cellsToTake(cells) as b}
               {@const metaType = getFieldMetaType(b.field)}
               <td class={align(b.field, b.kind === 'slot')}>
@@ -153,6 +220,8 @@ const cellsToTake = (cells2) => {
                       href: b.field?.options?.href ? b.field?.options.href(row) : item?.href,
                     }}
                   />
+                {:else if b.kind === 'baseItem'}
+                  <LinkPlus item={row[metaType.field.key]} />
                 {:else if b.kind === 'field_link'}
                   {@const item = getFieldLinkDisplayValue(metaType.field, row)}
                   <LinkPlus {item} />
@@ -191,7 +260,8 @@ const cellsToTake = (cells2) => {
                 {/if}
               </td>
             {/each}
-            {#if withEdit || withDelete}
+
+            {#if !settingsLeft && (withEdit || withDelete)}
               <td class="text-right">
                 <div class="flex justify-end gap-2">
                   {#if withEdit}

package/esm/ui/Grid.svelte.d.ts

@@ -15,6 +15,7 @@ declare class __sveltets_Render<T extends Record<any, any>> {
         } | undefined;
         orderBy?: EntityOrderBy<T> | undefined;
         orderByCols?: true | (keyof T)[] | undefined;
+        settingsLeft?: boolean | undefined;
         dicoNoResult?: string | undefined;
     };
     events(): {

package/esm/ui/GridPaginate.svelte

@@ -24,9 +24,11 @@ $: canGoNext = isValidValue && needPaginate && pageDisplayed < Math.ceil((totalC
 </script>
 
 <FieldContainer {label} forId="paginate" classes={{ label: 'justify-end' }}>
-  <div class="flex items-center justify-end">
+  <div class="flex w-36 items-center justify-end">
     {#if totalCount === undefined}
-      <Loading class="mx-2 h-8 w-1/2"></Loading>
+      <Loading class="ml-6 mr-2 h-3 w-1/6"></Loading>
+      <Loading class="mx-2 h-4 w-1/2"></Loading>
+      <Loading class="mx-2 h-3 w-1/6"></Loading>
     {:else if !needPaginate}
       <span class="text-primary justify-end px-2 font-bold">
         {totalCount}
@@ -36,7 +38,7 @@ $: canGoNext = isValidValue && needPaginate && pageDisplayed < Math.ceil((totalC
         <button
           aria-label="left"
           on:click={() => update('-')}
-          class="btn join-item {pageDisplayed === 1 ? 'btn-disabled' : ''}"
+          class="btn join-item p-1 {pageDisplayed === 1 ? 'btn-disabled' : ''}"
         >
           <Icon data={LibIcon_ChevronLeft} />
         </button>
@@ -53,7 +55,7 @@ $: canGoNext = isValidValue && needPaginate && pageDisplayed < Math.ceil((totalC
         <button
           aria-label="right"
           on:click={() => update('+')}
-          class="btn join-item {!canGoNext ? 'btn-disabled' : ''}"
+          class="btn join-item p-1 {!canGoNext ? 'btn-disabled' : ''}"
         >
           <Icon data={LibIcon_ChevronRight} />
         </button>

package/esm/ui/dialog/DialogPrimitive.svelte

@@ -40,11 +40,7 @@ function dispatchChange(_data) {
     />
     <div
       class={tw(
-        `border-base-content/60
-         bg-base-100
-			   relative z-40 max-h-[90vh] overflow-visible rounded-xl
-			   border p-6
-         shadow-lg`,
+        `border-base-content/60 bg-base-100 relative z-40 max-h-[90vh] overflow-visible rounded-xl border p-6 shadow-lg`,
         classes.root,
       )}
       transition:flyAndScale={{

package/esm/ui/dialog/dialog.d.ts

@@ -29,6 +29,15 @@ type ResultClose<entityType = any> = {
     item?: entityType;
 };
 export type DialogType = 'custom' | 'confirm' | 'confirmDelete' | 'insert' | 'update' | 'view';
+export type DialogFormType<entityType> = {
+    cells?: CellsInput<entityType>;
+    defaults?: Partial<entityType>;
+    classes?: DialogClasses;
+    noThrow?: boolean;
+    wDelete?: boolean;
+    topicPrefixText?: string;
+    focusKey?: string;
+};
 export type DialogMetaDataInternal<entityType = any> = DialogMetaData<entityType> & {
     id: number;
     type: DialogType;
@@ -37,14 +46,7 @@ export type DialogMetaDataInternal<entityType = any> = DialogMetaData<entityType
 export declare const dialog: {
     confirm: (topic: string, text: string, icon?: string) => Promise<ResultClose<any>>;
     confirmDelete: (topic: string) => Promise<ResultClose<any>>;
-    form: <entityType>(type: 'insert' | 'update' | 'view', topic: string, repo: Repository<entityType>, cells: CellsInput<entityType>, options?: {
-        defaults?: Partial<entityType>;
-        classes?: DialogClasses;
-        noThrow?: boolean;
-        wDelete?: boolean;
-        topicPrefixText?: string;
-        focusKey?: string;
-    }) => Promise<ResultClose<any>>;
+    form: <entityType>(type: 'insert' | 'update' | 'view', topic: string, repo: Repository<entityType>, settings: DialogFormType<entityType>) => Promise<ResultClose<any>>;
     show: (dialog: DialogMetaData) => Promise<ResultClose<any>>;
     close: (id: number, result: ResultClose) => void;
     closeAll: () => void;

package/esm/ui/dialog/dialog.js

@@ -42,10 +42,9 @@ const createDialogManagement = () => {
             };
             return show(detail, 'confirmDelete');
         },
-        // FIXME JYC: refactor this (no need repo? options?)
-        form: (type, topic, repo, cells, options) => {
-            const topicPrefixText = options?.topicPrefixText
-                ? options?.topicPrefixText + ' '
+        form: (type, topic, repo, settings) => {
+            const topicPrefixText = settings?.topicPrefixText
+                ? settings?.topicPrefixText + ' '
                 : type === 'insert'
                     ? `Créer `
                     : type === 'update'
@@ -60,12 +59,12 @@ const createDialogManagement = () => {
                 },
                 repo,
                 // store,
-                cells,
-                defaults: options?.defaults,
-                classes: options?.classes,
-                noThrow: options?.noThrow,
-                wDelete: options?.wDelete,
-                focusKey: options?.focusKey,
+                cells: settings.cells ?? [],
+                defaults: settings?.defaults,
+                classes: settings?.classes,
+                noThrow: settings?.noThrow,
+                wDelete: settings?.wDelete,
+                focusKey: settings?.focusKey,
                 topicPrefixText,
             };
             return show(detail, type);

package/esm/ui/internals/Input.svelte

@@ -20,7 +20,7 @@ const debounce = (fn) => {
 };
 function dispatchInput(value2) {
   if ($$restProps.type === "date") {
-    if (value2) {
+    if (value2 || value2 === null) {
       dispatch("input", { value: transformDate(value2) });
     }
   } else {
@@ -37,6 +37,12 @@ const handleInput = (e) => {
     } else {
       value = target.value.toString().replaceAll(",", ".");
     }
+  } else if ($$restProps.type === "date") {
+    if (target.value === "") {
+      value = null;
+    } else {
+      value = target.value;
+    }
   } else {
     value = target.value;
   }
@@ -49,6 +55,9 @@ const handleInput = (e) => {
   }
 };
 const transformDate = (input) => {
+  if (input === null) {
+    return null;
+  }
   const rawDateSplited = input.split("-");
   if (rawDateSplited.length === 3) {
     const yearSplited = rawDateSplited[0].split("");

package/esm/ui/link/LinkPlus.svelte

@@ -1,44 +1,56 @@
-<script>import { tw } from "../..";
+<script>import {} from "../..";
 import Icon from "../Icon.svelte";
 import Tooltip from "../Tooltip.svelte";
 import Link from "./Link.svelte";
 export let item;
 export let noIcon = false;
 export let captionSubStyle = "under";
+const hasSomethingToDisplay = (item2) => {
+  if (item2.href) {
+    return true;
+  }
+  if (item2.caption) {
+    return true;
+  }
+  return false;
+};
 </script>
 
 <div class="flex items-center gap-4">
   {#if item}
     {#if item.icon?.data && !noIcon}
-      <Tooltip text={item.icon.caption}>
-        <Icon
-          data={item.icon.data}
-          class={tw('flex-shrink-0', item.icon.class)}
-          size={item.icon.size}
-        />
-      </Tooltip>
-    {/if}
-    <div class="flex flex-col items-start">
-      {#if item.href}
-        <div>
-          <Link href={item.href}>{item.caption}</Link>
-          {#if item.captionSub && captionSubStyle === 'inline'}
-            <span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
-          {/if}
-        </div>
+      {#if item.icon.caption}
+        <Tooltip text={item.icon.caption}>
+          <Icon {...item.icon} />
+        </Tooltip>
       {:else}
-        <!-- 20 is a cool value ! -->
-        <span
-          class="text-base-content {item.class} {(item.caption ?? '').length < 20
-            ? 'text-nowrap'
-            : ''}"
-        >
-          {item.caption ?? '-'}
-        </span>
-      {/if}
-      {#if item.captionSub && captionSubStyle === 'under'}
-        <span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
+        <Icon {...item.icon} />
       {/if}
-    </div>
+    {/if}
+
+    {#if hasSomethingToDisplay(item)}
+      <div class="flex flex-col items-start">
+        {#if item.href}
+          <div>
+            <Link href={item.href}>{item.caption}</Link>
+            {#if item.captionSub && captionSubStyle === 'inline'}
+              <span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
+            {/if}
+          </div>
+        {:else}
+          <!-- 20 is a cool value ! -->
+          <span
+            class="text-base-content {item.class} {(item.caption ?? '').length < 20
+              ? 'text-nowrap'
+              : ''}"
+          >
+            {item.caption ?? '-'}
+          </span>
+        {/if}
+        {#if item.captionSub && captionSubStyle === 'under'}
+          <span class="text-base-content/70 text-xs italic">{item.captionSub}</span>
+        {/if}
+      </div>
+    {/if}
   {/if}
 </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firstly",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "description": "Firstly, an opinionated Remult setup!",
   "repository": {
@@ -14,7 +14,7 @@
   },
   "peerDependencies": {
     "@sveltejs/kit": ">=1.0.0 <3.0.0",
-    "remult": "0.27.7",
+    "remult": "0.27.19",
     "svelte": ">=4.2.18"
   },
   "dependencies": {
@@ -26,7 +26,7 @@
     "arctic": "^1.8.0",
     "clsx": "^2.1.1",
     "cron": "^3.1.7",
-    "daisyui": "^4.10.3",
+    "daisyui": "^4.12.10",
     "esm-env": "^1.0.0",
     "lucia": "^3.2.0",
     "nodemailer": "^6.9.13",