@webiny/app-admin 6.6.0-alpha.0 → 6.6.0-alpha.10

package/presentation/installation/components/SystemInstaller/SystemInstaller.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 interface SystemInstallerProps {
     children: React.ReactNode;
 }
-export declare const SystemInstaller: (({ children }: SystemInstallerProps) => React.JSX.Element) & {
-    displayName: string;
+export declare const SystemInstaller: (({ children }: SystemInstallerProps) => React.JSX.Element) & React.NamedExoticComponent<SystemInstallerProps> & {
+    readonly type: ({ children }: SystemInstallerProps) => React.JSX.Element;
 };
 export {};

package/presentation/installation/components/SystemInstaller/steps/AdminUserStep.js

@@ -4,7 +4,8 @@ import { Bind, Form, useForm } from "@webiny/form";
 import { validation } from "@webiny/validation";
 import { Center } from "./Center.js";
 import { Container } from "./Container.js";
-import { usePasswordValidator } from "./AdminUserStep/usePasswordValidator.js";
+import { useFeature } from "@webiny/app";
+import { PasswordPolicyFeature } from "../../../../../features/adminUsers/passwordPolicy/index.js";
 const AdminUserStep = ({ nextStep })=>/*#__PURE__*/ react.createElement(Container, {
         title: "Admin account",
         message: "This is the account you’ll use to access and manage your Webiny instance."
@@ -17,7 +18,7 @@ const AdminUserStep = ({ nextStep })=>/*#__PURE__*/ react.createElement(Containe
     }, ()=>/*#__PURE__*/ react.createElement(AdminUserInputs, null)))));
 const AdminUserInputs = ()=>{
     const form = useForm();
-    const passwordValidator = usePasswordValidator();
+    const { passwordPolicy } = useFeature(PasswordPolicyFeature);
     const appName = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || "Cognito";
     return /*#__PURE__*/ react.createElement(Grid, null, /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 6
@@ -47,7 +48,7 @@ const AdminUserInputs = ()=>{
     }, /*#__PURE__*/ react.createElement(Bind, {
         name: `${appName}.password`,
         validators: [
-            passwordValidator,
+            (value)=>passwordPolicy.validate(value),
             validation.create("required")
         ]
     }, /*#__PURE__*/ react.createElement(Input, {

package/presentation/installation/components/SystemInstaller/steps/AdminUserStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/AdminUserStep.js","sources":["../../../../../../src/presentation/installation/components/SystemInstaller/steps/AdminUserStep.tsx"],"sourcesContent":["import React from \"react\";\nimport { Button, Grid, Input } from \"@webiny/admin-ui\";\nimport { Bind, Form, useForm } from \"@webiny/form\";\nimport { validation } from \"@webiny/validation\";\nimport { Center } from \"./Center.js\";\nimport { Container } from \"./Container.js\";\nimport type { ISystemInstallerPresenter } from \"~/presentation/installation/presenters/SystemInstaller/abstractions.js\";\nimport { usePasswordValidator } from \"./AdminUserStep/usePasswordValidator.js\";\n\ninterface StepProps {\n    nextStep: ISystemInstallerPresenter[\"nextStep\"];\n}\n\nexport const AdminUserStep = ({ nextStep }: StepProps) => {\n    return (\n        <Container\n            title={\"Admin account\"}\n            message={\"This is the account you’ll use to access and manage your Webiny instance.\"}\n        >\n            <Center>\n                <div style={{ width: 400 }}>\n                    <Form onSubmit={data => nextStep(data)}>{() => <AdminUserInputs />}</Form>\n                </div>\n            </Center>\n        </Container>\n    );\n};\n\nconst AdminUserInputs = () => {\n    const form = useForm();\n    const passwordValidator = usePasswordValidator();\n\n    // The install wizard renders BEFORE any auth-provider extension is mounted (it replaces the app\n    // tree), so the installer's app name can't come from DI here — it must be a build-time value.\n    // The submitted data is keyed under this name, becoming `installationInput: [{ app, data }]`, so\n    // it has to match the API-side AppInstaller's `appName`. Defaults to \"Cognito\" (AWS hosting type);\n    // the self-hosted hosting type sets REACT_APP_AUTH_INSTALLER_APP_NAME=\"SelfHostedAuth\".\n    const appName = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || \"Cognito\";\n\n    return (\n        <Grid>\n            <Grid.Column span={6}>\n                <Bind name={`${appName}.firstName`} validators={validation.create(\"required\")}>\n                    <Input label={\"First name\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={6}>\n                <Bind name={`${appName}.lastName`} validators={validation.create(\"required\")}>\n                    <Input label={\"Last name\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={12}>\n                <Bind\n                    name={`${appName}.email`}\n                    beforeChange={(value: string, cb) => cb(value.toLowerCase())}\n                    validators={validation.create(\"required,email\")}\n                >\n                    <Input label={\"Your email\"} autoComplete={\"new-password\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={12}>\n                <Bind\n                    name={`${appName}.password`}\n                    validators={[passwordValidator, validation.create(\"required\")]}\n                >\n                    <Input\n                        label={\"Choose password\"}\n                        type={\"password\"}\n                        autoComplete={\"new-password\"}\n                    />\n                </Bind>\n            </Grid.Column>\n\n            <Grid.Column span={12}>\n                <Button\n                    containerClassName={\"w-full\"}\n                    className={\"w-full\"}\n                    variant={\"primary\"}\n                    size={\"lg\"}\n                    text={\"Next step\"}\n                    onClick={form.submit}\n                />\n            </Grid.Column>\n        </Grid>\n    );\n};\n"],"names":["AdminUserStep","nextStep","Container","Center","Form","data","AdminUserInputs","form","useForm","passwordValidator","usePasswordValidator","appName","process","Grid","Bind","validation","Input","value","cb","Button"],"mappings":";;;;;;;AAaO,MAAMA,gBAAgB,CAAC,EAAEC,QAAQ,EAAa,GAC1C,WAAP,GACI,oBAACC,WAASA;QACN,OAAO;QACP,SAAS;qBAET,oBAACC,QAAMA,MAAAA,WAAAA,GACH,oBAAC;QAAI,OAAO;YAAE,OAAO;QAAI;qBACrB,oBAACC,MAAIA;QAAC,UAAUC,CAAAA,OAAQJ,SAASI;OAAQ,kBAAM,oBAACC,iBAAeA;AAOnF,MAAMA,kBAAkB;IACpB,MAAMC,OAAOC;IACb,MAAMC,oBAAoBC;IAO1B,MAAMC,UAAUC,QAAQ,GAAG,CAAC,iCAAiC,IAAI;IAEjE,OAAO,WAAP,GACI,oBAACC,MAAIA,MAAAA,WAAAA,GACD,oBAACA,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QAAC,MAAM,GAAGH,QAAQ,UAAU,CAAC;QAAE,YAAYI,WAAW,MAAM,CAAC;qBAC9D,oBAACC,OAAKA;QAAC,OAAO;wBAGtB,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QAAC,MAAM,GAAGH,QAAQ,SAAS,CAAC;QAAE,YAAYI,WAAW,MAAM,CAAC;qBAC7D,oBAACC,OAAKA;QAAC,OAAO;wBAGtB,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QACD,MAAM,GAAGH,QAAQ,MAAM,CAAC;QACxB,cAAc,CAACM,OAAeC,KAAOA,GAAGD,MAAM,WAAW;QACzD,YAAYF,WAAW,MAAM,CAAC;qBAE9B,oBAACC,OAAKA;QAAC,OAAO;QAAc,cAAc;wBAGlD,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QACD,MAAM,GAAGH,QAAQ,SAAS,CAAC;QAC3B,YAAY;YAACF;YAAmBM,WAAW,MAAM,CAAC;SAAY;qBAE9D,oBAACC,OAAKA;QACF,OAAO;QACP,MAAM;QACN,cAAc;wBAK1B,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACM,QAAMA;QACH,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,MAAM;QACN,MAAM;QACN,SAASZ,KAAK,MAAM;;AAKxC"}
+{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/AdminUserStep.js","sources":["../../../../../../src/presentation/installation/components/SystemInstaller/steps/AdminUserStep.tsx"],"sourcesContent":["import React from \"react\";\nimport { Button, Grid, Input } from \"@webiny/admin-ui\";\nimport { Bind, Form, useForm } from \"@webiny/form\";\nimport { validation } from \"@webiny/validation\";\nimport { Center } from \"./Center.js\";\nimport { Container } from \"./Container.js\";\nimport type { ISystemInstallerPresenter } from \"~/presentation/installation/presenters/SystemInstaller/abstractions.js\";\nimport { useFeature } from \"@webiny/app\";\nimport { PasswordPolicyFeature } from \"~/features/adminUsers/passwordPolicy/index.js\";\n\ninterface StepProps {\n    nextStep: ISystemInstallerPresenter[\"nextStep\"];\n}\n\nexport const AdminUserStep = ({ nextStep }: StepProps) => {\n    return (\n        <Container\n            title={\"Admin account\"}\n            message={\"This is the account you’ll use to access and manage your Webiny instance.\"}\n        >\n            <Center>\n                <div style={{ width: 400 }}>\n                    <Form onSubmit={data => nextStep(data)}>{() => <AdminUserInputs />}</Form>\n                </div>\n            </Center>\n        </Container>\n    );\n};\n\nconst AdminUserInputs = () => {\n    const form = useForm();\n    const { passwordPolicy } = useFeature(PasswordPolicyFeature);\n\n    // The install wizard renders BEFORE any auth-provider extension is mounted (it replaces the app\n    // tree), so the installer's app name can't come from DI here — it must be a build-time value.\n    // The submitted data is keyed under this name, becoming `installationInput: [{ app, data }]`, so\n    // it has to match the API-side AppInstaller's `appName`. Defaults to \"Cognito\" (AWS hosting type);\n    // the self-hosted hosting type sets REACT_APP_AUTH_INSTALLER_APP_NAME=\"SelfHostedAuth\".\n    const appName = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || \"Cognito\";\n\n    return (\n        <Grid>\n            <Grid.Column span={6}>\n                <Bind name={`${appName}.firstName`} validators={validation.create(\"required\")}>\n                    <Input label={\"First name\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={6}>\n                <Bind name={`${appName}.lastName`} validators={validation.create(\"required\")}>\n                    <Input label={\"Last name\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={12}>\n                <Bind\n                    name={`${appName}.email`}\n                    beforeChange={(value: string, cb) => cb(value.toLowerCase())}\n                    validators={validation.create(\"required,email\")}\n                >\n                    <Input label={\"Your email\"} autoComplete={\"new-password\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={12}>\n                <Bind\n                    name={`${appName}.password`}\n                    validators={[\n                        (value: string) => passwordPolicy.validate(value),\n                        validation.create(\"required\")\n                    ]}\n                >\n                    <Input\n                        label={\"Choose password\"}\n                        type={\"password\"}\n                        autoComplete={\"new-password\"}\n                    />\n                </Bind>\n            </Grid.Column>\n\n            <Grid.Column span={12}>\n                <Button\n                    containerClassName={\"w-full\"}\n                    className={\"w-full\"}\n                    variant={\"primary\"}\n                    size={\"lg\"}\n                    text={\"Next step\"}\n                    onClick={form.submit}\n                />\n            </Grid.Column>\n        </Grid>\n    );\n};\n"],"names":["AdminUserStep","nextStep","Container","Center","Form","data","AdminUserInputs","form","useForm","passwordPolicy","useFeature","PasswordPolicyFeature","appName","process","Grid","Bind","validation","Input","value","cb","Button"],"mappings":";;;;;;;;AAcO,MAAMA,gBAAgB,CAAC,EAAEC,QAAQ,EAAa,GAC1C,WAAP,GACI,oBAACC,WAASA;QACN,OAAO;QACP,SAAS;qBAET,oBAACC,QAAMA,MAAAA,WAAAA,GACH,oBAAC;QAAI,OAAO;YAAE,OAAO;QAAI;qBACrB,oBAACC,MAAIA;QAAC,UAAUC,CAAAA,OAAQJ,SAASI;OAAQ,kBAAM,oBAACC,iBAAeA;AAOnF,MAAMA,kBAAkB;IACpB,MAAMC,OAAOC;IACb,MAAM,EAAEC,cAAc,EAAE,GAAGC,WAAWC;IAOtC,MAAMC,UAAUC,QAAQ,GAAG,CAAC,iCAAiC,IAAI;IAEjE,OAAO,WAAP,GACI,oBAACC,MAAIA,MAAAA,WAAAA,GACD,oBAACA,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QAAC,MAAM,GAAGH,QAAQ,UAAU,CAAC;QAAE,YAAYI,WAAW,MAAM,CAAC;qBAC9D,oBAACC,OAAKA;QAAC,OAAO;wBAGtB,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QAAC,MAAM,GAAGH,QAAQ,SAAS,CAAC;QAAE,YAAYI,WAAW,MAAM,CAAC;qBAC7D,oBAACC,OAAKA;QAAC,OAAO;wBAGtB,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QACD,MAAM,GAAGH,QAAQ,MAAM,CAAC;QACxB,cAAc,CAACM,OAAeC,KAAOA,GAAGD,MAAM,WAAW;QACzD,YAAYF,WAAW,MAAM,CAAC;qBAE9B,oBAACC,OAAKA;QAAC,OAAO;QAAc,cAAc;wBAGlD,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QACD,MAAM,GAAGH,QAAQ,SAAS,CAAC;QAC3B,YAAY;YACR,CAACM,QAAkBT,eAAe,QAAQ,CAACS;YAC3CF,WAAW,MAAM,CAAC;SACrB;qBAED,oBAACC,OAAKA;QACF,OAAO;QACP,MAAM;QACN,cAAc;wBAK1B,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACM,QAAMA;QACH,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,MAAM;QACN,MAAM;QACN,SAASb,KAAK,MAAM;;AAKxC"}

package/presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.js

@@ -3,9 +3,6 @@ const INSTALL_FINISH_URL = process.env.REACT_APP_WEBINY_INSTALL_FINISH_URL || "h
 const buildInstallFinishHref = ()=>{
     if ("false" === process.env.REACT_APP_WEBINY_TELEMETRY) return null;
     if ("u" < typeof window) return null;
-    const isCloudFrontHost = window.location.hostname.endsWith(".cloudfront.net");
-    const allowAlternate = Boolean(process.env.REACT_APP_WEBINY_INSTALL_FINISH_URL);
-    if (!isCloudFrontHost && !allowAlternate) return null;
     const machineId = getMachineId();
     if (!machineId) return null;
     const currentUrl = window.location.origin + window.location.pathname;

package/presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.js","sources":["../../../../../../../src/presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.ts"],"sourcesContent":["import { getMachineId } from \"@webiny/telemetry/react.js\";\nimport type { ISystemInstallerPresenter } from \"~/presentation/installation/presenters/SystemInstaller/abstractions.js\";\n\nconst INSTALL_FINISH_URL =\n    process.env.REACT_APP_WEBINY_INSTALL_FINISH_URL || \"https://www.webiny.com/install/finish\";\n\n/**\n * If telemetry is enabled AND the admin is hosted on CloudFront (production\n * deployment), route the \"Start using Webiny\" CTA through the marketing\n * site's /install/finish page so the website's anonymous wts_did cookie can\n * be aliased to the deployer's machine_id. Falls through to the local\n * `finishInstallation` flow otherwise.\n */\nconst buildInstallFinishHref = (): string | null => {\n    if (process.env.REACT_APP_WEBINY_TELEMETRY === \"false\") {\n        return null;\n    }\n\n    if (typeof window === \"undefined\") {\n        return null;\n    }\n    const isCloudFrontHost = window.location.hostname.endsWith(\".cloudfront.net\");\n    const allowAlternate = Boolean(process.env.REACT_APP_WEBINY_INSTALL_FINISH_URL);\n    if (!isCloudFrontHost && !allowAlternate) {\n        return null;\n    }\n\n    const machineId = getMachineId();\n    if (!machineId) {\n        return null;\n    }\n\n    const currentUrl = window.location.origin + window.location.pathname;\n    const params = new URLSearchParams({\n        machine_id: machineId,\n        return_to: currentUrl\n    });\n    return `${INSTALL_FINISH_URL}?${params.toString()}`;\n};\n\nexport const handleStartUsing = (\n    finishInstallation: ISystemInstallerPresenter[\"finishInstallation\"]\n) => {\n    if (typeof window !== \"undefined\") {\n        const handoff = buildInstallFinishHref();\n        if (handoff) {\n            window.location.assign(handoff);\n            return;\n        }\n    }\n    finishInstallation();\n};\n"],"names":["INSTALL_FINISH_URL","process","buildInstallFinishHref","window","isCloudFrontHost","allowAlternate","Boolean","machineId","getMachineId","currentUrl","params","URLSearchParams","handleStartUsing","finishInstallation","handoff"],"mappings":";AAGA,MAAMA,qBACFC,QAAQ,GAAG,CAAC,mCAAmC,IAAI;AASvD,MAAMC,yBAAyB;IAC3B,IAAID,AAA2C,YAA3CA,QAAQ,GAAG,CAAC,0BAA0B,EACtC,OAAO;IAGX,IAAI,AAAkB,MAAlB,OAAOE,QACP,OAAO;IAEX,MAAMC,mBAAmBD,OAAO,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC3D,MAAME,iBAAiBC,QAAQL,QAAQ,GAAG,CAAC,mCAAmC;IAC9E,IAAI,CAACG,oBAAoB,CAACC,gBACtB,OAAO;IAGX,MAAME,YAAYC;IAClB,IAAI,CAACD,WACD,OAAO;IAGX,MAAME,aAAaN,OAAO,QAAQ,CAAC,MAAM,GAAGA,OAAO,QAAQ,CAAC,QAAQ;IACpE,MAAMO,SAAS,IAAIC,gBAAgB;QAC/B,YAAYJ;QACZ,WAAWE;IACf;IACA,OAAO,GAAGT,mBAAmB,CAAC,EAAEU,OAAO,QAAQ,IAAI;AACvD;AAEO,MAAME,mBAAmB,CAC5BC;IAEA,IAAI,AAAkB,MAAlB,OAAOV,QAAwB;QAC/B,MAAMW,UAAUZ;QAChB,IAAIY,SAAS,YACTX,OAAO,QAAQ,CAAC,MAAM,CAACW;IAG/B;IACAD;AACJ"}
+{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.js","sources":["../../../../../../../src/presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.ts"],"sourcesContent":["import { getMachineId } from \"@webiny/telemetry/react.js\";\nimport type { ISystemInstallerPresenter } from \"~/presentation/installation/presenters/SystemInstaller/abstractions.js\";\n\nconst INSTALL_FINISH_URL =\n    process.env.REACT_APP_WEBINY_INSTALL_FINISH_URL || \"https://www.webiny.com/install/finish\";\n\n/**\n * If telemetry is enabled, route the \"Start using Webiny\" CTA through the\n * marketing site's /install/finish page so the website's anonymous wts_did\n * cookie can be aliased to the deployer's machine_id. Falls through to the\n * local `finishInstallation` flow otherwise.\n *\n * This used to run only when the admin was served from a `.cloudfront.net`\n * host, which meant standalone installs were never aliased and the whole\n * install-to-marketing-visit link was AWS-only. The website side of the\n * handoff drops its matching CloudFront restriction, so both halves of the\n * path now work for any host.\n */\nconst buildInstallFinishHref = (): string | null => {\n    if (process.env.REACT_APP_WEBINY_TELEMETRY === \"false\") {\n        return null;\n    }\n\n    if (typeof window === \"undefined\") {\n        return null;\n    }\n\n    const machineId = getMachineId();\n    if (!machineId) {\n        return null;\n    }\n\n    const currentUrl = window.location.origin + window.location.pathname;\n    const params = new URLSearchParams({\n        machine_id: machineId,\n        return_to: currentUrl\n    });\n    return `${INSTALL_FINISH_URL}?${params.toString()}`;\n};\n\nexport const handleStartUsing = (\n    finishInstallation: ISystemInstallerPresenter[\"finishInstallation\"]\n) => {\n    if (typeof window !== \"undefined\") {\n        const handoff = buildInstallFinishHref();\n        if (handoff) {\n            window.location.assign(handoff);\n            return;\n        }\n    }\n    finishInstallation();\n};\n"],"names":["INSTALL_FINISH_URL","process","buildInstallFinishHref","window","machineId","getMachineId","currentUrl","params","URLSearchParams","handleStartUsing","finishInstallation","handoff"],"mappings":";AAGA,MAAMA,qBACFC,QAAQ,GAAG,CAAC,mCAAmC,IAAI;AAcvD,MAAMC,yBAAyB;IAC3B,IAAID,AAA2C,YAA3CA,QAAQ,GAAG,CAAC,0BAA0B,EACtC,OAAO;IAGX,IAAI,AAAkB,MAAlB,OAAOE,QACP,OAAO;IAGX,MAAMC,YAAYC;IAClB,IAAI,CAACD,WACD,OAAO;IAGX,MAAME,aAAaH,OAAO,QAAQ,CAAC,MAAM,GAAGA,OAAO,QAAQ,CAAC,QAAQ;IACpE,MAAMI,SAAS,IAAIC,gBAAgB;QAC/B,YAAYJ;QACZ,WAAWE;IACf;IACA,OAAO,GAAGN,mBAAmB,CAAC,EAAEO,OAAO,QAAQ,IAAI;AACvD;AAEO,MAAME,mBAAmB,CAC5BC;IAEA,IAAI,AAAkB,MAAlB,OAAOP,QAAwB;QAC/B,MAAMQ,UAAUT;QAChB,IAAIS,SAAS,YACTR,OAAO,QAAQ,CAAC,MAAM,CAACQ;IAG/B;IACAD;AACJ"}

package/presentation/installation/presenters/SystemInstaller/SystemInstallerPresenter.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/presenters/SystemInstaller/SystemInstallerPresenter.js","sources":["../../../../../src/presentation/installation/presenters/SystemInstaller/SystemInstallerPresenter.ts"],"sourcesContent":["import { makeAutoObservable, runInAction, toJS } from \"mobx\";\nimport { createImplementation } from \"@webiny/di\";\nimport {\n    SystemInstallerPresenter as Abstraction,\n    InstallationInput,\n    SystemInstallerRepository,\n    type SystemInstallerViewModel,\n    type WizardStep,\n    type WizardStepState,\n    type ErrorObject\n} from \"./abstractions.js\";\nimport { TelemetryService } from \"~/features/telemetry/index.js\";\nimport { NewsletterSubscriptionService } from \"~/features/newsletter/index.js\";\n\nclass SystemInstallerPresenterImpl implements Abstraction.Interface {\n    private loading = true;\n    private isInstalled = false;\n    private currentStep = 0;\n    private error: ErrorObject | undefined = undefined;\n    private installing = false;\n    private startUsing = false;\n    private installerData: Record<string, any> = {};\n    private wizardSteps: WizardStep[];\n\n    constructor(\n        private telemetry: TelemetryService.Interface,\n        private newsletter: NewsletterSubscriptionService.Interface,\n        private repository: SystemInstallerRepository.Interface\n    ) {\n        // TODO: Wizard steps need to be implemented via plugins, but this will do for now.\n        this.wizardSteps = [\n            { name: \"introduction\", label: \"Introduction\" },\n            { name: \"basic-info\", label: \"Basic info\" },\n            // Show the admin-account step for IdPs that seed the first admin user during install:\n            // Cognito (idp type) or any IdP that declares an installer app name (e.g. self-hosted).\n            // External IdPs (Okta/Auth0) set neither, so the step stays hidden for them.\n            process.env.REACT_APP_IDP_TYPE === \"cognito\" ||\n            Boolean(process.env.REACT_APP_AUTH_INSTALLER_APP_NAME)\n                ? { name: \"admin-account\", label: \"Admin account\" }\n                : undefined,\n            { name: \"finish\", label: \"Finish setup\" }\n        ].filter(Boolean) as WizardStep[];\n\n        makeAutoObservable(this, {}, { autoBind: true });\n        this.initialize();\n    }\n\n    private async initialize(): Promise<void> {\n        runInAction(() => {\n            this.loading = true;\n        });\n\n        try {\n            const isInstalled = await this.repository.isSystemInstalled();\n            runInAction(() => {\n                this.isInstalled = isInstalled;\n                this.startUsing = isInstalled;\n                this.loading = false;\n            });\n\n            if (!isInstalled) {\n                await this.telemetry.sendEvent(\"install-wizard-start\");\n            }\n        } catch {\n            runInAction(() => {\n                this.loading = false;\n            });\n        }\n    }\n\n    get vm(): SystemInstallerViewModel {\n        return {\n            error: this.error,\n            loading: this.loading,\n            isInstalled: this.isInstalled,\n            startUsing: this.startUsing,\n            currentStep: this.wizardSteps[this.currentStep].name,\n            steps: this.wizardSteps.map((step, index) => {\n                let state: WizardStepState = \"idle\";\n                if (index === this.currentStep) {\n                    state = \"current\";\n                }\n\n                if (index < this.currentStep) {\n                    state = \"completed\";\n                }\n\n                return {\n                    ...step,\n                    state\n                };\n            }),\n            installing: this.installing\n        };\n    }\n\n    nextStep = (data: Record<string, any> = {}): void => {\n        if (this.currentStep < this.wizardSteps.length - 1) {\n            Object.assign(this.installerData, data ?? {});\n            this.currentStep++;\n        }\n    };\n\n    previousStep = (): void => {\n        if (this.currentStep > 0) {\n            this.currentStep--;\n        }\n    };\n\n    goToStep = (name: WizardStep[\"name\"]): void => {\n        const stepIndex = this.wizardSteps.findIndex(step => step.name === name);\n\n        if (stepIndex > -1) {\n            this.currentStep = stepIndex;\n        }\n    };\n\n    installSystem = async (): Promise<void> => {\n        runInAction(() => {\n            this.installing = true;\n        });\n        try {\n            const { basicInfo, ...installerData } = toJS(this.installerData);\n            const installationInput: InstallationInput = Object.keys(installerData).map(key => {\n                return {\n                    app: key,\n                    data: installerData[key]\n                };\n            });\n            await this.repository.installSystem(installationInput);\n\n            // We intentionally do NOT send `projectName` or `organizationName` to\n            // telemetry — those are user-typed free-text fields that risk\n            // identifying the user's company. Only the categorical\n            // `referralSource` is forwarded for funnel attribution.\n            await this.telemetry.sendEvent(\"install-wizard-end\", {\n                referralSource: basicInfo.referralSource\n            });\n\n            runInAction(() => {\n                this.isInstalled = true;\n                this.installing = false;\n            });\n\n            // ToS acceptance in the basic-info step covers consent. Fire-and-forget\n            // so a slow/failed newsletter call never blocks the wizard.\n            // Admin-user data is keyed by the active IdP's installer app name (Cognito,\n            // SelfHostedAuth, …), so don't hardcode \"Cognito\".\n            const authApp = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || \"Cognito\";\n            const adminUser = installerData[authApp];\n            if (adminUser) {\n                this.newsletter.subscribe({\n                    email: adminUser.email,\n                    firstName: adminUser.firstName,\n                    lastName: adminUser.lastName\n                });\n            }\n        } catch (error) {\n            runInAction(() => {\n                this.error = error;\n                this.installing = false;\n                console.log(\"error\", error);\n            });\n        }\n    };\n\n    finishInstallation = () => {\n        this.startUsing = true;\n    };\n}\n\nexport const SystemInstallerPresenter = createImplementation({\n    abstraction: Abstraction,\n    implementation: SystemInstallerPresenterImpl,\n    dependencies: [TelemetryService, NewsletterSubscriptionService, SystemInstallerRepository]\n});\n"],"names":["SystemInstallerPresenterImpl","telemetry","newsletter","repository","undefined","data","Object","name","stepIndex","step","runInAction","basicInfo","installerData","toJS","installationInput","key","authApp","process","adminUser","error","console","Boolean","makeAutoObservable","isInstalled","index","state","SystemInstallerPresenter","createImplementation","Abstraction","TelemetryService","NewsletterSubscriptionService","SystemInstallerRepository"],"mappings":"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"}
+{"version":3,"file":"presentation/installation/presenters/SystemInstaller/SystemInstallerPresenter.js","sources":["../../../../../src/presentation/installation/presenters/SystemInstaller/SystemInstallerPresenter.ts"],"sourcesContent":["import { makeAutoObservable, runInAction, toJS } from \"mobx\";\nimport { createImplementation } from \"@webiny/di\";\nimport {\n    SystemInstallerPresenter as Abstraction,\n    InstallationInput,\n    SystemInstallerRepository,\n    type SystemInstallerViewModel,\n    type WizardStep,\n    type WizardStepState,\n    type ErrorObject\n} from \"./abstractions.js\";\nimport { TelemetryService } from \"~/features/telemetry/index.js\";\nimport { NewsletterSubscriptionService } from \"~/features/newsletter/index.js\";\n\nclass SystemInstallerPresenterImpl implements Abstraction.Interface {\n    private loading = true;\n    private isInstalled = false;\n    private currentStep = 0;\n    private error: ErrorObject | undefined = undefined;\n    private installing = false;\n    private startUsing = false;\n    private installerData: Record<string, any> = {};\n    private wizardSteps: WizardStep[];\n\n    constructor(\n        private telemetry: TelemetryService.Interface,\n        private newsletter: NewsletterSubscriptionService.Interface,\n        private repository: SystemInstallerRepository.Interface\n    ) {\n        // TODO: Wizard steps need to be implemented via plugins, but this will do for now.\n        this.wizardSteps = [\n            { name: \"introduction\", label: \"Introduction\" },\n            { name: \"basic-info\", label: \"Basic info\" },\n            // Show the admin-account step for IdPs that seed the first admin user during install:\n            // Cognito (idp type) or any IdP that declares an installer app name (e.g. standalone).\n            // External IdPs (Okta/Auth0) set neither, so the step stays hidden for them.\n            process.env.REACT_APP_IDP_TYPE === \"cognito\" ||\n            Boolean(process.env.REACT_APP_AUTH_INSTALLER_APP_NAME)\n                ? { name: \"admin-account\", label: \"Admin account\" }\n                : undefined,\n            { name: \"finish\", label: \"Finish setup\" }\n        ].filter(Boolean) as WizardStep[];\n\n        makeAutoObservable(this, {}, { autoBind: true });\n        this.initialize();\n    }\n\n    private async initialize(): Promise<void> {\n        runInAction(() => {\n            this.loading = true;\n        });\n\n        try {\n            const isInstalled = await this.repository.isSystemInstalled();\n            runInAction(() => {\n                this.isInstalled = isInstalled;\n                this.startUsing = isInstalled;\n                this.loading = false;\n            });\n\n            if (!isInstalled) {\n                await this.telemetry.sendEvent(\"install-wizard-start\");\n            }\n        } catch {\n            runInAction(() => {\n                this.loading = false;\n            });\n        }\n    }\n\n    get vm(): SystemInstallerViewModel {\n        return {\n            error: this.error,\n            loading: this.loading,\n            isInstalled: this.isInstalled,\n            startUsing: this.startUsing,\n            currentStep: this.wizardSteps[this.currentStep].name,\n            steps: this.wizardSteps.map((step, index) => {\n                let state: WizardStepState = \"idle\";\n                if (index === this.currentStep) {\n                    state = \"current\";\n                }\n\n                if (index < this.currentStep) {\n                    state = \"completed\";\n                }\n\n                return {\n                    ...step,\n                    state\n                };\n            }),\n            installing: this.installing\n        };\n    }\n\n    nextStep = (data: Record<string, any> = {}): void => {\n        if (this.currentStep < this.wizardSteps.length - 1) {\n            Object.assign(this.installerData, data ?? {});\n            this.currentStep++;\n        }\n    };\n\n    previousStep = (): void => {\n        if (this.currentStep > 0) {\n            this.currentStep--;\n        }\n    };\n\n    goToStep = (name: WizardStep[\"name\"]): void => {\n        const stepIndex = this.wizardSteps.findIndex(step => step.name === name);\n\n        if (stepIndex > -1) {\n            this.currentStep = stepIndex;\n        }\n    };\n\n    installSystem = async (): Promise<void> => {\n        runInAction(() => {\n            this.installing = true;\n        });\n        try {\n            const { basicInfo, ...installerData } = toJS(this.installerData);\n            const installationInput: InstallationInput = Object.keys(installerData).map(key => {\n                return {\n                    app: key,\n                    data: installerData[key]\n                };\n            });\n            await this.repository.installSystem(installationInput);\n\n            // We intentionally do NOT send `projectName` or `organizationName` to\n            // telemetry — those are user-typed free-text fields that risk\n            // identifying the user's company. Only the categorical\n            // `referralSource` is forwarded for funnel attribution.\n            await this.telemetry.sendEvent(\"install-wizard-end\", {\n                referralSource: basicInfo.referralSource\n            });\n\n            runInAction(() => {\n                this.isInstalled = true;\n                this.installing = false;\n            });\n\n            // ToS acceptance in the basic-info step covers consent. Fire-and-forget\n            // so a slow/failed newsletter call never blocks the wizard.\n            // Admin-user data is keyed by the active IdP's installer app name (Cognito,\n            // SelfHostedAuth, …), so don't hardcode \"Cognito\".\n            const authApp = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || \"Cognito\";\n            const adminUser = installerData[authApp];\n            if (adminUser) {\n                this.newsletter.subscribe({\n                    email: adminUser.email,\n                    firstName: adminUser.firstName,\n                    lastName: adminUser.lastName\n                });\n            }\n        } catch (error) {\n            runInAction(() => {\n                this.error = error;\n                this.installing = false;\n                console.log(\"error\", error);\n            });\n        }\n    };\n\n    finishInstallation = () => {\n        this.startUsing = true;\n    };\n}\n\nexport const SystemInstallerPresenter = createImplementation({\n    abstraction: Abstraction,\n    implementation: SystemInstallerPresenterImpl,\n    dependencies: [TelemetryService, NewsletterSubscriptionService, SystemInstallerRepository]\n});\n"],"names":["SystemInstallerPresenterImpl","telemetry","newsletter","repository","undefined","data","Object","name","stepIndex","step","runInAction","basicInfo","installerData","toJS","installationInput","key","authApp","process","adminUser","error","console","Boolean","makeAutoObservable","isInstalled","index","state","SystemInstallerPresenter","createImplementation","Abstraction","TelemetryService","NewsletterSubscriptionService","SystemInstallerRepository"],"mappings":"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"}

package/presentation/listPresenter/FolderAwareDataSource.d.ts

@@ -10,6 +10,11 @@ export interface FolderAwareDataSourceConfig<TRow> {
     };
     keyField: keyof TRow & string;
     localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;
+    /**
+     * Reads the value of a sort field from an item, for ordering rows locally.
+     * See `QueryMatcherConfig.getSortValue`.
+     */
+    getSortValue?: (item: TRow, field: string) => unknown;
 }
 export interface FetchParams {
     where?: Record<string, unknown>;

package/presentation/listPresenter/FolderAwareDataSource.js

@@ -9,7 +9,10 @@ class FolderAwareDataSource {
         };
         this._loading = false;
         this._locationField = config.locationField ?? "location";
-        this._registeredFilterNames = new Set(config.registeredFilterNames ?? []);
+        this._registeredFilterNames = new Set([
+            ...config.registeredFilterNames ?? [],
+            ...Object.keys(config.localFilters ?? {})
+        ]);
         this._getDescendantFolders = config.getDescendantFolders;
         this._keyField = config.keyField;
         const locationField = this._locationField;
@@ -25,7 +28,8 @@ class FolderAwareDataSource {
         };
         this.queryMatcher = new QueryMatcher({
             keyField: config.keyField,
-            localFilters
+            localFilters,
+            getSortValue: config.getSortValue
         });
         makeObservable(this, {
             _meta: observable,
@@ -56,7 +60,7 @@ class FolderAwareDataSource {
             });
             runInAction(()=>{
                 this.onQueryResult(result.data);
-                this.queryMatcher.updateFromQuery(params, result.data.map((item)=>String(item[this._keyField])));
+                this.queryMatcher.updateFromQuery(params, result.data.map((item)=>String(item[this._keyField])), result.meta.hasMoreItems);
                 this._meta = {
                     cursor: result.meta.cursor,
                     hasMoreItems: result.meta.hasMoreItems,
@@ -82,7 +86,7 @@ class FolderAwareDataSource {
             });
             runInAction(()=>{
                 this.onLoadMoreResult(result.data);
-                this.queryMatcher.appendResultKeys(result.data.map((item)=>String(item[this._keyField])));
+                this.queryMatcher.appendResultKeys(result.data.map((item)=>String(item[this._keyField])), result.meta.hasMoreItems);
                 this._meta = {
                     cursor: result.meta.cursor,
                     hasMoreItems: result.meta.hasMoreItems,

package/presentation/listPresenter/FolderAwareDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/listPresenter/FolderAwareDataSource.js","sources":["../../../src/presentation/listPresenter/FolderAwareDataSource.ts"],"sourcesContent":["import { makeObservable, observable, computed, runInAction, action } from \"mobx\";\nimport type { IDataSource, IDataSourceQuery, IDataSourceMeta } from \"./abstractions.js\";\nimport { QueryMatcher } from \"./QueryMatcher.js\";\n\nexport interface FolderAwareDataSourceConfig<TRow> {\n    locationField?: string;\n    registeredFilterNames?: string[];\n    getDescendantFolders?: { execute(folderId: string): { id: string }[] };\n    keyField: keyof TRow & string;\n    localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;\n}\n\nexport interface FetchParams {\n    where?: Record<string, unknown>;\n    sort?: string[];\n    search?: string;\n    limit?: number;\n    after?: string;\n}\n\nexport interface FetchResult<TRow> {\n    data: TRow[];\n    meta: { cursor: string | null; hasMoreItems: boolean; totalCount: number };\n}\n\nexport abstract class FolderAwareDataSource<TRow> implements IDataSource<TRow> {\n    private _meta: IDataSourceMeta = { cursor: null, hasMoreItems: false, totalCount: 0 };\n    private _loading = false;\n    private _locationField: string;\n    private _registeredFilterNames: Set<string>;\n    private _getDescendantFolders: FolderAwareDataSourceConfig<TRow>[\"getDescendantFolders\"];\n    private _keyField: keyof TRow & string;\n    protected queryMatcher: QueryMatcher<TRow>;\n\n    constructor(config: FolderAwareDataSourceConfig<TRow>) {\n        this._locationField = config.locationField ?? \"location\";\n        this._registeredFilterNames = new Set(config.registeredFilterNames ?? []);\n        this._getDescendantFolders = config.getDescendantFolders;\n        this._keyField = config.keyField;\n\n        const locationField = this._locationField;\n        const localFilters: Record<string, (item: TRow, value: unknown) => boolean> = {\n            folderId: (item, value) => {\n                const folderId = value as string;\n                const location = (item as Record<string, any>)[locationField];\n                const itemFolderId = location?.folderId as string | undefined;\n                if (folderId && folderId !== \"root\") {\n                    return itemFolderId === folderId;\n                }\n                return !itemFolderId || itemFolderId === \"root\";\n            },\n            ...config.localFilters\n        };\n\n        this.queryMatcher = new QueryMatcher<TRow>({\n            keyField: config.keyField,\n            localFilters\n        });\n\n        makeObservable<FolderAwareDataSource<TRow>, \"_meta\" | \"_loading\">(this, {\n            _meta: observable,\n            _loading: observable,\n            meta: computed,\n            loading: computed,\n            query: action,\n            loadMore: action\n        });\n    }\n\n    abstract get rows(): TRow[];\n\n    abstract fetch(params: FetchParams): Promise<FetchResult<TRow>>;\n\n    protected onQueryResult(_data: TRow[]): void {}\n\n    protected onLoadMoreResult(_data: TRow[]): void {}\n\n    get meta(): IDataSourceMeta {\n        return this._meta;\n    }\n\n    get loading(): boolean {\n        return this._loading;\n    }\n\n    async query(params: IDataSourceQuery): Promise<void> {\n        this._loading = true;\n\n        try {\n            const result = await this.fetch({\n                where: this.buildWhere(params),\n                sort: this.buildSort(params),\n                search: params.search,\n                limit: params.limit,\n                after: params.cursor\n            });\n\n            runInAction(() => {\n                this.onQueryResult(result.data);\n                this.queryMatcher.updateFromQuery(\n                    params,\n                    result.data.map(item => String(item[this._keyField]))\n                );\n                this._meta = {\n                    cursor: result.meta.cursor,\n                    hasMoreItems: result.meta.hasMoreItems,\n                    totalCount: result.meta.totalCount\n                };\n            });\n        } finally {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n\n    async loadMore(params: IDataSourceQuery): Promise<void> {\n        if (!this._meta.hasMoreItems || this._loading) {\n            return;\n        }\n\n        this._loading = true;\n\n        try {\n            const result = await this.fetch({\n                where: this.buildWhere(params),\n                sort: this.buildSort(params),\n                search: params.search,\n                limit: params.limit,\n                after: this._meta.cursor ?? undefined\n            });\n\n            runInAction(() => {\n                this.onLoadMoreResult(result.data);\n                this.queryMatcher.appendResultKeys(\n                    result.data.map(item => String(item[this._keyField]))\n                );\n                this._meta = {\n                    cursor: result.meta.cursor,\n                    hasMoreItems: result.meta.hasMoreItems,\n                    totalCount: result.meta.totalCount\n                };\n            });\n        } finally {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n\n    protected customizeWhere(\n        _where: Record<string, unknown>,\n        _filters: Record<string, unknown>\n    ): void {}\n\n    protected shouldExpandFolders(_filters: Record<string, unknown>): boolean {\n        return false;\n    }\n\n    private buildWhere(params: IDataSourceQuery): Record<string, unknown> | undefined {\n        const where: Record<string, unknown> = {};\n        const filters = params.filters ?? {};\n        const folderId = (filters.folderId as string | undefined) || \"root\";\n        const isRoot = folderId === \"root\";\n        const hasAdvancedFilters = Object.keys(filters).some(\n            k => k !== \"folderId\" && !this._registeredFilterNames.has(k)\n        );\n        const isSearching =\n            !!params.search || hasAdvancedFilters || this.shouldExpandFolders(filters);\n\n        if (isSearching && isRoot) {\n            // Search/filter from root: no folder filter — search all folders.\n        } else if (isSearching && this._getDescendantFolders) {\n            const descendants = this._getDescendantFolders.execute(folderId);\n            const folderIds = descendants.map(f => f.id);\n            where[this._locationField] = { folderId_in: folderIds };\n        } else {\n            where[this._locationField] = { folderId };\n        }\n\n        for (const [key, value] of Object.entries(filters)) {\n            if (key === \"folderId\") {\n                continue;\n            }\n            where[key] = value;\n        }\n\n        this.customizeWhere(where, filters);\n\n        return Object.keys(where).length > 0 ? where : undefined;\n    }\n\n    private buildSort(params: IDataSourceQuery): string[] | undefined {\n        if (!params.sort) {\n            return undefined;\n        }\n        return [`${params.sort.field}_${params.sort.direction}`];\n    }\n}\n"],"names":["FolderAwareDataSource","config","Set","locationField","localFilters","item","value","folderId","location","itemFolderId","QueryMatcher","makeObservable","observable","computed","action","_data","params","result","runInAction","String","undefined","_where","_filters","where","filters","isRoot","hasAdvancedFilters","Object","k","isSearching","descendants","folderIds","f","key"],"mappings":"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"}
+{"version":3,"file":"presentation/listPresenter/FolderAwareDataSource.js","sources":["../../../src/presentation/listPresenter/FolderAwareDataSource.ts"],"sourcesContent":["import { makeObservable, observable, computed, runInAction, action } from \"mobx\";\nimport type { IDataSource, IDataSourceQuery, IDataSourceMeta } from \"./abstractions.js\";\nimport { QueryMatcher } from \"./QueryMatcher.js\";\n\nexport interface FolderAwareDataSourceConfig<TRow> {\n    locationField?: string;\n    registeredFilterNames?: string[];\n    getDescendantFolders?: { execute(folderId: string): { id: string }[] };\n    keyField: keyof TRow & string;\n    localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;\n    /**\n     * Reads the value of a sort field from an item, for ordering rows locally.\n     * See `QueryMatcherConfig.getSortValue`.\n     */\n    getSortValue?: (item: TRow, field: string) => unknown;\n}\n\nexport interface FetchParams {\n    where?: Record<string, unknown>;\n    sort?: string[];\n    search?: string;\n    limit?: number;\n    after?: string;\n}\n\nexport interface FetchResult<TRow> {\n    data: TRow[];\n    meta: { cursor: string | null; hasMoreItems: boolean; totalCount: number };\n}\n\nexport abstract class FolderAwareDataSource<TRow> implements IDataSource<TRow> {\n    private _meta: IDataSourceMeta = { cursor: null, hasMoreItems: false, totalCount: 0 };\n    private _loading = false;\n    private _locationField: string;\n    private _registeredFilterNames: Set<string>;\n    private _getDescendantFolders: FolderAwareDataSourceConfig<TRow>[\"getDescendantFolders\"];\n    private _keyField: keyof TRow & string;\n    protected queryMatcher: QueryMatcher<TRow>;\n\n    constructor(config: FolderAwareDataSourceConfig<TRow>) {\n        this._locationField = config.locationField ?? \"location\";\n        this._registeredFilterNames = new Set([\n            ...(config.registeredFilterNames ?? []),\n            ...Object.keys(config.localFilters ?? {})\n        ]);\n        this._getDescendantFolders = config.getDescendantFolders;\n        this._keyField = config.keyField;\n\n        const locationField = this._locationField;\n        const localFilters: Record<string, (item: TRow, value: unknown) => boolean> = {\n            folderId: (item, value) => {\n                const folderId = value as string;\n                const location = (item as Record<string, any>)[locationField];\n                const itemFolderId = location?.folderId as string | undefined;\n                if (folderId && folderId !== \"root\") {\n                    return itemFolderId === folderId;\n                }\n                return !itemFolderId || itemFolderId === \"root\";\n            },\n            ...config.localFilters\n        };\n\n        this.queryMatcher = new QueryMatcher<TRow>({\n            keyField: config.keyField,\n            localFilters,\n            getSortValue: config.getSortValue\n        });\n\n        makeObservable<FolderAwareDataSource<TRow>, \"_meta\" | \"_loading\">(this, {\n            _meta: observable,\n            _loading: observable,\n            meta: computed,\n            loading: computed,\n            query: action,\n            loadMore: action\n        });\n    }\n\n    abstract get rows(): TRow[];\n\n    abstract fetch(params: FetchParams): Promise<FetchResult<TRow>>;\n\n    protected onQueryResult(_data: TRow[]): void {}\n\n    protected onLoadMoreResult(_data: TRow[]): void {}\n\n    get meta(): IDataSourceMeta {\n        return this._meta;\n    }\n\n    get loading(): boolean {\n        return this._loading;\n    }\n\n    async query(params: IDataSourceQuery): Promise<void> {\n        this._loading = true;\n\n        try {\n            const result = await this.fetch({\n                where: this.buildWhere(params),\n                sort: this.buildSort(params),\n                search: params.search,\n                limit: params.limit,\n                after: params.cursor\n            });\n\n            runInAction(() => {\n                this.onQueryResult(result.data);\n                this.queryMatcher.updateFromQuery(\n                    params,\n                    result.data.map(item => String(item[this._keyField])),\n                    result.meta.hasMoreItems\n                );\n                this._meta = {\n                    cursor: result.meta.cursor,\n                    hasMoreItems: result.meta.hasMoreItems,\n                    totalCount: result.meta.totalCount\n                };\n            });\n        } finally {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n\n    async loadMore(params: IDataSourceQuery): Promise<void> {\n        if (!this._meta.hasMoreItems || this._loading) {\n            return;\n        }\n\n        this._loading = true;\n\n        try {\n            const result = await this.fetch({\n                where: this.buildWhere(params),\n                sort: this.buildSort(params),\n                search: params.search,\n                limit: params.limit,\n                after: this._meta.cursor ?? undefined\n            });\n\n            runInAction(() => {\n                this.onLoadMoreResult(result.data);\n                this.queryMatcher.appendResultKeys(\n                    result.data.map(item => String(item[this._keyField])),\n                    result.meta.hasMoreItems\n                );\n                this._meta = {\n                    cursor: result.meta.cursor,\n                    hasMoreItems: result.meta.hasMoreItems,\n                    totalCount: result.meta.totalCount\n                };\n            });\n        } finally {\n            runInAction(() => {\n                this._loading = false;\n            });\n        }\n    }\n\n    protected customizeWhere(\n        _where: Record<string, unknown>,\n        _filters: Record<string, unknown>\n    ): void {}\n\n    protected shouldExpandFolders(_filters: Record<string, unknown>): boolean {\n        return false;\n    }\n\n    private buildWhere(params: IDataSourceQuery): Record<string, unknown> | undefined {\n        const where: Record<string, unknown> = {};\n        const filters = params.filters ?? {};\n        const folderId = (filters.folderId as string | undefined) || \"root\";\n        const isRoot = folderId === \"root\";\n        const hasAdvancedFilters = Object.keys(filters).some(\n            k => k !== \"folderId\" && !this._registeredFilterNames.has(k)\n        );\n        const isSearching =\n            !!params.search || hasAdvancedFilters || this.shouldExpandFolders(filters);\n\n        if (isSearching && isRoot) {\n            // Search/filter from root: no folder filter — search all folders.\n        } else if (isSearching && this._getDescendantFolders) {\n            const descendants = this._getDescendantFolders.execute(folderId);\n            const folderIds = descendants.map(f => f.id);\n            where[this._locationField] = { folderId_in: folderIds };\n        } else {\n            where[this._locationField] = { folderId };\n        }\n\n        for (const [key, value] of Object.entries(filters)) {\n            if (key === \"folderId\") {\n                continue;\n            }\n            where[key] = value;\n        }\n\n        this.customizeWhere(where, filters);\n\n        return Object.keys(where).length > 0 ? where : undefined;\n    }\n\n    private buildSort(params: IDataSourceQuery): string[] | undefined {\n        if (!params.sort) {\n            return undefined;\n        }\n        return [`${params.sort.field}_${params.sort.direction}`];\n    }\n}\n"],"names":["FolderAwareDataSource","config","Set","Object","locationField","localFilters","item","value","folderId","location","itemFolderId","QueryMatcher","makeObservable","observable","computed","action","_data","params","result","runInAction","String","undefined","_where","_filters","where","filters","isRoot","hasAdvancedFilters","k","isSearching","descendants","folderIds","f","key"],"mappings":"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"}

package/presentation/listPresenter/QueryMatcher.d.ts

@@ -1,8 +1,15 @@
 import type { IDataSourceQuery } from "./abstractions.js";
 type ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;
+type SortValueGetter<TRow> = (item: TRow, field: string) => unknown;
 export interface QueryMatcherConfig<TRow> {
     keyField: keyof TRow & string;
     localFilters: Record<string, ItemPredicate<TRow>>;
+    /**
+     * Reads the value of a sort field from an item. Defaults to a dot-path lookup
+     * (e.g. `savedOn`, `values.title`). Override when the query's sort field name
+     * does not match the item's shape.
+     */
+    getSortValue?: SortValueGetter<TRow>;
 }
 /**
  * Decides which cached items belong in the current view.
@@ -34,10 +41,11 @@ export interface QueryMatcherConfig<TRow> {
  * });
  *
  * // In DataSource.query(), after fetching:
- * matcher.updateFromQuery(params, result.data.map(item => item.id));
+ * matcher.updateFromQuery(params, result.data.map(item => item.id), result.meta.hasMoreItems);
  *
- * // In DataSource.rows getter:
- * return cache.getItems().filter(matcher.matcher);
+ * // In DataSource.rows getter (filters, sorts by the applied sort, and cuts off at the
+ * // last loaded item):
+ * return matcher.select(cache.getItems());
  * ```
  */
 export declare class QueryMatcher<TRow> {
@@ -45,12 +53,27 @@ export declare class QueryMatcher<TRow> {
     private _queryResultKeys;
     private _matcher;
     private localFilterKeys;
+    private getSortValue;
+    private _view;
     constructor(config: QueryMatcherConfig<TRow>);
     get matcher(): (item: TRow) => boolean;
     filter(items: TRow[]): TRow[];
+    /**
+     * Returns the items that belong in the current view, in the view's order.
+     *
+     * The cache is shared by views with different sorts, so its order means nothing to
+     * this view. Instead, matching items are sorted by the applied sort (ties keep the
+     * server order), and the result is cut off after the last item the server returned
+     * for this view. That keeps locally created or updated items in their sort position,
+     * and hides cached items that sort past the loaded pages until pagination reaches them.
+     *
+     * While searching, the server's (relevance) order is kept as is.
+     */
+    select(items: TRow[]): TRow[];
+    private getKey;
     hasServerSideFilters(params: IDataSourceQuery): boolean;
-    updateFromQuery(params: IDataSourceQuery, resultKeys: string[]): void;
-    appendResultKeys(keys: string[]): void;
+    updateFromQuery(params: IDataSourceQuery, resultKeys: string[], hasMore?: boolean): void;
+    appendResultKeys(keys: string[], hasMore?: boolean): void;
     private buildMatcher;
 }
 export {};

package/presentation/listPresenter/QueryMatcher.js

@@ -1,12 +1,15 @@
-import { action, computed, makeObservable, observable } from "mobx";
+import { action, computed, makeObservable, observableRef } from "mobx";
 class QueryMatcher {
     constructor(config){
         this.config = config;
         this._queryResultKeys = null;
         this._matcher = ()=>true;
+        this._view = null;
         this.localFilterKeys = new Set(Object.keys(config.localFilters));
+        this.getSortValue = config.getSortValue ?? getValueByPath;
         makeObservable(this, {
-            _matcher: observable.ref,
+            _matcher: observableRef,
+            _view: observableRef,
             matcher: computed,
             updateFromQuery: action,
             appendResultKeys: action
@@ -18,18 +21,65 @@ class QueryMatcher {
     filter(items) {
         return items.filter(this._matcher);
     }
+    select(items) {
+        const matched = this.filter(items);
+        const view = this._view;
+        if (!view) return matched;
+        const serverIndex = new Map(view.resultKeys.map((key, index)=>[
+                key,
+                index
+            ]));
+        const indexOf = (item)=>serverIndex.get(this.getKey(item)) ?? 1 / 0;
+        const sort = view.searching ? void 0 : view.sort;
+        const sorted = [
+            ...matched
+        ].sort((a, b)=>{
+            if (sort) {
+                const result = compareValues(this.getSortValue(a, sort.field), this.getSortValue(b, sort.field));
+                if (0 !== result) return "ASC" === sort.direction ? result : -result;
+            }
+            const left = indexOf(a);
+            const right = indexOf(b);
+            return left === right ? 0 : left < right ? -1 : 1;
+        });
+        if (!view.hasMore) return sorted;
+        let lastLoaded = -1;
+        sorted.forEach((item, index)=>{
+            if (serverIndex.has(this.getKey(item))) lastLoaded = index;
+        });
+        return lastLoaded < 0 ? sorted : sorted.slice(0, lastLoaded + 1);
+    }
+    getKey(item) {
+        return String(item[this.config.keyField]);
+    }
     hasServerSideFilters(params) {
         if (params.search) return true;
         const filters = params.filters ?? {};
         return Object.keys(filters).some((key)=>!this.localFilterKeys.has(key));
     }
-    updateFromQuery(params, resultKeys) {
+    updateFromQuery(params, resultKeys, hasMore = false) {
         if (this.hasServerSideFilters(params)) this._queryResultKeys = new Set(resultKeys);
         else this._queryResultKeys = null;
         this._matcher = this.buildMatcher(params);
+        this._view = {
+            resultKeys: [
+                ...resultKeys
+            ],
+            sort: params.sort,
+            searching: !!params.search,
+            hasMore
+        };
     }
-    appendResultKeys(keys) {
+    appendResultKeys(keys, hasMore = false) {
         if (this._queryResultKeys) for (const key of keys)this._queryResultKeys.add(key);
+        if (this._view) this._view = {
+            ...this._view,
+            resultKeys: [
+                ...this._view.resultKeys,
+                ...keys
+            ],
+            hasMore
+        };
     }
     buildMatcher(params) {
         const filters = params.filters ?? {};
@@ -54,6 +104,26 @@ class QueryMatcher {
         };
     }
 }
+function getValueByPath(item, path) {
+    let current = item;
+    for (const part of path.split(".")){
+        if (null == current || "object" != typeof current) return;
+        current = current[part];
+    }
+    return current;
+}
+function compareValues(a, b) {
+    const aEmpty = null == a;
+    const bEmpty = null == b;
+    if (aEmpty || bEmpty) return aEmpty === bEmpty ? 0 : aEmpty ? 1 : -1;
+    const left = a instanceof Date ? a.getTime() : a;
+    const right = b instanceof Date ? b.getTime() : b;
+    if ("number" == typeof left && "number" == typeof right) return left - right;
+    if ("boolean" == typeof left && "boolean" == typeof right) return Number(left) - Number(right);
+    const leftString = String(left);
+    const rightString = String(right);
+    return leftString < rightString ? -1 : leftString > rightString ? 1 : 0;
+}
 export { QueryMatcher };
 
 //# sourceMappingURL=QueryMatcher.js.map

package/presentation/listPresenter/QueryMatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation/listPresenter/QueryMatcher.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.ts"],"sourcesContent":["import { makeObservable, observable, computed, action } from \"mobx\";\nimport type { IDataSourceQuery } from \"./abstractions.js\";\n\ntype ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;\n\nexport interface QueryMatcherConfig<TRow> {\n    keyField: keyof TRow & string;\n    localFilters: Record<string, ItemPredicate<TRow>>;\n}\n\n/**\n * Decides which cached items belong in the current view.\n *\n * A DataSource backed by a shared cache (e.g., per-model entry cache) needs to\n * filter cached items to only those matching the active query. QueryMatcher does\n * this by splitting filters into two categories:\n *\n * - **Local filters** (e.g., folderId, status) — evaluated client-side against\n *   each item using predicates provided via `localFilters` config. Used when\n *   browsing without search or server-side filters.\n *\n * - **Server-side filters** (search, advanced search, any filter key not in\n *   `localFilters`) — cannot be evaluated locally. Instead, QueryMatcher tracks\n *   the set of item keys returned by the last server query (`_queryResultKeys`)\n *   and restricts the view to those items.\n *\n * The `matcher` getter is MobX-computed, so any DataSource `rows` getter that\n * reads it will recompute when the matcher changes after a query.\n *\n * Usage:\n * ```ts\n * const matcher = new QueryMatcher<MyItem>({\n *     keyField: \"id\",\n *     localFilters: {\n *         folderId: (item, value) => item.folderId === value,\n *         status: (item, value) => item.status === value,\n *     }\n * });\n *\n * // In DataSource.query(), after fetching:\n * matcher.updateFromQuery(params, result.data.map(item => item.id));\n *\n * // In DataSource.rows getter:\n * return cache.getItems().filter(matcher.matcher);\n * ```\n */\nexport class QueryMatcher<TRow> {\n    private _queryResultKeys: Set<string> | null = null;\n    private _matcher: (item: TRow) => boolean = () => true;\n    private localFilterKeys: Set<string>;\n\n    constructor(private config: QueryMatcherConfig<TRow>) {\n        this.localFilterKeys = new Set(Object.keys(config.localFilters));\n\n        makeObservable<QueryMatcher<TRow>, \"_matcher\">(this, {\n            _matcher: observable.ref,\n            matcher: computed,\n            updateFromQuery: action,\n            appendResultKeys: action\n        });\n    }\n\n    get matcher(): (item: TRow) => boolean {\n        return this._matcher;\n    }\n\n    filter(items: TRow[]): TRow[] {\n        return items.filter(this._matcher);\n    }\n\n    hasServerSideFilters(params: IDataSourceQuery): boolean {\n        if (params.search) {\n            return true;\n        }\n        const filters = params.filters ?? {};\n        return Object.keys(filters).some(key => !this.localFilterKeys.has(key));\n    }\n\n    updateFromQuery(params: IDataSourceQuery, resultKeys: string[]): void {\n        if (this.hasServerSideFilters(params)) {\n            this._queryResultKeys = new Set(resultKeys);\n        } else {\n            this._queryResultKeys = null;\n        }\n        this._matcher = this.buildMatcher(params);\n    }\n\n    appendResultKeys(keys: string[]): void {\n        if (this._queryResultKeys) {\n            for (const key of keys) {\n                this._queryResultKeys.add(key);\n            }\n        }\n    }\n\n    private buildMatcher(params: IDataSourceQuery): (item: TRow) => boolean {\n        const filters = params.filters ?? {};\n        const queryResultKeys = this._queryResultKeys;\n        const isSearching = !!params.search;\n        const { keyField, localFilters } = this.config;\n\n        const activeLocalFilters: Array<{ predicate: ItemPredicate<TRow>; value: unknown }> = [];\n        for (const [key, predicate] of Object.entries(localFilters)) {\n            const value = filters[key];\n            if (value !== undefined && value !== null) {\n                activeLocalFilters.push({ predicate, value });\n            }\n        }\n\n        return (item: TRow) => {\n            if (queryResultKeys) {\n                if (!queryResultKeys.has(String(item[keyField]))) {\n                    return false;\n                }\n            } else if (!isSearching) {\n                for (const { predicate, value } of activeLocalFilters) {\n                    if (!predicate(item, value)) {\n                        return false;\n                    }\n                }\n            }\n\n            return true;\n        };\n    }\n}\n"],"names":["QueryMatcher","config","Set","Object","makeObservable","observable","computed","action","items","params","filters","key","resultKeys","keys","queryResultKeys","isSearching","keyField","localFilters","activeLocalFilters","predicate","value","item","String"],"mappings":";AA8CO,MAAMA;IAKT,YAAoBC,MAAgC,CAAE;aAAlCA,MAAM,GAANA;aAJZ,gBAAgB,GAAuB;aACvC,QAAQ,GAA4B,IAAM;QAI9C,IAAI,CAAC,eAAe,GAAG,IAAIC,IAAIC,OAAO,IAAI,CAACF,OAAO,YAAY;QAE9DG,eAA+C,IAAI,EAAE;YACjD,UAAUC,WAAW,GAAG;YACxB,SAASC;YACT,iBAAiBC;YACjB,kBAAkBA;QACtB;IACJ;IAEA,IAAI,UAAmC;QACnC,OAAO,IAAI,CAAC,QAAQ;IACxB;IAEA,OAAOC,KAAa,EAAU;QAC1B,OAAOA,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ;IACrC;IAEA,qBAAqBC,MAAwB,EAAW;QACpD,IAAIA,OAAO,MAAM,EACb,OAAO;QAEX,MAAMC,UAAUD,OAAO,OAAO,IAAI,CAAC;QACnC,OAAON,OAAO,IAAI,CAACO,SAAS,IAAI,CAACC,CAAAA,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAACA;IACtE;IAEA,gBAAgBF,MAAwB,EAAEG,UAAoB,EAAQ;QAClE,IAAI,IAAI,CAAC,oBAAoB,CAACH,SAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAIP,IAAIU;aAEhC,IAAI,CAAC,gBAAgB,GAAG;QAE5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAACH;IACtC;IAEA,iBAAiBI,IAAc,EAAQ;QACnC,IAAI,IAAI,CAAC,gBAAgB,EACrB,KAAK,MAAMF,OAAOE,KACd,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAACF;IAGtC;IAEQ,aAAaF,MAAwB,EAA2B;QACpE,MAAMC,UAAUD,OAAO,OAAO,IAAI,CAAC;QACnC,MAAMK,kBAAkB,IAAI,CAAC,gBAAgB;QAC7C,MAAMC,cAAc,CAAC,CAACN,OAAO,MAAM;QACnC,MAAM,EAAEO,QAAQ,EAAEC,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM;QAE9C,MAAMC,qBAAgF,EAAE;QACxF,KAAK,MAAM,CAACP,KAAKQ,UAAU,IAAIhB,OAAO,OAAO,CAACc,cAAe;YACzD,MAAMG,QAAQV,OAAO,CAACC,IAAI;YAC1B,IAAIS,QAAAA,OACAF,mBAAmB,IAAI,CAAC;gBAAEC;gBAAWC;YAAM;QAEnD;QAEA,OAAO,CAACC;YACJ,IAAIP,iBACA;gBAAA,IAAI,CAACA,gBAAgB,GAAG,CAACQ,OAAOD,IAAI,CAACL,SAAS,IAC1C,OAAO;YACX,OACG,IAAI,CAACD,aACR;gBAAA,KAAK,MAAM,EAAEI,SAAS,EAAEC,KAAK,EAAE,IAAIF,mBAC/B,IAAI,CAACC,UAAUE,MAAMD,QACjB,OAAO;YAEf;YAGJ,OAAO;QACX;IACJ;AACJ"}
+{"version":3,"file":"presentation/listPresenter/QueryMatcher.js","sources":["../../../src/presentation/listPresenter/QueryMatcher.ts"],"sourcesContent":["import { makeObservable, observableRef, computed, action } from \"mobx\";\nimport type { IDataSourceQuery } from \"./abstractions.js\";\n\ntype ItemPredicate<TRow> = (item: TRow, value: unknown) => boolean;\n\ntype SortValueGetter<TRow> = (item: TRow, field: string) => unknown;\n\nexport interface QueryMatcherConfig<TRow> {\n    keyField: keyof TRow & string;\n    localFilters: Record<string, ItemPredicate<TRow>>;\n    /**\n     * Reads the value of a sort field from an item. Defaults to a dot-path lookup\n     * (e.g. `savedOn`, `values.title`). Override when the query's sort field name\n     * does not match the item's shape.\n     */\n    getSortValue?: SortValueGetter<TRow>;\n}\n\n/**\n * Decides which cached items belong in the current view.\n *\n * A DataSource backed by a shared cache (e.g., per-model entry cache) needs to\n * filter cached items to only those matching the active query. QueryMatcher does\n * this by splitting filters into two categories:\n *\n * - **Local filters** (e.g., folderId, status) — evaluated client-side against\n *   each item using predicates provided via `localFilters` config. Used when\n *   browsing without search or server-side filters.\n *\n * - **Server-side filters** (search, advanced search, any filter key not in\n *   `localFilters`) — cannot be evaluated locally. Instead, QueryMatcher tracks\n *   the set of item keys returned by the last server query (`_queryResultKeys`)\n *   and restricts the view to those items.\n *\n * The `matcher` getter is MobX-computed, so any DataSource `rows` getter that\n * reads it will recompute when the matcher changes after a query.\n *\n * Usage:\n * ```ts\n * const matcher = new QueryMatcher<MyItem>({\n *     keyField: \"id\",\n *     localFilters: {\n *         folderId: (item, value) => item.folderId === value,\n *         status: (item, value) => item.status === value,\n *     }\n * });\n *\n * // In DataSource.query(), after fetching:\n * matcher.updateFromQuery(params, result.data.map(item => item.id), result.meta.hasMoreItems);\n *\n * // In DataSource.rows getter (filters, sorts by the applied sort, and cuts off at the\n * // last loaded item):\n * return matcher.select(cache.getItems());\n * ```\n */\nexport class QueryMatcher<TRow> {\n    private _queryResultKeys: Set<string> | null = null;\n    private _matcher: (item: TRow) => boolean = () => true;\n    private localFilterKeys: Set<string>;\n    private getSortValue: SortValueGetter<TRow>;\n\n    // Ordering state of the current view: the keys the server returned for the active\n    // query (in server order, extended by `appendResultKeys`), the applied sort, and\n    // whether the server has more items beyond the loaded ones.\n    private _view: {\n        resultKeys: string[];\n        sort: IDataSourceQuery[\"sort\"];\n        searching: boolean;\n        hasMore: boolean;\n    } | null = null;\n\n    constructor(private config: QueryMatcherConfig<TRow>) {\n        this.localFilterKeys = new Set(Object.keys(config.localFilters));\n        this.getSortValue = config.getSortValue ?? getValueByPath;\n\n        makeObservable<QueryMatcher<TRow>, \"_matcher\" | \"_view\">(this, {\n            _matcher: observableRef,\n            _view: observableRef,\n            matcher: computed,\n            updateFromQuery: action,\n            appendResultKeys: action\n        });\n    }\n\n    get matcher(): (item: TRow) => boolean {\n        return this._matcher;\n    }\n\n    filter(items: TRow[]): TRow[] {\n        return items.filter(this._matcher);\n    }\n\n    /**\n     * Returns the items that belong in the current view, in the view's order.\n     *\n     * The cache is shared by views with different sorts, so its order means nothing to\n     * this view. Instead, matching items are sorted by the applied sort (ties keep the\n     * server order), and the result is cut off after the last item the server returned\n     * for this view. That keeps locally created or updated items in their sort position,\n     * and hides cached items that sort past the loaded pages until pagination reaches them.\n     *\n     * While searching, the server's (relevance) order is kept as is.\n     */\n    select(items: TRow[]): TRow[] {\n        const matched = this.filter(items);\n        const view = this._view;\n        if (!view) {\n            return matched;\n        }\n\n        const serverIndex = new Map(view.resultKeys.map((key, index) => [key, index]));\n        // Items the server did not return for this view (cached by other views, or created\n        // locally) sort after the server's items among equal sort values.\n        const indexOf = (item: TRow) =>\n            serverIndex.get(this.getKey(item)) ?? Number.POSITIVE_INFINITY;\n\n        const sort = view.searching ? undefined : view.sort;\n        const sorted = [...matched].sort((a, b) => {\n            if (sort) {\n                const result = compareValues(\n                    this.getSortValue(a, sort.field),\n                    this.getSortValue(b, sort.field)\n                );\n                if (result !== 0) {\n                    return sort.direction === \"ASC\" ? result : -result;\n                }\n            }\n            const left = indexOf(a);\n            const right = indexOf(b);\n            return left === right ? 0 : left < right ? -1 : 1;\n        });\n\n        if (!view.hasMore) {\n            return sorted;\n        }\n\n        let lastLoaded = -1;\n        sorted.forEach((item, index) => {\n            if (serverIndex.has(this.getKey(item))) {\n                lastLoaded = index;\n            }\n        });\n\n        return lastLoaded < 0 ? sorted : sorted.slice(0, lastLoaded + 1);\n    }\n\n    private getKey(item: TRow): string {\n        return String(item[this.config.keyField]);\n    }\n\n    hasServerSideFilters(params: IDataSourceQuery): boolean {\n        if (params.search) {\n            return true;\n        }\n        const filters = params.filters ?? {};\n        return Object.keys(filters).some(key => !this.localFilterKeys.has(key));\n    }\n\n    updateFromQuery(params: IDataSourceQuery, resultKeys: string[], hasMore = false): void {\n        if (this.hasServerSideFilters(params)) {\n            this._queryResultKeys = new Set(resultKeys);\n        } else {\n            this._queryResultKeys = null;\n        }\n        this._matcher = this.buildMatcher(params);\n        this._view = {\n            resultKeys: [...resultKeys],\n            sort: params.sort,\n            searching: !!params.search,\n            hasMore\n        };\n    }\n\n    appendResultKeys(keys: string[], hasMore = false): void {\n        if (this._queryResultKeys) {\n            for (const key of keys) {\n                this._queryResultKeys.add(key);\n            }\n        }\n        if (this._view) {\n            this._view = {\n                ...this._view,\n                resultKeys: [...this._view.resultKeys, ...keys],\n                hasMore\n            };\n        }\n    }\n\n    private buildMatcher(params: IDataSourceQuery): (item: TRow) => boolean {\n        const filters = params.filters ?? {};\n        const queryResultKeys = this._queryResultKeys;\n        const isSearching = !!params.search;\n        const { keyField, localFilters } = this.config;\n\n        const activeLocalFilters: Array<{ predicate: ItemPredicate<TRow>; value: unknown }> = [];\n        for (const [key, predicate] of Object.entries(localFilters)) {\n            const value = filters[key];\n            if (value !== undefined && value !== null) {\n                activeLocalFilters.push({ predicate, value });\n            }\n        }\n\n        return (item: TRow) => {\n            if (queryResultKeys) {\n                if (!queryResultKeys.has(String(item[keyField]))) {\n                    return false;\n                }\n            } else if (!isSearching) {\n                for (const { predicate, value } of activeLocalFilters) {\n                    if (!predicate(item, value)) {\n                        return false;\n                    }\n                }\n            }\n\n            return true;\n        };\n    }\n}\n\nfunction getValueByPath(item: unknown, path: string): unknown {\n    let current: unknown = item;\n    for (const part of path.split(\".\")) {\n        if (current === null || current === undefined || typeof current !== \"object\") {\n            return undefined;\n        }\n        current = (current as Record<string, unknown>)[part];\n    }\n    return current;\n}\n\n/**\n * Compares two sort values in ascending order, the same way the DDB and SQL storage sort\n * entries: `null` and `undefined` sort last (so first in descending order), and an empty\n * string is a regular string. Strings are compared by code point, which keeps ISO dates in\n * chronological order.\n */\nfunction compareValues(a: unknown, b: unknown): number {\n    const aEmpty = a === null || a === undefined;\n    const bEmpty = b === null || b === undefined;\n    if (aEmpty || bEmpty) {\n        return aEmpty === bEmpty ? 0 : aEmpty ? 1 : -1;\n    }\n\n    const left = a instanceof Date ? a.getTime() : a;\n    const right = b instanceof Date ? b.getTime() : b;\n\n    if (typeof left === \"number\" && typeof right === \"number\") {\n        return left - right;\n    }\n    if (typeof left === \"boolean\" && typeof right === \"boolean\") {\n        return Number(left) - Number(right);\n    }\n\n    const leftString = String(left);\n    const rightString = String(right);\n    return leftString < rightString ? -1 : leftString > rightString ? 1 : 0;\n}\n"],"names":["QueryMatcher","config","Set","Object","getValueByPath","makeObservable","observableRef","computed","action","items","matched","view","serverIndex","Map","key","index","indexOf","item","Number","sort","undefined","sorted","a","b","result","compareValues","left","right","lastLoaded","String","params","filters","resultKeys","hasMore","keys","queryResultKeys","isSearching","keyField","localFilters","activeLocalFilters","predicate","value","path","current","part","aEmpty","bEmpty","Date","leftString","rightString"],"mappings":";AAuDO,MAAMA;IAgBT,YAAoBC,MAAgC,CAAE;aAAlCA,MAAM,GAANA;aAfZ,gBAAgB,GAAuB;aACvC,QAAQ,GAA4B,IAAM;aAO1C,KAAK,GAKF;QAGP,IAAI,CAAC,eAAe,GAAG,IAAIC,IAAIC,OAAO,IAAI,CAACF,OAAO,YAAY;QAC9D,IAAI,CAAC,YAAY,GAAGA,OAAO,YAAY,IAAIG;QAE3CC,eAAyD,IAAI,EAAE;YAC3D,UAAUC;YACV,OAAOA;YACP,SAASC;YACT,iBAAiBC;YACjB,kBAAkBA;QACtB;IACJ;IAEA,IAAI,UAAmC;QACnC,OAAO,IAAI,CAAC,QAAQ;IACxB;IAEA,OAAOC,KAAa,EAAU;QAC1B,OAAOA,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ;IACrC;IAaA,OAAOA,KAAa,EAAU;QAC1B,MAAMC,UAAU,IAAI,CAAC,MAAM,CAACD;QAC5B,MAAME,OAAO,IAAI,CAAC,KAAK;QACvB,IAAI,CAACA,MACD,OAAOD;QAGX,MAAME,cAAc,IAAIC,IAAIF,KAAK,UAAU,CAAC,GAAG,CAAC,CAACG,KAAKC,QAAU;gBAACD;gBAAKC;aAAM;QAG5E,MAAMC,UAAU,CAACC,OACbL,YAAY,GAAG,CAAC,IAAI,CAAC,MAAM,CAACK,UAAUC,KAAwB;QAElE,MAAMC,OAAOR,KAAK,SAAS,GAAGS,SAAYT,KAAK,IAAI;QACnD,MAAMU,SAAS;eAAIX;SAAQ,CAAC,IAAI,CAAC,CAACY,GAAGC;YACjC,IAAIJ,MAAM;gBACN,MAAMK,SAASC,cACX,IAAI,CAAC,YAAY,CAACH,GAAGH,KAAK,KAAK,GAC/B,IAAI,CAAC,YAAY,CAACI,GAAGJ,KAAK,KAAK;gBAEnC,IAAIK,AAAW,MAAXA,QACA,OAAOL,AAAmB,UAAnBA,KAAK,SAAS,GAAaK,SAAS,CAACA;YAEpD;YACA,MAAME,OAAOV,QAAQM;YACrB,MAAMK,QAAQX,QAAQO;YACtB,OAAOG,SAASC,QAAQ,IAAID,OAAOC,QAAQ,KAAK;QACpD;QAEA,IAAI,CAAChB,KAAK,OAAO,EACb,OAAOU;QAGX,IAAIO,aAAa;QACjBP,OAAO,OAAO,CAAC,CAACJ,MAAMF;YAClB,IAAIH,YAAY,GAAG,CAAC,IAAI,CAAC,MAAM,CAACK,QAC5BW,aAAab;QAErB;QAEA,OAAOa,aAAa,IAAIP,SAASA,OAAO,KAAK,CAAC,GAAGO,aAAa;IAClE;IAEQ,OAAOX,IAAU,EAAU;QAC/B,OAAOY,OAAOZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC5C;IAEA,qBAAqBa,MAAwB,EAAW;QACpD,IAAIA,OAAO,MAAM,EACb,OAAO;QAEX,MAAMC,UAAUD,OAAO,OAAO,IAAI,CAAC;QACnC,OAAO3B,OAAO,IAAI,CAAC4B,SAAS,IAAI,CAACjB,CAAAA,MAAO,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAACA;IACtE;IAEA,gBAAgBgB,MAAwB,EAAEE,UAAoB,EAAEC,UAAU,KAAK,EAAQ;QACnF,IAAI,IAAI,CAAC,oBAAoB,CAACH,SAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI5B,IAAI8B;aAEhC,IAAI,CAAC,gBAAgB,GAAG;QAE5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAACF;QAClC,IAAI,CAAC,KAAK,GAAG;YACT,YAAY;mBAAIE;aAAW;YAC3B,MAAMF,OAAO,IAAI;YACjB,WAAW,CAAC,CAACA,OAAO,MAAM;YAC1BG;QACJ;IACJ;IAEA,iBAAiBC,IAAc,EAAED,UAAU,KAAK,EAAQ;QACpD,IAAI,IAAI,CAAC,gBAAgB,EACrB,KAAK,MAAMnB,OAAOoB,KACd,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAACpB;QAGlC,IAAI,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,KAAK,GAAG;YACT,GAAG,IAAI,CAAC,KAAK;YACb,YAAY;mBAAI,IAAI,CAAC,KAAK,CAAC,UAAU;mBAAKoB;aAAK;YAC/CD;QACJ;IAER;IAEQ,aAAaH,MAAwB,EAA2B;QACpE,MAAMC,UAAUD,OAAO,OAAO,IAAI,CAAC;QACnC,MAAMK,kBAAkB,IAAI,CAAC,gBAAgB;QAC7C,MAAMC,cAAc,CAAC,CAACN,OAAO,MAAM;QACnC,MAAM,EAAEO,QAAQ,EAAEC,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM;QAE9C,MAAMC,qBAAgF,EAAE;QACxF,KAAK,MAAM,CAACzB,KAAK0B,UAAU,IAAIrC,OAAO,OAAO,CAACmC,cAAe;YACzD,MAAMG,QAAQV,OAAO,CAACjB,IAAI;YAC1B,IAAI2B,QAAAA,OACAF,mBAAmB,IAAI,CAAC;gBAAEC;gBAAWC;YAAM;QAEnD;QAEA,OAAO,CAACxB;YACJ,IAAIkB,iBACA;gBAAA,IAAI,CAACA,gBAAgB,GAAG,CAACN,OAAOZ,IAAI,CAACoB,SAAS,IAC1C,OAAO;YACX,OACG,IAAI,CAACD,aACR;gBAAA,KAAK,MAAM,EAAEI,SAAS,EAAEC,KAAK,EAAE,IAAIF,mBAC/B,IAAI,CAACC,UAAUvB,MAAMwB,QACjB,OAAO;YAEf;YAGJ,OAAO;QACX;IACJ;AACJ;AAEA,SAASrC,eAAea,IAAa,EAAEyB,IAAY;IAC/C,IAAIC,UAAmB1B;IACvB,KAAK,MAAM2B,QAAQF,KAAK,KAAK,CAAC,KAAM;QAChC,IAAIC,QAAAA,WAA6C,AAAmB,YAAnB,OAAOA,SACpD;QAEJA,UAAWA,OAAmC,CAACC,KAAK;IACxD;IACA,OAAOD;AACX;AAQA,SAASlB,cAAcH,CAAU,EAAEC,CAAU;IACzC,MAAMsB,SAASvB,QAAAA;IACf,MAAMwB,SAASvB,QAAAA;IACf,IAAIsB,UAAUC,QACV,OAAOD,WAAWC,SAAS,IAAID,SAAS,IAAI;IAGhD,MAAMnB,OAAOJ,aAAayB,OAAOzB,EAAE,OAAO,KAAKA;IAC/C,MAAMK,QAAQJ,aAAawB,OAAOxB,EAAE,OAAO,KAAKA;IAEhD,IAAI,AAAgB,YAAhB,OAAOG,QAAqB,AAAiB,YAAjB,OAAOC,OACnC,OAAOD,OAAOC;IAElB,IAAI,AAAgB,aAAhB,OAAOD,QAAsB,AAAiB,aAAjB,OAAOC,OACpC,OAAOT,OAAOQ,QAAQR,OAAOS;IAGjC,MAAMqB,aAAanB,OAAOH;IAC1B,MAAMuB,cAAcpB,OAAOF;IAC3B,OAAOqB,aAAaC,cAAc,KAAKD,aAAaC,cAAc,IAAI;AAC1E"}

package/presentation/listPresenter/QueryMatcher.test.d.ts

@@ -0,0 +1 @@
+export {};