@webiny/app-admin 0.0.0-unstable.7be00a75a9 → 0.0.0-unstable.7c2def32a7

package/presentation/iconPicker/customIcons/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/iconPicker/customIcons/abstractions.js","sources":["../../../../src/presentation/iconPicker/customIcons/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/admin\";\nimport type { ICustomIcon } from \"~/features/iconPicker/listCustomIcons/abstractions.js\";\n\nexport interface ICustomIconsViewModel {\n    loading: boolean;\n    icons: ICustomIcon[];\n}\n\nexport interface ICustomIconsPresenter {\n    readonly vm: ICustomIconsViewModel;\n    load(): Promise<ICustomIcon[]>;\n}\n\nexport const CustomIconsPresenter = createAbstraction<ICustomIconsPresenter>(\n    \"IconPicker/CustomIconsPresenter\"\n);\n\nexport namespace CustomIconsPresenter {\n    export type Interface = ICustomIconsPresenter;\n    export type ViewModel = ICustomIconsViewModel;\n}\n"],"names":["CustomIconsPresenter","createAbstraction"],"mappings":";AAaO,MAAMA,uBAAuBC,kBAChC"}

package/presentation/iconPicker/customIcons/feature.d.ts

@@ -0,0 +1,3 @@
+export declare const CustomIconsPresenterFeature: import("@webiny/feature/admin").FeatureDefinition<{
+    presenter: import("./abstractions.js").ICustomIconsPresenter;
+}, []>;

package/presentation/iconPicker/customIcons/feature.js

@@ -0,0 +1,17 @@
+import { createFeature } from "@webiny/feature/admin";
+import { CustomIconsPresenter } from "./abstractions.js";
+import { CustomIconsPresenter as external_CustomIconsPresenter_js_CustomIconsPresenter } from "./CustomIconsPresenter.js";
+const CustomIconsPresenterFeature = createFeature({
+    name: "IconPicker/CustomIconsPresenter",
+    register (container) {
+        container.register(external_CustomIconsPresenter_js_CustomIconsPresenter).inSingletonScope();
+    },
+    resolve (container) {
+        return {
+            presenter: container.resolve(CustomIconsPresenter)
+        };
+    }
+});
+export { CustomIconsPresenterFeature };
+
+//# sourceMappingURL=feature.js.map

package/presentation/iconPicker/customIcons/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/iconPicker/customIcons/feature.js","sources":["../../../../src/presentation/iconPicker/customIcons/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { CustomIconsPresenter as Abstraction } from \"./abstractions.js\";\nimport { CustomIconsPresenter } from \"./CustomIconsPresenter.js\";\n\nexport const CustomIconsPresenterFeature = createFeature({\n    name: \"IconPicker/CustomIconsPresenter\",\n    register(container) {\n        container.register(CustomIconsPresenter).inSingletonScope();\n    },\n    resolve(container) {\n        return {\n            presenter: container.resolve(Abstraction)\n        };\n    }\n});\n"],"names":["CustomIconsPresenterFeature","createFeature","container","CustomIconsPresenter","Abstraction"],"mappings":";;;AAIO,MAAMA,8BAA8BC,cAAc;IACrD,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,uDAAsB,gBAAgB;IAC7D;IACA,SAAQD,SAAS;QACb,OAAO;YACH,WAAWA,UAAU,OAAO,CAACE;QACjC;IACJ;AACJ"}

package/presentation/iconPicker/customIcons/index.d.ts

@@ -0,0 +1,3 @@
+export { CustomIconsPresenter } from "./abstractions.js";
+export type { ICustomIconsPresenter, ICustomIconsViewModel } from "./abstractions.js";
+export { CustomIconsPresenterFeature } from "./feature.js";

package/presentation/iconPicker/customIcons/index.js

@@ -0,0 +1,2 @@
+export { CustomIconsPresenter } from "./abstractions.js";
+export { CustomIconsPresenterFeature } from "./feature.js";

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/SystemInstaller.js

@@ -26,6 +26,8 @@ const SystemInstaller = observer(({ children })=>{
         tags: {
             installer: true
         }
+    }, /*#__PURE__*/ react.createElement("div", {
+        className: "flex w-full"
     }, /*#__PURE__*/ react.createElement("div", {
         className: "bg-neutral-light h-screen w-[312px] p-xl"
     }, /*#__PURE__*/ react.createElement("div", {
@@ -56,7 +58,7 @@ const SystemInstaller = observer(({ children })=>{
         isInstalled: vm.isInstalled,
         finishInstallation: presenter.finishInstallation,
         installSystem: presenter.installSystem
-    }) : null));
+    }) : null)));
 });
 export { SystemInstaller };
 

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

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/components/SystemInstaller/SystemInstaller.js","sources":["../../../../../src/presentation/installation/components/SystemInstaller/SystemInstaller.tsx"],"sourcesContent":["import React from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { useFeature } from \"@webiny/app\";\nimport { OverlayLoader, ProgressItemState, SteppedProgress, Text } from \"@webiny/admin-ui\";\nimport { SystemInstallerFeature } from \"~/presentation/installation/presenters/SystemInstaller/feature.js\";\nimport { LoginScreen } from \"~/base/ui/LoginScreen.js\";\nimport { Tags } from \"~/base/ui/Tags.js\";\nimport { Logo } from \"~/base/ui/Logo.js\";\nimport { IntroductionStep } from \"./steps/IntroductionStep.js\";\nimport { BasicInfoStep } from \"./steps/BasicInfoStep.js\";\nimport { AdminUserStep } from \"./steps/AdminUserStep.js\";\nimport { FinishSetupStep } from \"~/presentation/installation/components/SystemInstaller/steps/FinishSetup.js\";\n\ninterface SystemInstallerProps {\n    children: React.ReactNode;\n}\n\nconst stateMap = {\n    idle: ProgressItemState.IDLE,\n    current: ProgressItemState.IN_PROGRESS,\n    completed: ProgressItemState.COMPLETED_AFFIRMATIVE\n};\n\nexport const SystemInstaller = observer(({ children }: SystemInstallerProps) => {\n    const { presenter } = useFeature(SystemInstallerFeature);\n\n    const vm = presenter.vm;\n\n    if (vm.loading) {\n        return <OverlayLoader text={\"Preparing system...\"} />;\n    }\n\n    if (vm.startUsing) {\n        return <LoginScreen>{children}</LoginScreen>;\n    }\n\n    return (\n        <Tags tags={{ installer: true }}>\n            <div className={\"bg-neutral-light h-screen w-[312px] p-xl\"}>\n                <div className={\"w-[240px] p-\"}>\n                    <div className={\"mb-lg\"}>\n                        <Logo />\n                    </div>\n                    <Text as=\"div\" size={\"md\"} className={\"text-neutral-strong mb-lg\"}>\n                        Follow these steps to create your very first Webiny project:\n                    </Text>\n                    <SteppedProgress\n                        items={vm.steps.map(step => ({\n                            id: step.name,\n                            label: step.label,\n                            state: stateMap[step.state]\n                        }))}\n                    />\n                </div>\n            </div>\n            <div className={\"flex h-screen w-full justify-center\"}>\n                {vm.currentStep === \"introduction\" ? (\n                    <IntroductionStep nextStep={presenter.nextStep} />\n                ) : null}\n                {vm.currentStep === \"basic-info\" ? (\n                    <BasicInfoStep nextStep={presenter.nextStep} />\n                ) : null}\n                {vm.currentStep === \"admin-account\" ? (\n                    <AdminUserStep nextStep={presenter.nextStep} />\n                ) : null}\n                {vm.currentStep === \"finish\" ? (\n                    <FinishSetupStep\n                        error={vm.error}\n                        installing={vm.installing}\n                        isInstalled={vm.isInstalled}\n                        finishInstallation={presenter.finishInstallation}\n                        installSystem={presenter.installSystem}\n                    />\n                ) : null}\n            </div>\n        </Tags>\n    );\n});\n"],"names":["stateMap","ProgressItemState","SystemInstaller","observer","children","presenter","useFeature","SystemInstallerFeature","vm","OverlayLoader","LoginScreen","Tags","Logo","Text","SteppedProgress","step","IntroductionStep","BasicInfoStep","AdminUserStep","FinishSetupStep"],"mappings":";;;;;;;;;;;;AAiBA,MAAMA,WAAW;IACb,MAAMC,kBAAkB,IAAI;IAC5B,SAASA,kBAAkB,WAAW;IACtC,WAAWA,kBAAkB,qBAAqB;AACtD;AAEO,MAAMC,kBAAkBC,SAAS,CAAC,EAAEC,QAAQ,EAAwB;IACvE,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjC,MAAMC,KAAKH,UAAU,EAAE;IAEvB,IAAIG,GAAG,OAAO,EACV,OAAO,WAAP,GAAO,oBAACC,eAAaA;QAAC,MAAM;;IAGhC,IAAID,GAAG,UAAU,EACb,OAAO,WAAP,GAAO,oBAACE,aAAWA,MAAEN;IAGzB,OAAO,WAAP,GACI,oBAACO,MAAIA;QAAC,MAAM;YAAE,WAAW;QAAK;qBAC1B,oBAAC;QAAI,WAAW;qBACZ,oBAAC;QAAI,WAAW;qBACZ,oBAAC;QAAI,WAAW;qBACZ,oBAACC,MAAIA,QAAAA,WAAAA,GAET,oBAACC,MAAIA;QAAC,IAAG;QAAM,MAAM;QAAM,WAAW;OAA6B,+EAGnE,oBAACC,iBAAeA;QACZ,OAAON,GAAG,KAAK,CAAC,GAAG,CAACO,CAAAA,OAAS;gBACzB,IAAIA,KAAK,IAAI;gBACb,OAAOA,KAAK,KAAK;gBACjB,OAAOf,QAAQ,CAACe,KAAK,KAAK,CAAC;YAC/B;wBAIZ,oBAAC;QAAI,WAAW;OACXP,AAAmB,mBAAnBA,GAAG,WAAW,GAAsB,WAAjB,GAChB,oBAACQ,kBAAgBA;QAAC,UAAUX,UAAU,QAAQ;SAC9C,MACHG,AAAmB,iBAAnBA,GAAG,WAAW,GAAoB,WAAf,GAChB,oBAACS,eAAaA;QAAC,UAAUZ,UAAU,QAAQ;SAC3C,MACHG,AAAmB,oBAAnBA,GAAG,WAAW,GAAuB,WAAlB,GAChB,oBAACU,eAAaA;QAAC,UAAUb,UAAU,QAAQ;SAC3C,MACHG,AAAmB,aAAnBA,GAAG,WAAW,GAAgB,WAAX,GAChB,oBAACW,iBAAeA;QACZ,OAAOX,GAAG,KAAK;QACf,YAAYA,GAAG,UAAU;QACzB,aAAaA,GAAG,WAAW;QAC3B,oBAAoBH,UAAU,kBAAkB;QAChD,eAAeA,UAAU,aAAa;SAE1C;AAIpB"}
+{"version":3,"file":"presentation/installation/components/SystemInstaller/SystemInstaller.js","sources":["../../../../../src/presentation/installation/components/SystemInstaller/SystemInstaller.tsx"],"sourcesContent":["import React from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { useFeature } from \"@webiny/app\";\nimport { OverlayLoader, ProgressItemState, SteppedProgress, Text } from \"@webiny/admin-ui\";\nimport { SystemInstallerFeature } from \"~/presentation/installation/presenters/SystemInstaller/feature.js\";\nimport { LoginScreen } from \"~/base/ui/LoginScreen.js\";\nimport { Tags } from \"~/base/ui/Tags.js\";\nimport { Logo } from \"~/base/ui/Logo.js\";\nimport { IntroductionStep } from \"./steps/IntroductionStep.js\";\nimport { BasicInfoStep } from \"./steps/BasicInfoStep.js\";\nimport { AdminUserStep } from \"./steps/AdminUserStep.js\";\nimport { FinishSetupStep } from \"~/presentation/installation/components/SystemInstaller/steps/FinishSetup.js\";\n\ninterface SystemInstallerProps {\n    children: React.ReactNode;\n}\n\nconst stateMap = {\n    idle: ProgressItemState.IDLE,\n    current: ProgressItemState.IN_PROGRESS,\n    completed: ProgressItemState.COMPLETED_AFFIRMATIVE\n};\n\nexport const SystemInstaller = observer(({ children }: SystemInstallerProps) => {\n    const { presenter } = useFeature(SystemInstallerFeature);\n\n    const vm = presenter.vm;\n\n    if (vm.loading) {\n        return <OverlayLoader text={\"Preparing system...\"} />;\n    }\n\n    if (vm.startUsing) {\n        return <LoginScreen>{children}</LoginScreen>;\n    }\n\n    return (\n        <Tags tags={{ installer: true }}>\n            <div className=\"flex w-full\">\n                <div className={\"bg-neutral-light h-screen w-[312px] p-xl\"}>\n                    <div className={\"w-[240px] p-\"}>\n                        <div className={\"mb-lg\"}>\n                            <Logo />\n                        </div>\n                        <Text as=\"div\" size={\"md\"} className={\"text-neutral-strong mb-lg\"}>\n                            Follow these steps to create your very first Webiny project:\n                        </Text>\n                        <SteppedProgress\n                            items={vm.steps.map(step => ({\n                                id: step.name,\n                                label: step.label,\n                                state: stateMap[step.state]\n                            }))}\n                        />\n                    </div>\n                </div>\n                <div className={\"flex h-screen w-full justify-center\"}>\n                    {vm.currentStep === \"introduction\" ? (\n                        <IntroductionStep nextStep={presenter.nextStep} />\n                    ) : null}\n                    {vm.currentStep === \"basic-info\" ? (\n                        <BasicInfoStep nextStep={presenter.nextStep} />\n                    ) : null}\n                    {vm.currentStep === \"admin-account\" ? (\n                        <AdminUserStep nextStep={presenter.nextStep} />\n                    ) : null}\n                    {vm.currentStep === \"finish\" ? (\n                        <FinishSetupStep\n                            error={vm.error}\n                            installing={vm.installing}\n                            isInstalled={vm.isInstalled}\n                            finishInstallation={presenter.finishInstallation}\n                            installSystem={presenter.installSystem}\n                        />\n                    ) : null}\n                </div>\n            </div>\n        </Tags>\n    );\n});\n"],"names":["stateMap","ProgressItemState","SystemInstaller","observer","children","presenter","useFeature","SystemInstallerFeature","vm","OverlayLoader","LoginScreen","Tags","Logo","Text","SteppedProgress","step","IntroductionStep","BasicInfoStep","AdminUserStep","FinishSetupStep"],"mappings":";;;;;;;;;;;;AAiBA,MAAMA,WAAW;IACb,MAAMC,kBAAkB,IAAI;IAC5B,SAASA,kBAAkB,WAAW;IACtC,WAAWA,kBAAkB,qBAAqB;AACtD;AAEO,MAAMC,kBAAkBC,SAAS,CAAC,EAAEC,QAAQ,EAAwB;IACvE,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjC,MAAMC,KAAKH,UAAU,EAAE;IAEvB,IAAIG,GAAG,OAAO,EACV,OAAO,WAAP,GAAO,oBAACC,eAAaA;QAAC,MAAM;;IAGhC,IAAID,GAAG,UAAU,EACb,OAAO,WAAP,GAAO,oBAACE,aAAWA,MAAEN;IAGzB,OAAO,WAAP,GACI,oBAACO,MAAIA;QAAC,MAAM;YAAE,WAAW;QAAK;qBAC1B,oBAAC;QAAI,WAAU;qBACX,oBAAC;QAAI,WAAW;qBACZ,oBAAC;QAAI,WAAW;qBACZ,oBAAC;QAAI,WAAW;qBACZ,oBAACC,MAAIA,QAAAA,WAAAA,GAET,oBAACC,MAAIA;QAAC,IAAG;QAAM,MAAM;QAAM,WAAW;OAA6B,+EAGnE,oBAACC,iBAAeA;QACZ,OAAON,GAAG,KAAK,CAAC,GAAG,CAACO,CAAAA,OAAS;gBACzB,IAAIA,KAAK,IAAI;gBACb,OAAOA,KAAK,KAAK;gBACjB,OAAOf,QAAQ,CAACe,KAAK,KAAK,CAAC;YAC/B;wBAIZ,oBAAC;QAAI,WAAW;OACXP,AAAmB,mBAAnBA,GAAG,WAAW,GAAsB,WAAjB,GAChB,oBAACQ,kBAAgBA;QAAC,UAAUX,UAAU,QAAQ;SAC9C,MACHG,AAAmB,iBAAnBA,GAAG,WAAW,GAAoB,WAAf,GAChB,oBAACS,eAAaA;QAAC,UAAUZ,UAAU,QAAQ;SAC3C,MACHG,AAAmB,oBAAnBA,GAAG,WAAW,GAAuB,WAAlB,GAChB,oBAACU,eAAaA;QAAC,UAAUb,UAAU,QAAQ;SAC3C,MACHG,AAAmB,aAAnBA,GAAG,WAAW,GAAgB,WAAX,GAChB,oBAACW,iBAAeA;QACZ,OAAOX,GAAG,KAAK;QACf,YAAYA,GAAG,UAAU;QACzB,aAAaA,GAAG,WAAW;QAC3B,oBAAoBH,UAAU,kBAAkB;QAChD,eAAeA,UAAU,aAAa;SAE1C;AAKxB"}

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,25 +18,26 @@ 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
     }, /*#__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,9 +46,9 @@ const AdminUserInputs = ()=>{
     }))), /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 12
     }, /*#__PURE__*/ react.createElement(Bind, {
-        name: "Cognito.password",
+        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    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 { 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/handleRestartInstallation.d.ts

@@ -0,0 +1 @@
+export declare const handleRestartInstallation: () => void;

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

@@ -0,0 +1,6 @@
+const handleRestartInstallation = ()=>{
+    window.location.reload();
+};
+export { handleRestartInstallation };
+
+//# sourceMappingURL=handleRestartInstallation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"presentation/installation/components/SystemInstaller/steps/FinishSetup/handleRestartInstallation.js","sources":["../../../../../../../src/presentation/installation/components/SystemInstaller/steps/FinishSetup/handleRestartInstallation.ts"],"sourcesContent":["export const handleRestartInstallation = () => {\n    window.location.reload();\n};\n"],"names":["handleRestartInstallation","window"],"mappings":"AAAO,MAAMA,4BAA4B;IACrCC,OAAO,QAAQ,CAAC,MAAM;AAC1B"}

package/presentation/installation/components/SystemInstaller/steps/FinishSetup/handleStartUsing.d.ts

@@ -0,0 +1,2 @@
+import type { ISystemInstallerPresenter } from "../../../../../../presentation/installation/presenters/SystemInstaller/abstractions.js";
+export declare const handleStartUsing: (finishInstallation: ISystemInstallerPresenter["finishInstallation"]) => void;

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

@@ -0,0 +1,24 @@
+import { getMachineId } from "@webiny/telemetry/react.js";
+const INSTALL_FINISH_URL = process.env.REACT_APP_WEBINY_INSTALL_FINISH_URL || "https://www.webiny.com/install/finish";
+const buildInstallFinishHref = ()=>{
+    if ("false" === process.env.REACT_APP_WEBINY_TELEMETRY) return null;
+    if ("u" < typeof window) return null;
+    const machineId = getMachineId();
+    if (!machineId) return null;
+    const currentUrl = window.location.origin + window.location.pathname;
+    const params = new URLSearchParams({
+        machine_id: machineId,
+        return_to: currentUrl
+    });
+    return `${INSTALL_FINISH_URL}?${params.toString()}`;
+};
+const handleStartUsing = (finishInstallation)=>{
+    if ("u" > typeof window) {
+        const handoff = buildInstallFinishHref();
+        if (handoff) return void window.location.assign(handoff);
+    }
+    finishInstallation();
+};
+export { handleStartUsing };
+
+//# sourceMappingURL=handleStartUsing.js.map

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

@@ -0,0 +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, 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/components/SystemInstaller/steps/FinishSetup.js

@@ -2,6 +2,8 @@ import react, { useEffect } from "react";
 import { Alert, Button, Grid, Loader } from "@webiny/admin-ui";
 import { Center } from "./Center.js";
 import { Container } from "./Container.js";
+import { handleStartUsing } from "./FinishSetup/handleStartUsing.js";
+import { handleRestartInstallation } from "./FinishSetup/handleRestartInstallation.js";
 const FinishSetupStep = ({ error, isInstalled, installing, installSystem, finishInstallation })=>{
     useEffect(()=>{
         installSystem();
@@ -19,15 +21,13 @@ 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",
         size: "lg",
         text: "Restart installation",
-        onClick: ()=>{
-            window.location.reload();
-        }
+        onClick: handleRestartInstallation
     })) : /*#__PURE__*/ react.createElement(react.Fragment, null), installing ? /*#__PURE__*/ react.createElement(Grid.Column, {
         span: 12
     }, /*#__PURE__*/ react.createElement("div", {
@@ -45,7 +45,7 @@ const FinishSetupStep = ({ error, isInstalled, installing, installSystem, finish
         variant: "primary",
         size: "lg",
         text: "Start using Webiny",
-        onClick: finishInstallation
+        onClick: ()=>handleStartUsing(finishInstallation)
     })) : /*#__PURE__*/ react.createElement(react.Fragment, null)))));
 };
 export { FinishSetupStep };

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\";\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={() => {\n                                        window.location.reload();\n                                    }}\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={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","window","Loader"],"mappings":";;;;AAiBO,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,SAAS;YACLC,OAAO,QAAQ,CAAC,MAAM;QAC1B;wBAIR,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,SAASP;wBAIjB;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.d.ts

@@ -1,7 +1,9 @@
 import { SystemInstallerPresenter as Abstraction, SystemInstallerRepository, type SystemInstallerViewModel, type WizardStep } from "./abstractions.js";
 import { TelemetryService } from "../../../../features/telemetry/index.js";
+import { NewsletterSubscriptionService } from "../../../../features/newsletter/index.js";
 declare class SystemInstallerPresenterImpl implements Abstraction.Interface {
     private telemetry;
+    private newsletter;
     private repository;
     private loading;
     private isInstalled;
@@ -11,7 +13,7 @@ declare class SystemInstallerPresenterImpl implements Abstraction.Interface {
     private startUsing;
     private installerData;
     private wizardSteps;
-    constructor(telemetry: TelemetryService.Interface, repository: SystemInstallerRepository.Interface);
+    constructor(telemetry: TelemetryService.Interface, newsletter: NewsletterSubscriptionService.Interface, repository: SystemInstallerRepository.Interface);
     private initialize;
     get vm(): SystemInstallerViewModel;
     nextStep: (data?: Record<string, any>) => void;

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

@@ -2,9 +2,11 @@ import { makeAutoObservable, runInAction, toJS } from "mobx";
 import { createImplementation } from "@webiny/di";
 import { SystemInstallerPresenter, SystemInstallerRepository } from "./abstractions.js";
 import { TelemetryService } from "../../../../features/telemetry/index.js";
+import { NewsletterSubscriptionService } from "../../../../features/newsletter/index.js";
 class SystemInstallerPresenterImpl {
-    constructor(telemetry, repository){
+    constructor(telemetry, newsletter, repository){
         this.telemetry = telemetry;
+        this.newsletter = newsletter;
         this.repository = repository;
         this.loading = true;
         this.isInstalled = false;
@@ -38,14 +40,19 @@ class SystemInstallerPresenterImpl {
                     }));
                 await this.repository.installSystem(installationInput);
                 await this.telemetry.sendEvent("install-wizard-end", {
-                    project: basicInfo.projectName,
-                    organization: basicInfo.organizationName,
                     referralSource: basicInfo.referralSource
                 });
                 runInAction(()=>{
                     this.isInstalled = true;
                     this.installing = false;
                 });
+                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(()=>{
                     this.error = error;
@@ -66,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,
@@ -123,6 +130,7 @@ const SystemInstallerPresenter_SystemInstallerPresenter = createImplementation({
     implementation: SystemInstallerPresenterImpl,
     dependencies: [
         TelemetryService,
+        NewsletterSubscriptionService,
         SystemInstallerRepository
     ]
 });

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\";\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 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            await this.telemetry.sendEvent(\"install-wizard-end\", {\n                project: basicInfo.projectName,\n                organization: basicInfo.organizationName,\n                referralSource: basicInfo.referralSource\n            });\n\n            runInAction(() => {\n                this.isInstalled = true;\n                this.installing = false;\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, SystemInstallerRepository]\n});\n"],"names":["SystemInstallerPresenterImpl","telemetry","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","SystemInstallerRepository"],"mappings":";;;;AAaA,MAAMA;IAUF,YACYC,SAAqC,EACrCC,UAA+C,CACzD;aAFUD,SAAS,GAATA;aACAC,UAAU,GAAVA;aAXJ,OAAO,GAAG;aACV,WAAW,GAAG;aACd,WAAW,GAAG;aACd,KAAK,GAA4BC;aACjC,UAAU,GAAG;aACb,UAAU,GAAG;aACb,aAAa,GAAwB,CAAC;aAsE9C,QAAQ,GAAG,CAACC,OAA4B,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,GAAG;gBAChDC,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,EAAED,QAAQ,CAAC;gBAC3C,IAAI,CAAC,WAAW;YACpB;QACJ;aAEA,YAAY,GAAG;YACX,IAAI,IAAI,CAAC,WAAW,GAAG,GACnB,IAAI,CAAC,WAAW;QAExB;aAEA,QAAQ,GAAG,CAACE;YACR,MAAMC,YAAY,IAAI,CAAC,WAAW,CAAC,SAAS,CAACC,CAAAA,OAAQA,KAAK,IAAI,KAAKF;YAEnE,IAAIC,YAAY,IACZ,IAAI,CAAC,WAAW,GAAGA;QAE3B;aAEA,aAAa,GAAG;YACZE,YAAY;gBACR,IAAI,CAAC,UAAU,GAAG;YACtB;YACA,IAAI;gBACA,MAAM,EAAEC,SAAS,EAAE,GAAGC,eAAe,GAAGC,KAAK,IAAI,CAAC,aAAa;gBAC/D,MAAMC,oBAAuCR,OAAO,IAAI,CAACM,eAAe,GAAG,CAACG,CAAAA,MACjE;wBACH,KAAKA;wBACL,MAAMH,aAAa,CAACG,IAAI;oBAC5B;gBAEJ,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAACD;gBAEpC,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,sBAAsB;oBACjD,SAASH,UAAU,WAAW;oBAC9B,cAAcA,UAAU,gBAAgB;oBACxC,gBAAgBA,UAAU,cAAc;gBAC5C;gBAEAD,YAAY;oBACR,IAAI,CAAC,WAAW,GAAG;oBACnB,IAAI,CAAC,UAAU,GAAG;gBACtB;YACJ,EAAE,OAAOM,OAAO;gBACZN,YAAY;oBACR,IAAI,CAAC,KAAK,GAAGM;oBACb,IAAI,CAAC,UAAU,GAAG;oBAClBC,QAAQ,GAAG,CAAC,SAASD;gBACzB;YACJ;QACJ;aAEA,kBAAkB,GAAG;YACjB,IAAI,CAAC,UAAU,GAAG;QACtB;QAtHI,IAAI,CAAC,WAAW,GAAG;YACf;gBAAE,MAAM;gBAAgB,OAAO;YAAe;YAC9C;gBAAE,MAAM;gBAAc,OAAO;YAAa;YACP,cAAnCE,QAAQ,GAAG,CAAC,kBAAkB,GACxB;gBAAE,MAAM;gBAAiB,OAAO;YAAgB,IAChDd;YACN;gBAAE,MAAM;gBAAU,OAAO;YAAe;SAC3C,CAAC,MAAM,CAACe;QAETC,mBAAmB,IAAI,EAAE,CAAC,GAAG;YAAE,UAAU;QAAK;QAC9C,IAAI,CAAC,UAAU;IACnB;IAEA,MAAc,aAA4B;QACtCV,YAAY;YACR,IAAI,CAAC,OAAO,GAAG;QACnB;QAEA,IAAI;YACA,MAAMW,cAAc,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB;YAC3DX,YAAY;gBACR,IAAI,CAAC,WAAW,GAAGW;gBACnB,IAAI,CAAC,UAAU,GAAGA;gBAClB,IAAI,CAAC,OAAO,GAAG;YACnB;YAEA,IAAI,CAACA,aACD,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;QAEvC,EAAE,OAAM;YACJX,YAAY;gBACR,IAAI,CAAC,OAAO,GAAG;YACnB;QACJ;IACJ;IAEA,IAAI,KAA+B;QAC/B,OAAO;YACH,OAAO,IAAI,CAAC,KAAK;YACjB,SAAS,IAAI,CAAC,OAAO;YACrB,aAAa,IAAI,CAAC,WAAW;YAC7B,YAAY,IAAI,CAAC,UAAU;YAC3B,aAAa,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI;YACpD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAACD,MAAMa;gBAC/B,IAAIC,QAAyB;gBAC7B,IAAID,UAAU,IAAI,CAAC,WAAW,EAC1BC,QAAQ;gBAGZ,IAAID,QAAQ,IAAI,CAAC,WAAW,EACxBC,QAAQ;gBAGZ,OAAO;oBACH,GAAGd,IAAI;oBACPc;gBACJ;YACJ;YACA,YAAY,IAAI,CAAC,UAAU;QAC/B;IACJ;AA2DJ;AAEO,MAAMC,oDAA2BC,qBAAqB;IACzD,aAAaC;IACb,gBAAgBzB;IAChB,cAAc;QAAC0B;QAAkBC;KAA0B;AAC/D"}
+{"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/installation/presenters/SystemInstaller/feature.js

@@ -3,12 +3,14 @@ import { SystemInstallerPresenter } from "./abstractions.js";
 import { SystemInstallerGateway } from "./SystemInstallerGateway.js";
 import { SystemInstallerRepository } from "./SystemInstallerRepository.js";
 import { SystemInstallerPresenter as external_SystemInstallerPresenter_js_SystemInstallerPresenter } from "./SystemInstallerPresenter.js";
+import { NewsletterSubscriptionService } from "../../../../features/newsletter/NewsletterSubscriptionService.js";
 const SystemInstallerFeature = createFeature({
     name: "SystemInstaller",
     register (container) {
         container.register(SystemInstallerGateway).inSingletonScope();
         container.register(SystemInstallerRepository).inSingletonScope();
         container.register(external_SystemInstallerPresenter_js_SystemInstallerPresenter).inSingletonScope();
+        container.register(NewsletterSubscriptionService).inSingletonScope();
     },
     resolve (container) {
         return {

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

@@ -1 +1 @@
-{"version":3,"file":"presentation/installation/presenters/SystemInstaller/feature.js","sources":["../../../../../src/presentation/installation/presenters/SystemInstaller/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { Container } from \"@webiny/di\";\nimport { SystemInstallerPresenter as SystemInstallerPresenterAbstraction } from \"./abstractions.js\";\nimport { SystemInstallerGateway } from \"./SystemInstallerGateway.js\";\nimport { SystemInstallerRepository } from \"./SystemInstallerRepository.js\";\nimport { SystemInstallerPresenter } from \"./SystemInstallerPresenter.js\";\n\nexport const SystemInstallerFeature = createFeature({\n    name: \"SystemInstaller\",\n    register(container: Container) {\n        container.register(SystemInstallerGateway).inSingletonScope();\n        container.register(SystemInstallerRepository).inSingletonScope();\n        container.register(SystemInstallerPresenter).inSingletonScope();\n    },\n    resolve(container: Container) {\n        return {\n            presenter: container.resolve(SystemInstallerPresenterAbstraction)\n        };\n    }\n});\n"],"names":["SystemInstallerFeature","createFeature","container","SystemInstallerGateway","SystemInstallerRepository","SystemInstallerPresenter","SystemInstallerPresenterAbstraction"],"mappings":";;;;;AAOO,MAAMA,yBAAyBC,cAAc;IAChD,MAAM;IACN,UAASC,SAAoB;QACzBA,UAAU,QAAQ,CAACC,wBAAwB,gBAAgB;QAC3DD,UAAU,QAAQ,CAACE,2BAA2B,gBAAgB;QAC9DF,UAAU,QAAQ,CAACG,+DAA0B,gBAAgB;IACjE;IACA,SAAQH,SAAoB;QACxB,OAAO;YACH,WAAWA,UAAU,OAAO,CAACI;QACjC;IACJ;AACJ"}
+{"version":3,"file":"presentation/installation/presenters/SystemInstaller/feature.js","sources":["../../../../../src/presentation/installation/presenters/SystemInstaller/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { Container } from \"@webiny/di\";\nimport { SystemInstallerPresenter as SystemInstallerPresenterAbstraction } from \"./abstractions.js\";\nimport { SystemInstallerGateway } from \"./SystemInstallerGateway.js\";\nimport { SystemInstallerRepository } from \"./SystemInstallerRepository.js\";\nimport { SystemInstallerPresenter } from \"./SystemInstallerPresenter.js\";\nimport { NewsletterSubscriptionService } from \"~/features/newsletter/NewsletterSubscriptionService.js\";\n\nexport const SystemInstallerFeature = createFeature({\n    name: \"SystemInstaller\",\n    register(container: Container) {\n        container.register(SystemInstallerGateway).inSingletonScope();\n        container.register(SystemInstallerRepository).inSingletonScope();\n        container.register(SystemInstallerPresenter).inSingletonScope();\n        container.register(NewsletterSubscriptionService).inSingletonScope();\n    },\n    resolve(container: Container) {\n        return {\n            presenter: container.resolve(SystemInstallerPresenterAbstraction)\n        };\n    }\n});\n"],"names":["SystemInstallerFeature","createFeature","container","SystemInstallerGateway","SystemInstallerRepository","SystemInstallerPresenter","NewsletterSubscriptionService","SystemInstallerPresenterAbstraction"],"mappings":";;;;;;AAQO,MAAMA,yBAAyBC,cAAc;IAChD,MAAM;IACN,UAASC,SAAoB;QACzBA,UAAU,QAAQ,CAACC,wBAAwB,gBAAgB;QAC3DD,UAAU,QAAQ,CAACE,2BAA2B,gBAAgB;QAC9DF,UAAU,QAAQ,CAACG,+DAA0B,gBAAgB;QAC7DH,UAAU,QAAQ,CAACI,+BAA+B,gBAAgB;IACtE;IACA,SAAQJ,SAAoB;QACxB,OAAO;YACH,WAAWA,UAAU,OAAO,CAACK;QACjC;IACJ;AACJ"}

package/presentation/listPresenter/FolderAwareDataSource.d.ts

@@ -0,0 +1,55 @@
+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>;
+    /**
+     * 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>;
+    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;
+}