@webiny/app-admin 6.4.11 → 6.6.0-alpha.1

package/presentation/installation/components/SystemInstaller/steps/AdminUserStep/createPasswordValidator.d.ts

@@ -5,4 +5,4 @@ export interface PasswordPolicy {
     requireSymbols?: boolean;
     requireUppercase?: boolean;
 }
-export declare const createPasswordValidator: (policy: PasswordPolicy) => (value?: string) => void;
+export declare const createPasswordValidator: (policy?: PasswordPolicy) => (value?: string) => void;

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

@@ -1,5 +1,5 @@
 import { ValidationError } from "@webiny/validation";
-const createPasswordValidator = (policy)=>(value)=>{
+const createPasswordValidator = (policy = {})=>(value)=>{
         if (!value) return;
         value += "";
         const requireSymbols = /([=+\-^$*.[\]{}()?"!@#%&/,><':;|_~`])+/;

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

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/AdminUserStep/createPasswordValidator.js","sources":["../../../../../../../src/presentation/installation/components/SystemInstaller/steps/AdminUserStep/createPasswordValidator.ts"],"sourcesContent":["import { ValidationError } from \"@webiny/validation\";\n\nexport interface PasswordPolicy {\n    minimumLength?: number;\n    requireLowercase?: boolean;\n    requireNumbers?: boolean;\n    requireSymbols?: boolean;\n    requireUppercase?: boolean;\n}\n\nexport const createPasswordValidator =\n    (policy: PasswordPolicy) =>\n    (value?: string): void => {\n        if (!value) {\n            return;\n        }\n        /**\n         * TODO @ts-refactor\n         * @pavel expl\n         */\n        value = value + \"\";\n\n        const requireSymbols = /([=+\\-^$*.[\\]{}()?\"!@#%&/,><':;|_~`])+/;\n        const requireNumber = /[0-9]/;\n        const requireLowercase = /[a-z]/;\n        const requireUppercase = /[A-Z]/;\n\n        if (policy.minimumLength !== undefined && value.length < policy.minimumLength) {\n            throw new ValidationError(\n                `Value requires at least ${policy.minimumLength} characters.`\n            );\n        }\n\n        if (policy.requireLowercase && !requireLowercase.test(value)) {\n            throw new ValidationError(\"Value must contain a lowercase character.\");\n        }\n\n        if (policy.requireNumbers && !requireNumber.test(value)) {\n            throw new ValidationError(\"Value must contain a number.\");\n        }\n\n        if (policy.requireUppercase && !requireUppercase.test(value)) {\n            throw new ValidationError(\"Value must contain an uppercase character.\");\n        }\n\n        if (policy.requireSymbols && !requireSymbols.test(value)) {\n            throw new ValidationError(\"Value must contain a special character.\");\n        }\n    };\n"],"names":["createPasswordValidator","policy","value","requireSymbols","requireNumber","requireLowercase","requireUppercase","undefined","ValidationError"],"mappings":";AAUO,MAAMA,0BACT,CAACC,SACD,CAACC;QACG,IAAI,CAACA,OACD;QAMJA,SAAgB;QAEhB,MAAMC,iBAAiB;QACvB,MAAMC,gBAAgB;QACtB,MAAMC,mBAAmB;QACzB,MAAMC,mBAAmB;QAEzB,IAAIL,AAAyBM,WAAzBN,OAAO,aAAa,IAAkBC,MAAM,MAAM,GAAGD,OAAO,aAAa,EACzE,MAAM,IAAIO,gBACN,CAAC,wBAAwB,EAAEP,OAAO,aAAa,CAAC,YAAY,CAAC;QAIrE,IAAIA,OAAO,gBAAgB,IAAI,CAACI,iBAAiB,IAAI,CAACH,QAClD,MAAM,IAAIM,gBAAgB;QAG9B,IAAIP,OAAO,cAAc,IAAI,CAACG,cAAc,IAAI,CAACF,QAC7C,MAAM,IAAIM,gBAAgB;QAG9B,IAAIP,OAAO,gBAAgB,IAAI,CAACK,iBAAiB,IAAI,CAACJ,QAClD,MAAM,IAAIM,gBAAgB;QAG9B,IAAIP,OAAO,cAAc,IAAI,CAACE,eAAe,IAAI,CAACD,QAC9C,MAAM,IAAIM,gBAAgB;IAElC"}
+{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/AdminUserStep/createPasswordValidator.js","sources":["../../../../../../../src/presentation/installation/components/SystemInstaller/steps/AdminUserStep/createPasswordValidator.ts"],"sourcesContent":["import { ValidationError } from \"@webiny/validation\";\n\nexport interface PasswordPolicy {\n    minimumLength?: number;\n    requireLowercase?: boolean;\n    requireNumbers?: boolean;\n    requireSymbols?: boolean;\n    requireUppercase?: boolean;\n}\n\nexport const createPasswordValidator =\n    (policy: PasswordPolicy = {}) =>\n    (value?: string): void => {\n        if (!value) {\n            return;\n        }\n        /**\n         * TODO @ts-refactor\n         * @pavel expl\n         */\n        value = value + \"\";\n\n        const requireSymbols = /([=+\\-^$*.[\\]{}()?\"!@#%&/,><':;|_~`])+/;\n        const requireNumber = /[0-9]/;\n        const requireLowercase = /[a-z]/;\n        const requireUppercase = /[A-Z]/;\n\n        if (policy.minimumLength !== undefined && value.length < policy.minimumLength) {\n            throw new ValidationError(\n                `Value requires at least ${policy.minimumLength} characters.`\n            );\n        }\n\n        if (policy.requireLowercase && !requireLowercase.test(value)) {\n            throw new ValidationError(\"Value must contain a lowercase character.\");\n        }\n\n        if (policy.requireNumbers && !requireNumber.test(value)) {\n            throw new ValidationError(\"Value must contain a number.\");\n        }\n\n        if (policy.requireUppercase && !requireUppercase.test(value)) {\n            throw new ValidationError(\"Value must contain an uppercase character.\");\n        }\n\n        if (policy.requireSymbols && !requireSymbols.test(value)) {\n            throw new ValidationError(\"Value must contain a special character.\");\n        }\n    };\n"],"names":["createPasswordValidator","policy","value","requireSymbols","requireNumber","requireLowercase","requireUppercase","undefined","ValidationError"],"mappings":";AAUO,MAAMA,0BACT,CAACC,SAAyB,CAAC,CAAC,GAC5B,CAACC;QACG,IAAI,CAACA,OACD;QAMJA,SAAgB;QAEhB,MAAMC,iBAAiB;QACvB,MAAMC,gBAAgB;QACtB,MAAMC,mBAAmB;QACzB,MAAMC,mBAAmB;QAEzB,IAAIL,AAAyBM,WAAzBN,OAAO,aAAa,IAAkBC,MAAM,MAAM,GAAGD,OAAO,aAAa,EACzE,MAAM,IAAIO,gBACN,CAAC,wBAAwB,EAAEP,OAAO,aAAa,CAAC,YAAY,CAAC;QAIrE,IAAIA,OAAO,gBAAgB,IAAI,CAACI,iBAAiB,IAAI,CAACH,QAClD,MAAM,IAAIM,gBAAgB;QAG9B,IAAIP,OAAO,cAAc,IAAI,CAACG,cAAc,IAAI,CAACF,QAC7C,MAAM,IAAIM,gBAAgB;QAG9B,IAAIP,OAAO,gBAAgB,IAAI,CAACK,iBAAiB,IAAI,CAACJ,QAClD,MAAM,IAAIM,gBAAgB;QAG9B,IAAIP,OAAO,cAAc,IAAI,CAACE,eAAe,IAAI,CAACD,QAC9C,MAAM,IAAIM,gBAAgB;IAElC"}

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

@@ -18,24 +18,25 @@ const AdminUserStep = ({ nextStep })=>/*#__PURE__*/ react.createElement(Containe
 const AdminUserInputs = ()=>{
     const form = useForm();
     const passwordValidator = usePasswordValidator();
+    const appName = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || "Cognito";
     return /*#__PURE__*/ react.createElement(Grid, null, /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 6
     }, /*#__PURE__*/ react.createElement(Bind, {
-        name: "Cognito.firstName",
+        name: `${appName}.firstName`,
         validators: validation.create("required")
     }, /*#__PURE__*/ react.createElement(Input, {
         label: "First name"
     }))), /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 6
     }, /*#__PURE__*/ react.createElement(Bind, {
-        name: "Cognito.lastName",
+        name: `${appName}.lastName`,
         validators: validation.create("required")
     }, /*#__PURE__*/ react.createElement(Input, {
         label: "Last name"
     }))), /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 12
     }, /*#__PURE__*/ react.createElement(Bind, {
-        name: "Cognito.email",
+        name: `${appName}.email`,
         beforeChange: (value, cb)=>cb(value.toLowerCase()),
         validators: validation.create("required,email")
     }, /*#__PURE__*/ react.createElement(Input, {
@@ -44,7 +45,7 @@ const AdminUserInputs = ()=>{
     }))), /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 12
     }, /*#__PURE__*/ react.createElement(Bind, {
-        name: "Cognito.password",
+        name: `${appName}.password`,
         validators: [
             passwordValidator,
             validation.create("required")

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    return (\n        <Grid>\n            <Grid.Column span={6}>\n                <Bind name={\"Cognito.firstName\"} validators={validation.create(\"required\")}>\n                    <Input label={\"First name\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={6}>\n                <Bind name={\"Cognito.lastName\"} validators={validation.create(\"required\")}>\n                    <Input label={\"Last name\"} />\n                </Bind>\n            </Grid.Column>\n            <Grid.Column span={12}>\n                <Bind\n                    name={\"Cognito.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={\"Cognito.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","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;IAE1B,OAAO,WAAP,GACI,oBAACC,MAAIA,MAAAA,WAAAA,GACD,oBAACA,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QAAC,MAAM;QAAqB,YAAYC,WAAW,MAAM,CAAC;qBAC3D,oBAACC,OAAKA;QAAC,OAAO;wBAGtB,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QAAC,MAAM;QAAoB,YAAYC,WAAW,MAAM,CAAC;qBAC1D,oBAACC,OAAKA;QAAC,OAAO;wBAGtB,oBAACH,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACC,MAAIA;QACD,MAAM;QACN,cAAc,CAACG,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;QACN,YAAY;YAACH;YAAmBI,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,SAASV,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 { 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"}

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 self-hosted 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/components/SystemInstaller/steps/FinishSetup.js

@@ -21,7 +21,7 @@ const FinishSetupStep = ({ error, isInstalled, installing, installSystem, finish
         className: "flex flex-col gap-4"
     }, /*#__PURE__*/ react.createElement(Alert, {
         type: "danger"
-    }, error.data.reason), /*#__PURE__*/ react.createElement(Button, {
+    }, error.data?.reason ?? error.message ?? "Installation failed."), /*#__PURE__*/ react.createElement(Button, {
         containerClassName: "w-full",
         className: "w-full",
         variant: "secondary",

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

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/FinishSetup.js","sources":["../../../../../../src/presentation/installation/components/SystemInstaller/steps/FinishSetup.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { Button, Grid, Loader, Alert } from \"@webiny/admin-ui\";\nimport { Center } from \"./Center.js\";\nimport { Container } from \"./Container.js\";\nimport type {\n    ErrorObject,\n    ISystemInstallerPresenter\n} from \"~/presentation/installation/presenters/SystemInstaller/abstractions.js\";\nimport { handleStartUsing } from \"./FinishSetup/handleStartUsing.js\";\nimport { handleRestartInstallation } from \"./FinishSetup/handleRestartInstallation.js\";\n\ninterface StepProps {\n    error?: ErrorObject;\n    isInstalled: boolean;\n    installing: boolean;\n    installSystem: ISystemInstallerPresenter[\"installSystem\"];\n    finishInstallation: ISystemInstallerPresenter[\"finishInstallation\"];\n}\n\nexport const FinishSetupStep = ({\n    error,\n    isInstalled,\n    installing,\n    installSystem,\n    finishInstallation\n}: StepProps) => {\n    useEffect(() => {\n        installSystem();\n    }, []);\n\n    const subtitle = isInstalled\n        ? \"Setup complete! Everything went smooth as a breeze!\"\n        : \"We're finalizing installation of Webiny...please wait.\";\n\n    return (\n        <Container title={\"Finish setup\"} message={subtitle}>\n            <Center>\n                <div style={{ width: 400 }}>\n                    <Grid>\n                        {error ? (\n                            <Grid.Column span={12} className={\"flex flex-col gap-4\"}>\n                                <Alert type={\"danger\"}>{error.data.reason}</Alert>\n                                <Button\n                                    containerClassName={\"w-full\"}\n                                    className={\"w-full\"}\n                                    variant={\"secondary\"}\n                                    size={\"lg\"}\n                                    text={\"Restart installation\"}\n                                    onClick={handleRestartInstallation}\n                                />\n                            </Grid.Column>\n                        ) : (\n                            <></>\n                        )}\n                        {installing ? (\n                            <Grid.Column span={12}>\n                                <div className=\"flex flex-col items-center gap-4 mt-8\">\n                                    <Loader\n                                        size=\"lg\"\n                                        variant=\"accent\"\n                                        indeterminate={true}\n                                        text=\"Installing Webiny...\"\n                                    />\n                                </div>\n                            </Grid.Column>\n                        ) : (\n                            <></>\n                        )}\n                        {!error && isInstalled ? (\n                            <Grid.Column span={12}>\n                                <Button\n                                    containerClassName={\"w-full\"}\n                                    className={\"w-full\"}\n                                    variant={\"primary\"}\n                                    size={\"lg\"}\n                                    text={\"Start using Webiny\"}\n                                    onClick={() => handleStartUsing(finishInstallation)}\n                                />\n                            </Grid.Column>\n                        ) : (\n                            <></>\n                        )}\n                    </Grid>\n                </div>\n            </Center>\n        </Container>\n    );\n};\n"],"names":["FinishSetupStep","error","isInstalled","installing","installSystem","finishInstallation","useEffect","subtitle","Container","Center","Grid","Alert","Button","handleRestartInstallation","Loader","handleStartUsing"],"mappings":";;;;;;AAmBO,MAAMA,kBAAkB,CAAC,EAC5BC,KAAK,EACLC,WAAW,EACXC,UAAU,EACVC,aAAa,EACbC,kBAAkB,EACV;IACRC,UAAU;QACNF;IACJ,GAAG,EAAE;IAEL,MAAMG,WAAWL,cACX,wDACA;IAEN,OAAO,WAAP,GACI,oBAACM,WAASA;QAAC,OAAO;QAAgB,SAASD;qBACvC,oBAACE,QAAMA,MAAAA,WAAAA,GACH,oBAAC;QAAI,OAAO;YAAE,OAAO;QAAI;qBACrB,oBAACC,MAAIA,MACAT,QAAQ,WAARA,GACG,oBAACS,KAAK,MAAM;QAAC,MAAM;QAAI,WAAW;qBAC9B,oBAACC,OAAKA;QAAC,MAAM;OAAWV,MAAM,IAAI,CAAC,MAAM,iBACzC,oBAACW,QAAMA;QACH,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,MAAM;QACN,MAAM;QACN,SAASC;wBAIjB,2CAEHV,aAAa,WAAbA,GACG,oBAACO,KAAK,MAAM;QAAC,MAAM;qBACf,oBAAC;QAAI,WAAU;qBACX,oBAACI,QAAMA;QACH,MAAK;QACL,SAAQ;QACR,eAAe;QACf,MAAK;yBAKjB,2CAEH,CAACb,SAASC,cAAc,WAAdA,GACP,oBAACQ,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACE,QAAMA;QACH,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,MAAM;QACN,MAAM;QACN,SAAS,IAAMG,iBAAiBV;wBAIxC;AAO5B"}
+{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/FinishSetup.js","sources":["../../../../../../src/presentation/installation/components/SystemInstaller/steps/FinishSetup.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { Button, Grid, Loader, Alert } from \"@webiny/admin-ui\";\nimport { Center } from \"./Center.js\";\nimport { Container } from \"./Container.js\";\nimport type {\n    ErrorObject,\n    ISystemInstallerPresenter\n} from \"~/presentation/installation/presenters/SystemInstaller/abstractions.js\";\nimport { handleStartUsing } from \"./FinishSetup/handleStartUsing.js\";\nimport { handleRestartInstallation } from \"./FinishSetup/handleRestartInstallation.js\";\n\ninterface StepProps {\n    error?: ErrorObject;\n    isInstalled: boolean;\n    installing: boolean;\n    installSystem: ISystemInstallerPresenter[\"installSystem\"];\n    finishInstallation: ISystemInstallerPresenter[\"finishInstallation\"];\n}\n\nexport const FinishSetupStep = ({\n    error,\n    isInstalled,\n    installing,\n    installSystem,\n    finishInstallation\n}: StepProps) => {\n    useEffect(() => {\n        installSystem();\n    }, []);\n\n    const subtitle = isInstalled\n        ? \"Setup complete! Everything went smooth as a breeze!\"\n        : \"We're finalizing installation of Webiny...please wait.\";\n\n    return (\n        <Container title={\"Finish setup\"} message={subtitle}>\n            <Center>\n                <div style={{ width: 400 }}>\n                    <Grid>\n                        {error ? (\n                            <Grid.Column span={12} className={\"flex flex-col gap-4\"}>\n                                <Alert type={\"danger\"}>\n                                    {error.data?.reason ?? error.message ?? \"Installation failed.\"}\n                                </Alert>\n                                <Button\n                                    containerClassName={\"w-full\"}\n                                    className={\"w-full\"}\n                                    variant={\"secondary\"}\n                                    size={\"lg\"}\n                                    text={\"Restart installation\"}\n                                    onClick={handleRestartInstallation}\n                                />\n                            </Grid.Column>\n                        ) : (\n                            <></>\n                        )}\n                        {installing ? (\n                            <Grid.Column span={12}>\n                                <div className=\"flex flex-col items-center gap-4 mt-8\">\n                                    <Loader\n                                        size=\"lg\"\n                                        variant=\"accent\"\n                                        indeterminate={true}\n                                        text=\"Installing Webiny...\"\n                                    />\n                                </div>\n                            </Grid.Column>\n                        ) : (\n                            <></>\n                        )}\n                        {!error && isInstalled ? (\n                            <Grid.Column span={12}>\n                                <Button\n                                    containerClassName={\"w-full\"}\n                                    className={\"w-full\"}\n                                    variant={\"primary\"}\n                                    size={\"lg\"}\n                                    text={\"Start using Webiny\"}\n                                    onClick={() => handleStartUsing(finishInstallation)}\n                                />\n                            </Grid.Column>\n                        ) : (\n                            <></>\n                        )}\n                    </Grid>\n                </div>\n            </Center>\n        </Container>\n    );\n};\n"],"names":["FinishSetupStep","error","isInstalled","installing","installSystem","finishInstallation","useEffect","subtitle","Container","Center","Grid","Alert","Button","handleRestartInstallation","Loader","handleStartUsing"],"mappings":";;;;;;AAmBO,MAAMA,kBAAkB,CAAC,EAC5BC,KAAK,EACLC,WAAW,EACXC,UAAU,EACVC,aAAa,EACbC,kBAAkB,EACV;IACRC,UAAU;QACNF;IACJ,GAAG,EAAE;IAEL,MAAMG,WAAWL,cACX,wDACA;IAEN,OAAO,WAAP,GACI,oBAACM,WAASA;QAAC,OAAO;QAAgB,SAASD;qBACvC,oBAACE,QAAMA,MAAAA,WAAAA,GACH,oBAAC;QAAI,OAAO;YAAE,OAAO;QAAI;qBACrB,oBAACC,MAAIA,MACAT,QAAQ,WAARA,GACG,oBAACS,KAAK,MAAM;QAAC,MAAM;QAAI,WAAW;qBAC9B,oBAACC,OAAKA;QAAC,MAAM;OACRV,MAAM,IAAI,EAAE,UAAUA,MAAM,OAAO,IAAI,uCAE5C,oBAACW,QAAMA;QACH,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,MAAM;QACN,MAAM;QACN,SAASC;wBAIjB,2CAEHV,aAAa,WAAbA,GACG,oBAACO,KAAK,MAAM;QAAC,MAAM;qBACf,oBAAC;QAAI,WAAU;qBACX,oBAACI,QAAMA;QACH,MAAK;QACL,SAAQ;QACR,eAAe;QACf,MAAK;yBAKjB,2CAEH,CAACb,SAASC,cAAc,WAAdA,GACP,oBAACQ,KAAK,MAAM;QAAC,MAAM;qBACf,oBAACE,QAAMA;QACH,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,MAAM;QACN,MAAM;QACN,SAAS,IAAMG,iBAAiBV;wBAIxC;AAO5B"}

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

@@ -46,10 +46,12 @@ class SystemInstallerPresenterImpl {
                     this.isInstalled = true;
                     this.installing = false;
                 });
-                this.newsletter.subscribe({
-                    email: installerData.Cognito.email,
-                    firstName: installerData.Cognito.firstName,
-                    lastName: installerData.Cognito.lastName
+                const authApp = process.env.REACT_APP_AUTH_INSTALLER_APP_NAME || "Cognito";
+                const adminUser = installerData[authApp];
+                if (adminUser) this.newsletter.subscribe({
+                    email: adminUser.email,
+                    firstName: adminUser.firstName,
+                    lastName: adminUser.lastName
                 });
             } catch (error) {
                 runInAction(()=>{
@@ -71,7 +73,7 @@ class SystemInstallerPresenterImpl {
                 name: "basic-info",
                 label: "Basic info"
             },
-            "cognito" === process.env.REACT_APP_IDP_TYPE ? {
+            "cognito" === process.env.REACT_APP_IDP_TYPE || Boolean(process.env.REACT_APP_AUTH_INSTALLER_APP_NAME) ? {
                 name: "admin-account",
                 label: "Admin account"
             } : void 0,

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            process.env.REACT_APP_IDP_TYPE === \"cognito\"\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            this.newsletter.subscribe({\n                email: installerData.Cognito.email,\n                firstName: installerData.Cognito.firstName,\n                lastName: installerData.Cognito.lastName\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","error","console","process","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. 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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"}

package/presentation/listPresenter/FolderAwareDataSource.d.ts

@@ -0,0 +1,50 @@
+import type { IDataSource, IDataSourceQuery, IDataSourceMeta } from "./abstractions.js";
+import { QueryMatcher } from "./QueryMatcher.js";
+export interface FolderAwareDataSourceConfig<TRow> {
+    locationField?: string;
+    registeredFilterNames?: string[];
+    getDescendantFolders?: {
+        execute(folderId: string): {
+            id: string;
+        }[];
+    };
+    keyField: keyof TRow & string;
+    localFilters?: Record<string, (item: TRow, value: unknown) => boolean>;
+}
+export interface FetchParams {
+    where?: Record<string, unknown>;
+    sort?: string[];
+    search?: string;
+    limit?: number;
+    after?: string;
+}
+export interface FetchResult<TRow> {
+    data: TRow[];
+    meta: {
+        cursor: string | null;
+        hasMoreItems: boolean;
+        totalCount: number;
+    };
+}
+export declare abstract class FolderAwareDataSource<TRow> implements IDataSource<TRow> {
+    private _meta;
+    private _loading;
+    private _locationField;
+    private _registeredFilterNames;
+    private _getDescendantFolders;
+    private _keyField;
+    protected queryMatcher: QueryMatcher<TRow>;
+    constructor(config: FolderAwareDataSourceConfig<TRow>);
+    abstract get rows(): TRow[];
+    abstract fetch(params: FetchParams): Promise<FetchResult<TRow>>;
+    protected onQueryResult(_data: TRow[]): void;
+    protected onLoadMoreResult(_data: TRow[]): void;
+    get meta(): IDataSourceMeta;
+    get loading(): boolean;
+    query(params: IDataSourceQuery): Promise<void>;
+    loadMore(params: IDataSourceQuery): Promise<void>;
+    protected customizeWhere(_where: Record<string, unknown>, _filters: Record<string, unknown>): void;
+    protected shouldExpandFolders(_filters: Record<string, unknown>): boolean;
+    private buildWhere;
+    private buildSort;
+}

package/presentation/listPresenter/FolderAwareDataSource.js

@@ -0,0 +1,135 @@
+import { action, computed, makeObservable, observable, runInAction } from "mobx";
+import { QueryMatcher } from "./QueryMatcher.js";
+class FolderAwareDataSource {
+    constructor(config){
+        this._meta = {
+            cursor: null,
+            hasMoreItems: false,
+            totalCount: 0
+        };
+        this._loading = false;
+        this._locationField = config.locationField ?? "location";
+        this._registeredFilterNames = new Set([
+            ...config.registeredFilterNames ?? [],
+            ...Object.keys(config.localFilters ?? {})
+        ]);
+        this._getDescendantFolders = config.getDescendantFolders;
+        this._keyField = config.keyField;
+        const locationField = this._locationField;
+        const localFilters = {
+            folderId: (item, value)=>{
+                const folderId = value;
+                const location = item[locationField];
+                const itemFolderId = location?.folderId;
+                if (folderId && "root" !== folderId) return itemFolderId === folderId;
+                return !itemFolderId || "root" === itemFolderId;
+            },
+            ...config.localFilters
+        };
+        this.queryMatcher = new QueryMatcher({
+            keyField: config.keyField,
+            localFilters
+        });
+        makeObservable(this, {
+            _meta: observable,
+            _loading: observable,
+            meta: computed,
+            loading: computed,
+            query: action,
+            loadMore: action
+        });
+    }
+    onQueryResult(_data) {}
+    onLoadMoreResult(_data) {}
+    get meta() {
+        return this._meta;
+    }
+    get loading() {
+        return this._loading;
+    }
+    async query(params) {
+        this._loading = true;
+        try {
+            const result = await this.fetch({
+                where: this.buildWhere(params),
+                sort: this.buildSort(params),
+                search: params.search,
+                limit: params.limit,
+                after: params.cursor
+            });
+            runInAction(()=>{
+                this.onQueryResult(result.data);
+                this.queryMatcher.updateFromQuery(params, result.data.map((item)=>String(item[this._keyField])));
+                this._meta = {
+                    cursor: result.meta.cursor,
+                    hasMoreItems: result.meta.hasMoreItems,
+                    totalCount: result.meta.totalCount
+                };
+            });
+        } finally{
+            runInAction(()=>{
+                this._loading = false;
+            });
+        }
+    }
+    async loadMore(params) {
+        if (!this._meta.hasMoreItems || this._loading) return;
+        this._loading = true;
+        try {
+            const result = await this.fetch({
+                where: this.buildWhere(params),
+                sort: this.buildSort(params),
+                search: params.search,
+                limit: params.limit,
+                after: this._meta.cursor ?? void 0
+            });
+            runInAction(()=>{
+                this.onLoadMoreResult(result.data);
+                this.queryMatcher.appendResultKeys(result.data.map((item)=>String(item[this._keyField])));
+                this._meta = {
+                    cursor: result.meta.cursor,
+                    hasMoreItems: result.meta.hasMoreItems,
+                    totalCount: result.meta.totalCount
+                };
+            });
+        } finally{
+            runInAction(()=>{
+                this._loading = false;
+            });
+        }
+    }
+    customizeWhere(_where, _filters) {}
+    shouldExpandFolders(_filters) {
+        return false;
+    }
+    buildWhere(params) {
+        const where = {};
+        const filters = params.filters ?? {};
+        const folderId = filters.folderId || "root";
+        const isRoot = "root" === folderId;
+        const hasAdvancedFilters = Object.keys(filters).some((k)=>"folderId" !== k && !this._registeredFilterNames.has(k));
+        const isSearching = !!params.search || hasAdvancedFilters || this.shouldExpandFolders(filters);
+        if (isSearching && isRoot) ;
+        else if (isSearching && this._getDescendantFolders) {
+            const descendants = this._getDescendantFolders.execute(folderId);
+            const folderIds = descendants.map((f)=>f.id);
+            where[this._locationField] = {
+                folderId_in: folderIds
+            };
+        } else where[this._locationField] = {
+            folderId
+        };
+        for (const [key, value] of Object.entries(filters))if ("folderId" !== key) where[key] = value;
+        this.customizeWhere(where, filters);
+        return Object.keys(where).length > 0 ? where : void 0;
+    }
+    buildSort(params) {
+        if (!params.sort) return;
+        return [
+            `${params.sort.field}_${params.sort.direction}`
+        ];
+    }
+}
+export { FolderAwareDataSource };
+
+//# sourceMappingURL=FolderAwareDataSource.js.map

package/presentation/listPresenter/FolderAwareDataSource.js.map

@@ -0,0 +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([\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        });\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","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/ListPresenter.d.ts

@@ -2,6 +2,7 @@ import { type IListPresenter, type IListPresenterConfig, type IListViewModel, ty
 declare class ListPresenterImpl<TRow> implements IListPresenter<TRow> {
     private _sort;
     private _filters;
+    private _initialFilterKeys;
     private _search;
     private _selection;
     private _error;
@@ -13,6 +14,8 @@ declare class ListPresenterImpl<TRow> implements IListPresenter<TRow> {
     private _limit;
     private _initialized;
     private _loadingMore;
+    private _showingFilters;
+    private _itemLabel;
     constructor();
     get vm(): IListViewModel<TRow>;
     actions: IListActions;
@@ -23,6 +26,7 @@ declare class ListPresenterImpl<TRow> implements IListPresenter<TRow> {
     private debouncedRequery;
     private clearDebounce;
     private getRowId;
+    private buildSelectionLabel;
     private toListError;
 }
 export declare const ListPresenter: typeof ListPresenterImpl & {

package/presentation/listPresenter/ListPresenter.js

@@ -5,6 +5,7 @@ class ListPresenterImpl {
     constructor(){
         this._sort = null;
         this._filters = {};
+        this._initialFilterKeys = new Set();
         this._search = "";
         this._error = null;
         this._appliedQuery = null;
@@ -15,6 +16,11 @@ class ListPresenterImpl {
         this._limit = void 0;
         this._initialized = false;
         this._loadingMore = false;
+        this._showingFilters = false;
+        this._itemLabel = {
+            singular: "item",
+            plural: "items"
+        };
         this.actions = {
             search: {
                 set: (query)=>{
@@ -64,6 +70,12 @@ class ListPresenterImpl {
                 clearAll: ()=>{
                     this._filters = {};
                     this.requery();
+                },
+                show: ()=>{
+                    this._showingFilters = true;
+                },
+                hide: ()=>{
+                    this._showingFilters = false;
                 }
             },
             selection: {
@@ -113,7 +125,7 @@ class ListPresenterImpl {
             totalCount: 0
         };
         const loading = ds ? ds.loading : false;
-        const hasFilters = Object.keys(this._filters).length > 0 || this._search.length > 0;
+        const hasUserFilters = Object.keys(this._filters).some((k)=>!this._initialFilterKeys.has(k)) || this._search.length > 0;
         return {
             rows,
             sort: this._sort,
@@ -130,10 +142,12 @@ class ListPresenterImpl {
             selection: {
                 selectedIds: this._selection.selectedIds,
                 selectedCount: this._selection.selectedCount,
-                allSelected: this._selection.allSelected
+                allSelected: this._selection.allSelected,
+                label: this.buildSelectionLabel()
             },
+            showingFilters: this._showingFilters,
             empty: 0 === rows.length && !loading,
-            emptyWithFilters: 0 === rows.length && !loading && hasFilters,
+            emptyWithFilters: 0 === rows.length && !loading && hasUserFilters,
             error: this._error
         };
     }
@@ -141,9 +155,14 @@ class ListPresenterImpl {
         this._dataSource = config.dataSource;
         this._sort = config.initialSort ?? null;
         this._filters = config.initialFilters ?? {};
+        this._initialFilterKeys = new Set(Object.keys(this._filters));
         this._debounceMs = config.debounceMs ?? 300;
         this._limit = config.limit;
-        this._search = "";
+        this._itemLabel = config.itemLabel ?? {
+            singular: "item",
+            plural: "items"
+        };
+        this._search = config.initialSearch ?? "";
         this._appliedQuery = null;
         this._selection.reset();
         this._initialized = true;
@@ -200,6 +219,13 @@ class ListPresenterImpl {
     getRowId(row) {
         return row.id;
     }
+    buildSelectionLabel() {
+        const { selectedCount, allSelected } = this._selection;
+        if (allSelected) return `all ${this._itemLabel.plural}`;
+        if (0 === selectedCount) return "";
+        const noun = 1 === selectedCount ? this._itemLabel.singular : this._itemLabel.plural;
+        return `${selectedCount} ${noun}`;
+    }
     toListError(err) {
         if (err instanceof Error) return {
             code: "UNKNOWN",