firstly 0.0.12 → 0.0.14

package/esm/cellsBuildor.js

@@ -99,7 +99,7 @@ export const buildWhere = (entity, defaultWhere, fields_filter, fields_search, o
     }
     for (const field of fields_filter) {
         // if there is a value
-        if (obj[field.key]) {
+        if (obj && obj[field.key]) {
             const rfi = getRelationFieldInfo(field);
             if (field.inputType === 'checkbox') {
                 // @ts-ignore

package/esm/common.d.ts

@@ -0,0 +1,5 @@
+import { Log } from '@kitql/helpers';
+export declare const ff_Log: Log;
+export declare const FF_Role: {
+    readonly FF_Role_Admin: "FF_Role.Admin";
+};

package/esm/common.js

@@ -0,0 +1,8 @@
+// ******************************
+// Objects
+import { Log } from '@kitql/helpers';
+// ******************************
+export const ff_Log = new Log('firstly');
+export const FF_Role = {
+    FF_Role_Admin: 'FF_Role.Admin',
+};

package/esm/cron/server/index.js

@@ -58,7 +58,7 @@ export const cron = (jobsInfos) => {
         l.push(message);
         if (with_metadata) {
             // If the job is "stopped", there will still be a next date, but it will not fire it. The job has to start.
-            l.push(`(${job.running ? green('running') : red('stopped')}, next at ${yellow(job.nextDate().toISO())})`);
+            l.push(`(${job.isActive ? green('running') : red('stopped')}, next at ${yellow(job.nextDate().toISO())})`);
         }
         if (isSuccess) {
             m.log.success(l.join(' '));

package/esm/feedback/FeedbackController.js

@@ -6,32 +6,35 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Allow, BackendMethod, EntityError, remult } from 'remult';
 import { stry } from '@kitql/helpers';
-import { FEEDBACK_OPTIONS } from './server';
-const GITHUB_GRAPHQL_ENDPOINT = 'https://api.github.com/graphql';
 async function getGitHub(query, variables) {
-    if (!FEEDBACK_OPTIONS.GITHUB_API_TOKEN) {
-        throw new EntityError({ message: 'GITHUB_API_TOKEN not found in .env' });
-    }
-    try {
-        const headers = new Headers({
-            Authorization: 'Bearer ' + FEEDBACK_OPTIONS.GITHUB_API_TOKEN,
-            'Content-Type': 'application/json',
-        });
-        const body = stry({ query, variables }, 0);
-        const response = await fetch(GITHUB_GRAPHQL_ENDPOINT, { method: 'POST', headers, body });
-        const result = await response.json();
-        if (result.errors) {
-            console.error(`result ERRORS`, body, stry(result));
+    if (import.meta.env.SSR) {
+        if (!remult.context.feedbackOptions.GITHUB_API_TOKEN) {
+            console.error(`GITHUB_API_TOKEN not found in .env`);
+            throw new EntityError({ message: 'Feedback module not well configured' });
+        }
+        try {
+            const headers = new Headers({
+                Authorization: 'Bearer ' + remult.context.feedbackOptions.GITHUB_API_TOKEN,
+                'Content-Type': 'application/json',
+            });
+            const body = stry({ query, variables }, 0);
+            const GITHUB_GRAPHQL_ENDPOINT = 'https://api.github.com/graphql';
+            const response = await fetch(GITHUB_GRAPHQL_ENDPOINT, { method: 'POST', headers, body });
+            const result = await response.json();
+            if (result.errors) {
+                console.error(`result ERRORS`, body, stry(result));
+            }
+            return result.data;
+        }
+        catch (error) {
+            console.error(`error`, error);
         }
-        return result.data;
-    }
-    catch (error) {
-        console.error(`error`, error);
     }
     return null;
 }
 async function addMetaData(issueId, author, page) {
-    const commentToMinimize = await getGitHub(`mutation AddComment($input: AddCommentInput!) {
+    if (import.meta.env.SSR) {
+        const commentToMinimize = await getGitHub(`mutation AddComment($input: AddCommentInput!) {
 			addComment(input: $input) {
 				commentEdge {
 					node {
@@ -41,12 +44,12 @@ async function addMetaData(issueId, author, page) {
 			}
 		}
 		`, {
-        input: {
-            subjectId: issueId,
-            body: `<pre>\n${JSON.stringify({ author, page }, null, 2)}\n</pre>`,
-        },
-    });
-    await getGitHub(`mutation MinimizeComment($input: MinimizeCommentInput!) {
+            input: {
+                subjectId: issueId,
+                body: `<pre>\n${JSON.stringify({ author, page }, null, 2)}\n</pre>`,
+            },
+        });
+        await getGitHub(`mutation MinimizeComment($input: MinimizeCommentInput!) {
 			minimizeComment(input: $input) {
 				minimizedComment {
 					isMinimized
@@ -54,11 +57,12 @@ async function addMetaData(issueId, author, page) {
 			}
 		}
 		`, {
-        input: {
-            subjectId: commentToMinimize.addComment.commentEdge.node.id,
-            classifier: 'OFF_TOPIC',
-        },
-    });
+            input: {
+                subjectId: commentToMinimize.addComment.commentEdge.node.id,
+                classifier: 'OFF_TOPIC',
+            },
+        });
+    }
 }
 export class FeedbackController {
     static async getMilestones() {
@@ -83,14 +87,16 @@ export class FeedbackController {
 			}
 		}
 		`, {
-            repository: FEEDBACK_OPTIONS.repo.name,
-            owner: FEEDBACK_OPTIONS.repo.owner,
-            filter: FEEDBACK_OPTIONS.milestones?.title_filter ?? '',
+            repository: remult.context.feedbackOptions.repo.name,
+            owner: remult.context.feedbackOptions.repo.owner,
+            filter: remult.context.feedbackOptions.milestones?.title_filter ?? '',
         });
         return data.repository.milestones.nodes.map((c) => {
             return {
                 ...c,
-                title: c.title.replaceAll(FEEDBACK_OPTIONS.milestones?.title_filter ?? '', '').trim(),
+                title: c.title
+                    .replaceAll(remult.context.feedbackOptions.milestones?.title_filter ?? '', '')
+                    .trim(),
             };
         });
     }
@@ -126,18 +132,18 @@ export class FeedbackController {
 				}
 			}			
 		`, {
-            repository: FEEDBACK_OPTIONS.repo.name,
-            owner: FEEDBACK_OPTIONS.repo.owner,
+            repository: remult.context.feedbackOptions.repo.name,
+            owner: remult.context.feedbackOptions.repo.owner,
             milestoneNumber,
             filters: {
-                labels: FEEDBACK_OPTIONS.milestones?.labels_filters ?? [],
+                labels: remult.context.feedbackOptions.milestones?.labels_filters ?? [],
                 states: [issueState],
             },
             issueOrder,
         });
         return data.repository.milestone.issues.nodes.map((issue) => {
-            const hasWaitingForAnswerLabel = FEEDBACK_OPTIONS.highlight_label
-                ? issue.labels.nodes.some((label) => label.name.includes(FEEDBACK_OPTIONS.highlight_label))
+            const hasWaitingForAnswerLabel = remult.context.feedbackOptions.highlight_label
+                ? issue.labels.nodes.some((label) => label.name.includes(remult.context.feedbackOptions.highlight_label))
                 : false;
             return {
                 id: issue.id,
@@ -181,8 +187,8 @@ export class FeedbackController {
 				}
 			}
 		`, {
-            repository: FEEDBACK_OPTIONS.repo.name,
-            owner: FEEDBACK_OPTIONS.repo.owner,
+            repository: remult.context.feedbackOptions.repo.name,
+            owner: remult.context.feedbackOptions.repo.owner,
             issueNumber,
         });
         const items = [];
@@ -200,8 +206,7 @@ export class FeedbackController {
                 items[items.length - 1].public = true;
             }
             else {
-                const nbEye = comments[i].reactionGroups.find((c) => c.content === 'EYES')?.reactors
-                    .totalCount;
+                const nbEye = comments[i].reactionGroups.find((c) => c.content === 'EYES')?.reactors.totalCount;
                 items.push({
                     bodyHTML: comments[i].bodyHTML,
                     createdAt: new Date(comments[i].createdAt),
@@ -209,8 +214,8 @@ export class FeedbackController {
                 });
             }
         }
-        const hasWaitingForAnswerLabel = FEEDBACK_OPTIONS.highlight_label
-            ? data.repository.issue.labels.nodes.some((label) => label.name.includes(FEEDBACK_OPTIONS.highlight_label))
+        const hasWaitingForAnswerLabel = remult.context.feedbackOptions.highlight_label
+            ? data.repository.issue.labels.nodes.some((label) => label.name.includes(remult.context.feedbackOptions.highlight_label))
             : false;
         const toRet = {
             id: data.repository.issue.id,
@@ -236,11 +241,11 @@ export class FeedbackController {
           }
 				}
 			}`, {
-            repository: FEEDBACK_OPTIONS.repo.name,
-            owner: FEEDBACK_OPTIONS.repo.owner,
+            repository: remult.context.feedbackOptions.repo.name,
+            owner: remult.context.feedbackOptions.repo.owner,
         });
         const repoInfoData = repoInfo.repository;
-        const create_label = repoInfoData.labels.nodes.find((c) => c.name === FEEDBACK_OPTIONS.create_label);
+        const create_label = repoInfoData.labels.nodes.find((c) => c.name === remult.context.feedbackOptions.create_label);
         const newIssue = await getGitHub(`mutation CreateIssue($input: CreateIssueInput!) {
 			createIssue(input: $input) {
 				issue {
@@ -269,8 +274,8 @@ export class FeedbackController {
         };
         const inputIssue = {
             id: issueId,
-            labelIds: (FEEDBACK_OPTIONS.highlight_label
-                ? labels.filter((c) => c.name !== FEEDBACK_OPTIONS.highlight_label)
+            labelIds: (remult.context.feedbackOptions.highlight_label
+                ? labels.filter((c) => c.name !== remult.context.feedbackOptions.highlight_label)
                 : labels).map((c) => c.id),
         };
         await getGitHub(`mutation AddComment($inputComment: AddCommentInput!, $inputIssue: UpdateIssueInput!) {
@@ -300,8 +305,8 @@ export class FeedbackController {
         };
         const inputIssue = {
             id: issueId,
-            labelIds: (FEEDBACK_OPTIONS.highlight_label
-                ? labels.filter((c) => c.name !== FEEDBACK_OPTIONS.highlight_label)
+            labelIds: (remult.context.feedbackOptions.highlight_label
+                ? labels.filter((c) => c.name !== remult.context.feedbackOptions.highlight_label)
                 : labels).map((c) => c.id),
         };
         await getGitHub(`mutation CloseIssue($inputIssue: UpdateIssueInput!, $inputClose: CloseIssueInput!) {

package/esm/feedback/server/index.d.ts

@@ -1,17 +1,8 @@
 import { Module } from '../../api';
-type FeedbackOptions = {
-    GITHUB_API_TOKEN: string;
-    repo: {
-        owner: string;
-        name: string;
-    };
-    milestones?: {
-        title_filter?: string;
-        labels_filters?: string[];
-    };
-    highlight_label?: string;
-    create_label?: string;
-};
-export declare let FEEDBACK_OPTIONS: FeedbackOptions;
+import type { FeedbackOptions } from '../types';
 export declare const feedback: (o: FeedbackOptions) => Module;
-export {};
+declare module 'remult' {
+    interface RemultContext {
+        feedbackOptions: FeedbackOptions;
+    }
+}

package/esm/feedback/server/index.js

@@ -1,13 +1,12 @@
+import { remult } from 'remult';
 import { Module } from '../../api';
 import { FeedbackController } from '../FeedbackController';
-export let FEEDBACK_OPTIONS = {
-    GITHUB_API_TOKEN: '',
-    repo: { owner: '', name: '' },
-};
 export const feedback = (o) => {
-    FEEDBACK_OPTIONS = o;
     return new Module({
         name: 'feedback',
         controllers: [FeedbackController],
+        initRequest: async (kitEvent, op) => {
+            remult.context.feedbackOptions = o;
+        },
     });
 };

package/esm/feedback/types.d.ts

@@ -0,0 +1,14 @@
+export type FeedbackOptions = {
+    GITHUB_API_TOKEN: string;
+    repo: {
+        owner: string;
+        name: string;
+    };
+    milestones?: {
+        title_filter?: string;
+        labels_filters?: string[];
+    };
+    highlight_label?: string;
+    create_label?: string;
+};
+export declare const FEEDBACK_OPTIONS: FeedbackOptions;

package/esm/feedback/types.js

@@ -0,0 +1,4 @@
+export const FEEDBACK_OPTIONS = {
+    GITHUB_API_TOKEN: '',
+    repo: { owner: '', name: '' },
+};

package/esm/feedback/ui/DialogIssue.svelte

@@ -1,123 +1,135 @@
-<script>import { onMount } from "svelte";
-import { repo } from "remult";
-import { page } from "$app/stores";
-import { FeedbackController } from "..";
-import { Button, cellBuildor, Field, FilterEntity, Loading } from "../..";
-import Textarea from "../../ui/internals/Textarea.svelte";
-export let dialogId;
-const rmvWarning = dialogId;
-export let milestoneId;
-export let issueNumber;
-let state = "loading";
-let issue;
-const update = async () => {
-  state = "loading";
-  if (issueNumber) {
-    issue = await FeedbackController.getIssue(issueNumber);
-  }
-  state = "done";
-};
-onMount(async () => {
-  await update();
-});
-let title;
-let content;
-const send = async () => {
-  state = "loading";
-  const p = $page.url.pathname + $page.url.search;
-  if (!issue?.id) {
-    const result = await FeedbackController.createIssue(milestoneId, title, content, p);
-    issueNumber = result.number;
-  } else {
-    await FeedbackController.addCommentOnIssue(issue.id, content, p, issue.labels);
-  }
-  content = "";
-  await update();
-  state = "done";
-};
-const close = async () => {
-  state = "loading";
-  await FeedbackController.close(issue.id, issue.labels);
-  content = "";
-  await update();
-  state = "done";
-};
-const reOpen = async () => {
-  state = "loading";
-  await FeedbackController.reOpen(issue.id);
-  content = "";
-  await update();
-  state = "done";
-};
-const disableButton = (issueNumber2, title2, content2) => {
-  if (issueNumber2) {
-    if (content2?.length > 2) {
-      return false;
-    }
-  }
-  if (title2?.length > 2 && content2?.length > 2) {
-    return false;
-  }
-  return true;
-};
+<script lang="ts">
+	import { onMount } from 'svelte'
+
+	import { repo } from 'remult'
+
+	import { page } from '$app/stores'
+
+	import { FeedbackController } from '..'
+	import { Button, cellBuildor, Field, FilterEntity, Loading, type ResolvedType } from '../..'
+	import Textarea from '../../ui/internals/Textarea.svelte'
+
+	export let dialogId: number
+	const rmvWarning = dialogId
+
+	export let milestoneId: string
+	export let issueNumber: number | null
+
+	let state: 'loading' | 'done' = 'loading'
+
+	let issue: ResolvedType<ReturnType<typeof FeedbackController.getIssue>> | undefined
+
+	const update = async () => {
+		state = 'loading'
+		if (issueNumber) {
+			issue = await FeedbackController.getIssue(issueNumber)
+		}
+		state = 'done'
+	}
+
+	onMount(async () => {
+		await update()
+	})
+
+	let title: ''
+	let content: ''
+	const send = async () => {
+		state = 'loading'
+
+		const p = $page.url.pathname + $page.url.search
+		if (!issue?.id) {
+			const result = await FeedbackController.createIssue(milestoneId, title, content, p)
+			issueNumber = result.number
+		} else {
+			await FeedbackController.addCommentOnIssue(issue.id, content, p, issue.labels)
+		}
+
+		content = ''
+		await update()
+		state = 'done'
+	}
+
+	const close = async () => {
+		state = 'loading'
+		await FeedbackController.close(issue!.id, issue!.labels)
+		content = ''
+		await update()
+		state = 'done'
+	}
+
+	const reOpen = async () => {
+		state = 'loading'
+		await FeedbackController.reOpen(issue!.id)
+		content = ''
+		await update()
+		state = 'done'
+	}
+
+	const disableButton = (issueNumber: number | null, title: string, content: string) => {
+		if (issueNumber) {
+			if (content?.length > 2) {
+				return false
+			}
+		}
+		if (title?.length > 2 && content?.length > 2) {
+			return false
+		}
+		return true
+	}
 </script>
 
 <div class="mb-4 grid gap-4">
-  {#if state === 'loading'}
-    <Loading class="h-12"></Loading>
-    <Loading class="h-12"></Loading>
-    <Loading class="h-12"></Loading>
-  {:else}
-    {#each issue?.items ?? [] as item}
-      <div class="chat {item.who ? 'chat-start' : 'chat-end'}">
-        <div class="avatar chat-image">
-          <div class="w-10 rounded-full">
-            <div class="h-10 w-10 {item.who ? 'bg-primary' : 'bg-secondary'}"></div>
-          </div>
-        </div>
-        <div class="chat-header">
-          {item.who ?? 'Support'}
-          <time class="text-xs opacity-50"
-            >{new Date(item.createdAt).toLocaleDateString()} - {new Date(
-              item.createdAt,
-            ).toLocaleTimeString()}</time
-          >
-        </div>
-        <div class="chat-bubble prose">{@html item.bodyHTML}</div>
-        <!-- <div class="chat-footer opacity-50">Delivered</div> -->
-      </div>
-    {/each}
-    {#if issue?.highlight && issue.state === 'OPEN'}
-      <span class="badge badge-warning">En attente de réponse de TA part 😉, oui 🫵!</span>
-    {/if}
-    {#if issueNumber}
-      <button on:click={update} aria-label="Actualiser" class="divider"></button>
-    {/if}
-
-    {#if issue?.state === 'CLOSED'}
-      <div class="flex justify-end">
-        <Button on:click={reOpen} class="btn-neutral">Re Ouvrir</Button>
-      </div>
-    {:else}
-      {#if issueNumber === null}
-        <Field cell={cellBuildor(repo(FilterEntity), 'title')} bind:value={title} />
-      {/if}
-      <Textarea
-        bind:value={content}
-        placeholder="Un peu de détail c'est pas mal... Fais toi Plaiz' (Tu as même le droit d'utiliser le format markdown!)"
-      ></Textarea>
-      <div class="flex justify-between">
-        {#if issueNumber}
-          <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
-        >
-      </div>
-    {/if}
-  {/if}
+	{#if state === 'loading'}
+		<Loading class="h-12"></Loading>
+		<Loading class="h-12"></Loading>
+		<Loading class="h-12"></Loading>
+	{:else}
+		{#each issue?.items ?? [] as item}
+			<div class="chat {item.who ? 'chat-start' : 'chat-end'}">
+				<div class="avatar chat-image">
+					<div class="w-10 rounded-full">
+						<div class="h-10 w-10 {item.who ? 'bg-primary' : 'bg-secondary'}"></div>
+					</div>
+				</div>
+				<div class="chat-header">
+					{item.who ?? 'Support'}
+					<time class="text-xs opacity-50"
+						>{new Date(item.createdAt).toLocaleDateString()} - {new Date(
+							item.createdAt,
+						).toLocaleTimeString()}</time
+					>
+				</div>
+				<div class="chat-bubble prose">{@html item.bodyHTML}</div>
+				<!-- <div class="chat-footer opacity-50">Delivered</div> -->
+			</div>
+		{/each}
+		{#if issue?.highlight && issue.state === 'OPEN'}
+			<span class="badge badge-warning">En attente de réponse de TA part 😉, oui 🫵!</span>
+		{/if}
+		{#if issueNumber}
+			<button on:click={update} aria-label="Actualiser" class="divider"></button>
+		{/if}
+
+		{#if issue?.state === 'CLOSED'}
+			<div class="flex justify-end">
+				<Button on:click={reOpen} class="btn-neutral">Re Ouvrir</Button>
+			</div>
+		{:else}
+			{#if issueNumber === null}
+				<Field cell={cellBuildor(repo(FilterEntity), 'title')} bind:value={title} />
+			{/if}
+			<Textarea
+				bind:value={content}
+				placeholder="Un peu de détail c'est pas mal... Fais toi Plaiz' (Tu as même le droit d'utiliser le format markdown!)"
+			></Textarea>
+			<div class="flex justify-between">
+				{#if issueNumber}
+					<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>
+			</div>
+		{/if}
+	{/if}
 </div>

package/esm/feedback/ui/DialogIssue.svelte.d.ts

@@ -1,20 +1,22 @@
-import { SvelteComponent } from "svelte";
-declare const __propDef: {
-    props: {
-        dialogId: number;
-        milestoneId: string;
-        issueNumber: number | null;
+interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
+    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
+        $$bindings?: Bindings;
+    } & Exports;
+    (internal: unknown, props: Props & {
+        $$events?: Events;
+        $$slots?: Slots;
+    }): Exports & {
+        $set?: any;
+        $on?: any;
     };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type DialogIssueProps = typeof __propDef.props;
-export type DialogIssueEvents = typeof __propDef.events;
-export type DialogIssueSlots = typeof __propDef.slots;
-export default class DialogIssue extends SvelteComponent<DialogIssueProps, DialogIssueEvents, DialogIssueSlots> {
+    z_$$bindings?: Bindings;
 }
-export {};
+declare const DialogIssue: $$__sveltets_2_IsomorphicComponent<{
+    dialogId: number;
+    milestoneId: string;
+    issueNumber: number | null;
+}, {
+    [evt: string]: CustomEvent<any>;
+}, {}, {}, string>;
+type DialogIssue = InstanceType<typeof DialogIssue>;
+export default DialogIssue;