From a008aea3f3f2c6ad35cdd0f38bb9c391ce816db7 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 19 Aug 2024 12:08:58 +0200 Subject: [PATCH 01/13] feat(ee): one-click demo account --- .../OneClickDemo/OneClickDemoController.ts | 41 +++++++++++++ .../server/src/interfaces/Authentication.ts | 1 - .../OneClickDemo/CreateOneClickDemo.ts | 57 +++++++++++++++++++ .../OneClickDemo/OneClickDemoApplication.ts | 14 +++++ packages/webapp/src/components/App.tsx | 7 ++- .../OneClickDemo/OneClickDemoPage.tsx | 39 +++++++++++++ .../webapp/src/hooks/query/oneclick-demo.ts | 35 ++++++++++++ 7 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts create mode 100644 packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts create mode 100644 packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts create mode 100644 packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx create mode 100644 packages/webapp/src/hooks/query/oneclick-demo.ts diff --git a/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts b/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts new file mode 100644 index 000000000..b2812fbec --- /dev/null +++ b/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts @@ -0,0 +1,41 @@ +import { Router, Request, Response, NextFunction } from 'express'; +import { Service, Inject } from 'typedi'; +import asyncMiddleware from '@/api/middleware/asyncMiddleware'; +import BaseController from '@/api/controllers/BaseController'; +import { OneClickDemoApplication } from '@/services/OneClickDemo/OneClickDemoApplication'; + +@Service() +export class OneClickDemoController extends BaseController { + @Inject() + private oneClickDemoApp: OneClickDemoApplication; + + /** + * Router constructor method. + */ + router() { + const router = Router(); + + router.post('/one_click', asyncMiddleware(this.oneClickDemo.bind(this))); + + return router; + } + + /** + * One-click demo application. + * @param {Request} req - + * @param {Response} res - + * @param {NextFunction} next - + */ + private async oneClickDemo(req: Request, res: Response, next: NextFunction) { + try { + const data = await this.oneClickDemoApp.createOneClick(); + + return res.status(200).send({ + data, + message: 'The one-click demo has been created successfully.', + }); + } catch (error) { + next(error); + } + } +} diff --git a/packages/server/src/interfaces/Authentication.ts b/packages/server/src/interfaces/Authentication.ts index af29d0b5f..2743ee513 100644 --- a/packages/server/src/interfaces/Authentication.ts +++ b/packages/server/src/interfaces/Authentication.ts @@ -7,7 +7,6 @@ export interface IRegisterDTO { lastName: string; email: string; password: string; - organizationName: string; } export interface ILoginDTO { diff --git a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts new file mode 100644 index 000000000..a29ed2560 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts @@ -0,0 +1,57 @@ +import { Inject, Service } from 'typedi'; +import { faker } from '@faker-js/faker'; +import AuthenticationApplication from '../Authentication/AuthApplication'; +import OrganizationService from '../Organization/OrganizationService'; +import { IAuthSignInPOJO } from '@/interfaces'; + +@Service() +export class CreateOneClickDemo { + @Inject() + private authApp: AuthenticationApplication; + + @Inject() + private organizationService: OrganizationService; + + /** + * Creates one-click demo account. + * @returns {Promise} + */ + async createOneClickDemo(): Promise { + const firstName = faker.person.firstName(); + const lastName = faker.person.lastName(); + const email = faker.internet.email(); + const password = '123123123'; + + await this.authApp.signUp({ firstName, lastName, email, password }); + + // + const signedIn = await this.authApp.signIn(email, password); + const tenantId = signedIn.tenant.id; + + const buildJob = await this.organizationService.buildRunJob( + tenantId, + { + name: 'BIGCAPITAL, INC', + base_currency: 'USD', + location: 'US', + language: 'en', + fiscal_year: 'march', + timezone: 'US/Central', + }, + signedIn.user + ); + return { email, signedIn, buildJob }; + } + + /** + * Sign-in automicatlly using the demo id one creating an account finish. + * @param {string} oneClickDemoId - + */ + async autoSignIn(oneClickDemoId: string) {} +} + +interface ICreateOneClickDemoPOJO { + email: string; + signedIn: IAuthSignInPOJO; + buildJob: any; +} diff --git a/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts b/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts new file mode 100644 index 000000000..9465827f3 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts @@ -0,0 +1,14 @@ +import { Inject, Service } from "typedi"; +import { CreateOneClickDemo } from "./CreateOneClickDemo"; + + +@Service() +export class OneClickDemoApplication { + + @Inject() + private createOneClickDemoService: CreateOneClickDemo; + + public createOneClick() { + return this.createOneClickDemoService.createOneClickDemo(); + } +} \ No newline at end of file diff --git a/packages/webapp/src/components/App.tsx b/packages/webapp/src/components/App.tsx index 4f43a8613..ba148ba5b 100644 --- a/packages/webapp/src/components/App.tsx +++ b/packages/webapp/src/components/App.tsx @@ -27,7 +27,9 @@ const EmailConfirmation = LazyLoader({ const RegisterVerify = LazyLoader({ loader: () => import('@/containers/Authentication/RegisterVerify'), }); - +const OneClickDemoPage = LazyLoader({ + loader: () => import('@/containers/OneClickDemo/OneClickDemoPage'), +}); /** * App inner. */ @@ -37,6 +39,9 @@ function AppInsider({ history }) { + + + diff --git a/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx new file mode 100644 index 000000000..620452f7d --- /dev/null +++ b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx @@ -0,0 +1,39 @@ +// @ts-nocheck +import { useEffect, useState } from 'react'; +import { Box } from '@/components'; +import { useCreateOneClickDemo } from '@/hooks/query/oneclick-demo'; +import { Button } from '@blueprintjs/core'; +import { useJob } from '@/hooks/query'; + +export default function OneClickDemoPage() { + const { mutateAsync: createOneClickDemo } = useCreateOneClickDemo(); + const [buildJobId, setBuildJobId] = useState(''); + + const { + data: { running, queued, failed, completed }, + isFetching: isJobFetching, + } = useJob(buildJobId, { + refetchInterval: 2000, + enabled: !!buildJobId, + }); + + useEffect(() => { + if (completed) { + } + }, [completed]); + + const handleCreateAccountBtnClick = () => { + createOneClickDemo({}) + .then((res) => { + setBuildJobId(res?.data?.data?.build_job?.job_id) + }) + .catch(() => {}); + }; + + return ( + + {running && (

Building...

)} + +
+ ); +} diff --git a/packages/webapp/src/hooks/query/oneclick-demo.ts b/packages/webapp/src/hooks/query/oneclick-demo.ts new file mode 100644 index 000000000..537729214 --- /dev/null +++ b/packages/webapp/src/hooks/query/oneclick-demo.ts @@ -0,0 +1,35 @@ +// @ts-nocheck +import { + useMutation, + UseMutationOptions, + UseMutationResult, + useQueryClient, +} from 'react-query'; +import useApiRequest from '../useRequest'; + +interface CreateOneClickDemoValues {} +interface CreateOneClickDemoRes {} + +/** + * + * @param {UseMutationOptions} props + * @returns {UseMutationResult} + */ +export function useCreateOneClickDemo( + props?: UseMutationOptions< + CreateOneClickDemoRes, + Error, + CreateOneClickDemoValues + >, +): UseMutationResult { + const queryClient = useQueryClient(); + const apiRequest = useApiRequest(); + + return useMutation( + () => apiRequest.post(`/demo/one_click`), + { + onSuccess: (res, id) => {}, + ...props, + }, + ); +} From fed620505d4a4eec00b75525afd7741ca2c03f7d Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 19 Aug 2024 12:10:38 +0200 Subject: [PATCH 02/13] feat: add one click endpoint --- packages/server/src/api/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts index ac8b2fda7..ce4d2093f 100644 --- a/packages/server/src/api/index.ts +++ b/packages/server/src/api/index.ts @@ -63,6 +63,7 @@ import { BankingController } from './controllers/Banking/BankingController'; import { Webhooks } from './controllers/Webhooks/Webhooks'; import { ExportController } from './controllers/Export/ExportController'; import { AttachmentsController } from './controllers/Attachments/AttachmentsController'; +import { OneClickDemoController } from './controllers/OneClickDemo/OneClickDemoController'; export default () => { const app = Router(); @@ -80,6 +81,7 @@ export default () => { app.use('/jobs', Container.get(Jobs).router()); app.use('/account', Container.get(Account).router()); app.use('/webhooks', Container.get(Webhooks).router()); + app.use('/demo', Container.get(OneClickDemoController).router()) // - Dashboard routes. // --------------------------- From cca596b4a9e09a6527c1184b7da3fea21bad1df2 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 19 Aug 2024 21:21:39 +0200 Subject: [PATCH 03/13] fix: one click demo --- .../OneClickDemo/OneClickDemoController.ts | 32 +++++++++ .../OneClickDemo/CreateOneClickDemo.ts | 30 +++++++-- .../OneClickDemo/OneClickDemoApplication.ts | 23 +++++-- ...40819164614_create_oneclick_demos_table.js | 21 ++++++ .../server/src/system/models/OneclickDemo.ts | 17 +++++ packages/webapp/src/components/App.tsx | 4 +- .../OneClickDemo/OneClickDemoPage.module.scss | 32 +++++++++ .../OneClickDemo/OneClickDemoPage.tsx | 66 ++++++++++++++++--- .../webapp/src/hooks/query/authentication.tsx | 2 +- .../webapp/src/hooks/query/oneclick-demo.ts | 66 ++++++++++++++++++- 10 files changed, 270 insertions(+), 23 deletions(-) create mode 100644 packages/server/src/system/migrations/20240819164614_create_oneclick_demos_table.js create mode 100644 packages/server/src/system/models/OneclickDemo.ts create mode 100644 packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.module.scss diff --git a/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts b/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts index b2812fbec..dd5e41145 100644 --- a/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts +++ b/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts @@ -3,6 +3,8 @@ import { Service, Inject } from 'typedi'; import asyncMiddleware from '@/api/middleware/asyncMiddleware'; import BaseController from '@/api/controllers/BaseController'; import { OneClickDemoApplication } from '@/services/OneClickDemo/OneClickDemoApplication'; +import { reset } from 'colorette'; +import { body } from 'express-validator'; @Service() export class OneClickDemoController extends BaseController { @@ -16,6 +18,14 @@ export class OneClickDemoController extends BaseController { const router = Router(); router.post('/one_click', asyncMiddleware(this.oneClickDemo.bind(this))); + router.post( + '/one_click_signin', + [ + body('demo_id').exists(), + ], + this.validationResult, + asyncMiddleware(this.oneClickSignIn.bind(this)) + ); return router; } @@ -38,4 +48,26 @@ export class OneClickDemoController extends BaseController { next(error); } } + + /** + * + * @param {Request} req + * @param {Response} res + * @param {NextFunction} next + */ + private async oneClickSignIn( + req: Request, + res: Response, + next: NextFunction + ) { + const { demoId } = this.matchedBodyData(req); + + try { + const data = await this.oneClickDemoApp.autoSignIn(demoId); + + return res.status(200).send(data); + } catch (error) { + next(error); + } + } } diff --git a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts index a29ed2560..62396cb6e 100644 --- a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts +++ b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts @@ -1,8 +1,11 @@ import { Inject, Service } from 'typedi'; import { faker } from '@faker-js/faker'; +import uniqid from 'uniqid'; import AuthenticationApplication from '../Authentication/AuthApplication'; import OrganizationService from '../Organization/OrganizationService'; import { IAuthSignInPOJO } from '@/interfaces'; +import { OneClickDemo } from '@/system/models/OneclickDemo'; +import { SystemUser } from '@/system/models'; @Service() export class CreateOneClickDemo { @@ -16,17 +19,21 @@ export class CreateOneClickDemo { * Creates one-click demo account. * @returns {Promise} */ - async createOneClickDemo(): Promise { + public async createOneClickDemo(): Promise { const firstName = faker.person.firstName(); const lastName = faker.person.lastName(); const email = faker.internet.email(); const password = '123123123'; + const demoId = uniqid(); await this.authApp.signUp({ firstName, lastName, email, password }); - // const signedIn = await this.authApp.signIn(email, password); const tenantId = signedIn.tenant.id; + const userId = signedIn.user.id; + + // Creates a new one-click demo. + await OneClickDemo.query().insert({ key: demoId, tenantId, userId }); const buildJob = await this.organizationService.buildRunJob( tenantId, @@ -40,18 +47,33 @@ export class CreateOneClickDemo { }, signedIn.user ); - return { email, signedIn, buildJob }; + return { email, demoId, signedIn, buildJob }; } /** * Sign-in automicatlly using the demo id one creating an account finish. * @param {string} oneClickDemoId - */ - async autoSignIn(oneClickDemoId: string) {} + async autoSignIn(oneClickDemoId: string) { + const foundOneclickDemo = await OneClickDemo.query() + .findOne('key', oneClickDemoId) + .throwIfNotFound(); + + const userId = foundOneclickDemo.userId; + const user = await SystemUser.query().findById(userId); + + const email = user.email; + const password = '123123123'; + + const signedIn = await this.authApp.signIn(email, password); + + return signedIn; + } } interface ICreateOneClickDemoPOJO { email: string; + demoId: string; signedIn: IAuthSignInPOJO; buildJob: any; } diff --git a/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts b/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts index 9465827f3..f14704f85 100644 --- a/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts +++ b/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts @@ -1,14 +1,25 @@ -import { Inject, Service } from "typedi"; -import { CreateOneClickDemo } from "./CreateOneClickDemo"; - +import { Inject, Service } from 'typedi'; +import { CreateOneClickDemo } from './CreateOneClickDemo'; @Service() export class OneClickDemoApplication { - @Inject() private createOneClickDemoService: CreateOneClickDemo; - + + /** + * + * @returns + */ public createOneClick() { return this.createOneClickDemoService.createOneClickDemo(); } -} \ No newline at end of file + + /** + * + * @param oneClickDemoId + * @returns + */ + public autoSignIn(oneClickDemoId: string) { + return this.createOneClickDemoService.autoSignIn(oneClickDemoId); + } +} diff --git a/packages/server/src/system/migrations/20240819164614_create_oneclick_demos_table.js b/packages/server/src/system/migrations/20240819164614_create_oneclick_demos_table.js new file mode 100644 index 000000000..0586350c2 --- /dev/null +++ b/packages/server/src/system/migrations/20240819164614_create_oneclick_demos_table.js @@ -0,0 +1,21 @@ +/** + * @param { import("knex").Knex } knex + * @returns { Promise } + */ +exports.up = function (knex) { + return knex.schema.createTable('oneclick_demos', (table) => { + table.increments('id'); + table.string('key'); + table.integer('tenant_id').unsigned(); + table.integer('user_id').unsigned(); + table.timestamps(); + }); +}; + +/** + * @param { import("knex").Knex } knex + * @returns { Promise } + */ +exports.down = function (knex) { + return knex.schema.dropTableIfExists('oneclick_demos'); +}; diff --git a/packages/server/src/system/models/OneclickDemo.ts b/packages/server/src/system/models/OneclickDemo.ts new file mode 100644 index 000000000..9900a0285 --- /dev/null +++ b/packages/server/src/system/models/OneclickDemo.ts @@ -0,0 +1,17 @@ +import SystemModel from '@/system/models/SystemModel'; + +export class OneClickDemo extends SystemModel { + /** + * Table name + */ + static get tableName() { + return 'oneclick_demos'; + } + + /** + * Timestamps columns. + */ + get timestamps() { + return ['createdAt']; + } +} diff --git a/packages/webapp/src/components/App.tsx b/packages/webapp/src/components/App.tsx index ba148ba5b..338fefc02 100644 --- a/packages/webapp/src/components/App.tsx +++ b/packages/webapp/src/components/App.tsx @@ -40,7 +40,9 @@ function AppInsider({ history }) { - + + + diff --git a/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.module.scss b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.module.scss new file mode 100644 index 000000000..850ca2253 --- /dev/null +++ b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.module.scss @@ -0,0 +1,32 @@ + + +.root { + text-align: center; + display: flex; + height: 100vh; + width: 100%; +} + +.inner{ + margin: auto; + max-width: 450px; +} + +.progressBar{ + height: 5px; + + :global .bp4-progress-meter{ + background-color: rgba(159, 171, 188, 0.8) + } +} + +.oneClickBtn { + width: 400px; + margin-top: 3rem; +} + +.waitingText{ + font-size: 15px; + line-height: 1.54; + color: #5F6B7C; +} \ No newline at end of file diff --git a/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx index 620452f7d..fd996c99e 100644 --- a/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx +++ b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx @@ -1,39 +1,85 @@ // @ts-nocheck +import { Button, Intent, ProgressBar, Spinner, Text } from '@blueprintjs/core'; import { useEffect, useState } from 'react'; -import { Box } from '@/components'; -import { useCreateOneClickDemo } from '@/hooks/query/oneclick-demo'; -import { Button } from '@blueprintjs/core'; +import { + useCreateOneClickDemo, + useOneClickDemoSignin, +} from '@/hooks/query/oneclick-demo'; +import { Box, Icon, Stack } from '@/components'; import { useJob } from '@/hooks/query'; +import style from './OneClickDemoPage.module.scss'; export default function OneClickDemoPage() { - const { mutateAsync: createOneClickDemo } = useCreateOneClickDemo(); + const { + mutateAsync: createOneClickDemo, + isLoading: isCreateOneClickLoading, + } = useCreateOneClickDemo(); + const { mutateAsync: oneClickDemoSignIn } = useOneClickDemoSignin(); const [buildJobId, setBuildJobId] = useState(''); + const [demoId, setDemoId] = useState(''); + + // Job done state. + const [isJobDone, setIsJobDone] = useState(false); const { data: { running, queued, failed, completed }, isFetching: isJobFetching, } = useJob(buildJobId, { refetchInterval: 2000, - enabled: !!buildJobId, + enabled: !isJobDone && !!buildJobId, + onSuccess: (res) => { + if (res.completed) { + oneClickDemoSignIn({ demoId }).then((res) => { + debugger; + }); + } + }, }); useEffect(() => { if (completed) { + setIsJobDone(true); } - }, [completed]); + }, [completed, setIsJobDone]); const handleCreateAccountBtnClick = () => { createOneClickDemo({}) .then((res) => { - setBuildJobId(res?.data?.data?.build_job?.job_id) + setBuildJobId(res?.data?.data?.build_job?.job_id); + setDemoId(res?.data?.data?.demo_id); }) .catch(() => {}); }; + const isLoading = running; return ( - - {running && (

Building...

)} - + + + + + + {isLoading && ( + + + + We're preparing temporary environment for trial, It typically + take few seconds. Do not close or refresh the page. + + + )} + + + {!isLoading && ( + + )} + ); } diff --git a/packages/webapp/src/hooks/query/authentication.tsx b/packages/webapp/src/hooks/query/authentication.tsx index 96ee23426..4b54bbac9 100644 --- a/packages/webapp/src/hooks/query/authentication.tsx +++ b/packages/webapp/src/hooks/query/authentication.tsx @@ -16,7 +16,7 @@ import { /** * Saves the response data to cookies. */ -function setAuthLoginCookies(data) { +export function setAuthLoginCookies(data) { setCookie('token', data.token); setCookie('authenticated_user_id', data.user.id); setCookie('organization_id', data.tenant.organization_id); diff --git a/packages/webapp/src/hooks/query/oneclick-demo.ts b/packages/webapp/src/hooks/query/oneclick-demo.ts index 537729214..27a2544f0 100644 --- a/packages/webapp/src/hooks/query/oneclick-demo.ts +++ b/packages/webapp/src/hooks/query/oneclick-demo.ts @@ -6,9 +6,22 @@ import { useQueryClient, } from 'react-query'; import useApiRequest from '../useRequest'; +import { + useSetAuthToken, + useSetAuthUserId, + useSetLocale, + useSetOrganizationId, + useSetTenantId, +} from '../state'; +import { setAuthLoginCookies } from './authentication'; +import { batch } from 'react-redux'; interface CreateOneClickDemoValues {} -interface CreateOneClickDemoRes {} +interface CreateOneClickDemoRes { + email: string; + signedIn: any; + buildJob: any; +} /** * @@ -33,3 +46,54 @@ export function useCreateOneClickDemo( }, ); } + +interface OneClickSigninDemoValues { + demoId: string; +} +interface OneClickSigninDemoRes {} + +/** + * + * @param {UseMutationOptions} props + * @returns {UseMutationResult} + */ +export function useOneClickDemoSignin( + props?: UseMutationOptions< + OneClickSigninDemoRes, + Error, + OneClickSigninDemoValues + >, +): UseMutationResult { + const queryClient = useQueryClient(); + const apiRequest = useApiRequest(); + + const setAuthToken = useSetAuthToken(); + const setOrganizationId = useSetOrganizationId(); + const setUserId = useSetAuthUserId(); + const setTenantId = useSetTenantId(); + const setLocale = useSetLocale(); + + return useMutation( + ({ demoId }) => + apiRequest.post(`/demo/one_click_signin`, { demo_id: demoId }), + { + onSuccess: (res, id) => { + // Set authentication cookies. + setAuthLoginCookies(res.data); + + batch(() => { + // Sets the auth metadata to global state. + setAuthToken(res.data.token); + setOrganizationId(res.data.tenant.organization_id); + setUserId(res.data.user.id); + setTenantId(res.data.tenant.id); + + if (res.data?.tenant?.metadata?.language) { + setLocale(res.data?.tenant?.metadata?.language); + } + }); + }, + ...props, + }, + ); +} From d29079a8c5a717409ca8eb5b8e999d501d863af3 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 20 Aug 2024 12:51:23 +0200 Subject: [PATCH 04/13] fix: one-click demo account --- .../OneClickDemo/CreateOneClickDemo.ts | 15 ++--- .../OneClickDemo/OneClickDemoApplication.ts | 16 +++--- .../src/services/OneClickDemo/interfaces.ts | 8 +++ .../OneClickDemo/OneClickDemoPage.tsx | 56 +++++++++++-------- 4 files changed, 55 insertions(+), 40 deletions(-) create mode 100644 packages/server/src/services/OneClickDemo/interfaces.ts diff --git a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts index 62396cb6e..c167cda04 100644 --- a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts +++ b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts @@ -3,9 +3,10 @@ import { faker } from '@faker-js/faker'; import uniqid from 'uniqid'; import AuthenticationApplication from '../Authentication/AuthApplication'; import OrganizationService from '../Organization/OrganizationService'; -import { IAuthSignInPOJO } from '@/interfaces'; import { OneClickDemo } from '@/system/models/OneclickDemo'; import { SystemUser } from '@/system/models'; +import { IAuthSignInPOJO } from '@/interfaces'; +import { ICreateOneClickDemoPOJO } from './interfaces'; @Service() export class CreateOneClickDemo { @@ -53,8 +54,9 @@ export class CreateOneClickDemo { /** * Sign-in automicatlly using the demo id one creating an account finish. * @param {string} oneClickDemoId - + * @returns {Promise} */ - async autoSignIn(oneClickDemoId: string) { + async autoSignIn(oneClickDemoId: string): Promise { const foundOneclickDemo = await OneClickDemo.query() .findOne('key', oneClickDemoId) .throwIfNotFound(); @@ -66,14 +68,7 @@ export class CreateOneClickDemo { const password = '123123123'; const signedIn = await this.authApp.signIn(email, password); - + return signedIn; } } - -interface ICreateOneClickDemoPOJO { - email: string; - demoId: string; - signedIn: IAuthSignInPOJO; - buildJob: any; -} diff --git a/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts b/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts index f14704f85..6b4bb2177 100644 --- a/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts +++ b/packages/server/src/services/OneClickDemo/OneClickDemoApplication.ts @@ -5,21 +5,21 @@ import { CreateOneClickDemo } from './CreateOneClickDemo'; export class OneClickDemoApplication { @Inject() private createOneClickDemoService: CreateOneClickDemo; - + /** - * - * @returns + * Creates one-click demo account. + * @returns {Promise} */ public createOneClick() { return this.createOneClickDemoService.createOneClickDemo(); } /** - * - * @param oneClickDemoId - * @returns + * Auto-sign-in to created demo account. + * @param {string} demoId - + * @returns {Promise} */ - public autoSignIn(oneClickDemoId: string) { - return this.createOneClickDemoService.autoSignIn(oneClickDemoId); + public autoSignIn(demoId: string) { + return this.createOneClickDemoService.autoSignIn(demoId); } } diff --git a/packages/server/src/services/OneClickDemo/interfaces.ts b/packages/server/src/services/OneClickDemo/interfaces.ts new file mode 100644 index 000000000..e2b54b167 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/interfaces.ts @@ -0,0 +1,8 @@ +import { IAuthSignInPOJO } from '@/interfaces'; + +export interface ICreateOneClickDemoPOJO { + email: string; + demoId: string; + signedIn: IAuthSignInPOJO; + buildJob: any; +} diff --git a/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx index fd996c99e..8c55da367 100644 --- a/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx +++ b/packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx @@ -1,5 +1,5 @@ // @ts-nocheck -import { Button, Intent, ProgressBar, Spinner, Text } from '@blueprintjs/core'; +import { Button, Intent, ProgressBar, Text } from '@blueprintjs/core'; import { useEffect, useState } from 'react'; import { useCreateOneClickDemo, @@ -14,26 +14,21 @@ export default function OneClickDemoPage() { mutateAsync: createOneClickDemo, isLoading: isCreateOneClickLoading, } = useCreateOneClickDemo(); - const { mutateAsync: oneClickDemoSignIn } = useOneClickDemoSignin(); + const { + mutateAsync: oneClickDemoSignIn, + isLoading: isOneclickDemoSigningIn, + } = useOneClickDemoSignin(); const [buildJobId, setBuildJobId] = useState(''); - const [demoId, setDemoId] = useState(''); - // Job done state. + // Job states. + const [demoId, setDemoId] = useState(''); const [isJobDone, setIsJobDone] = useState(false); const { - data: { running, queued, failed, completed }, - isFetching: isJobFetching, + data: { running, completed }, } = useJob(buildJobId, { refetchInterval: 2000, enabled: !isJobDone && !!buildJobId, - onSuccess: (res) => { - if (res.completed) { - oneClickDemoSignIn({ demoId }).then((res) => { - debugger; - }); - } - }, }); useEffect(() => { @@ -42,15 +37,25 @@ export default function OneClickDemoPage() { } }, [completed, setIsJobDone]); + // One the job done request sign-in using the demo id. + useEffect(() => { + if (isJobDone) { + oneClickDemoSignIn({ demoId }).then((res) => { + debugger; + }); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [isJobDone]); + const handleCreateAccountBtnClick = () => { createOneClickDemo({}) - .then((res) => { - setBuildJobId(res?.data?.data?.build_job?.job_id); - setDemoId(res?.data?.data?.demo_id); + .then(({ data: { data } }) => { + setBuildJobId(data?.build_job?.job_id); + setDemoId(data?.demo_id); }) .catch(() => {}); }; - const isLoading = running; + const isLoading = running || isOneclickDemoSigningIn; return ( @@ -61,10 +66,17 @@ export default function OneClickDemoPage() { {isLoading && ( - - We're preparing temporary environment for trial, It typically - take few seconds. Do not close or refresh the page. - + {isOneclickDemoSigningIn && ( + + It's signin-in to your demo account, Just a second! + + )} + {running && ( + + We're preparing temporary environment for trial, It typically + take few seconds. Do not close or refresh the page. + + )} )} @@ -72,7 +84,7 @@ export default function OneClickDemoPage() { {!isLoading && ( + + )} +
From 4a05ccc692a6555d3ec5396440598d81cba5ffc2 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 20 Aug 2024 23:40:23 +0200 Subject: [PATCH 08/13] feat: add more seedders --- .../DemoSeeders/SeedDemoCustomers.ts | 37 ++++++++++++++++++ .../DemoSeeders/SeedDemoExpenses.ts | 39 +++++++++++++++++++ .../DemoSeeders/SeedDemoManualJournals.ts | 36 +++++++++++++++++ .../DemoSeeders/SeedDemoVendors.ts | 36 +++++++++++++++++ .../events/SeedInitialDemoAccountData.ts | 21 +++++++++- .../server/views/demo-sheets/Expenses.csv | 23 +++++++++++ .../server/views/demo-sheets/customers.csv | 6 +++ .../views/demo-sheets/manual-journals.csv | 3 ++ packages/server/views/demo-sheets/vendors.csv | 5 +++ 9 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoCustomers.ts create mode 100644 packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoExpenses.ts create mode 100644 packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoManualJournals.ts create mode 100644 packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoVendors.ts create mode 100644 packages/server/views/demo-sheets/Expenses.csv create mode 100644 packages/server/views/demo-sheets/customers.csv create mode 100644 packages/server/views/demo-sheets/manual-journals.csv create mode 100644 packages/server/views/demo-sheets/vendors.csv diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoCustomers.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoCustomers.ts new file mode 100644 index 000000000..4aeb24846 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoCustomers.ts @@ -0,0 +1,37 @@ +import { SeedDemoAbstract } from './SeedDemoAbstract'; + +export class SeedDemoAccountCustomers extends SeedDemoAbstract { + /** + * Retrieves the seeder file mapping. + */ + get mapping() { + return [ + { from: 'Customer Type', to: 'customerType' }, + { from: 'First Name', to: 'firstName' }, + { from: 'Last Name', to: 'lastName' }, + { from: 'Display Name', to: 'displayName' }, + { from: 'Email', to: 'email' }, + { from: 'Work Phone Number', to: 'workPhone' }, + { from: 'Personal Phone Number', to: 'personalPhone' }, + { from: 'Company Name', to: 'companyName' }, + { from: 'Website', to: 'website' }, + { from: 'Active', to: 'active' }, + ]; + } + + /** + * Retrieves the seeder file name. + * @returns {string} + */ + get importFileName() { + return `customers.csv`; + } + + /** + * Retrieve the resource name of the seeder. + * @returns {string} + */ + get resource() { + return 'Customer'; + } +} diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoExpenses.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoExpenses.ts new file mode 100644 index 000000000..922f8b478 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoExpenses.ts @@ -0,0 +1,39 @@ +import { SeedDemoAbstract } from './SeedDemoAbstract'; + +export class SeedDemoAccountExpenses extends SeedDemoAbstract { + /** + * Retrieves the seeder file mapping. + */ + get mapping() { + return [ + { from: 'Payment Account', to: 'paymentAccountId' }, + { from: 'Reference No.', to: 'referenceNo' }, + { from: 'Payment Date', to: 'paymentDate' }, + { from: 'Description', to: 'description' }, + { from: 'Publish', to: 'publish' }, + { + from: 'Expense Account', + to: 'expenseAccountId', + group: 'categories', + }, + { from: 'Amount', to: 'amount', group: 'categories' }, + { from: 'Line Description', to: 'description', group: 'categories' }, + ]; + } + + /** + * Retrieves the seeder file name. + * @returns {string} + */ + get importFileName() { + return `Expenses.csv`; + } + + /** + * Retrieve the resource name of the seeder. + * @returns {string} + */ + get resource() { + return 'Expense'; + } +} diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoManualJournals.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoManualJournals.ts new file mode 100644 index 000000000..fbf34c359 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoManualJournals.ts @@ -0,0 +1,36 @@ +import { SeedDemoAbstract } from './SeedDemoAbstract'; + +export class SeedDemoAccountManualJournals extends SeedDemoAbstract { + /** + * Retrieves the seeder file mapping. + */ + get mapping() { + return [ + { from: 'Date', to: 'date' }, + { from: 'Journal No', to: 'journalNumber' }, + { from: 'Reference No.', to: 'reference' }, + { from: 'Description', to: 'description' }, + { from: 'Publish', to: 'publish' }, + { from: 'Credit', to: 'credit', group: 'entries' }, + { from: 'Debit', to: 'debit', group: 'entries' }, + { from: 'Account', to: 'accountId', group: 'entries' }, + { from: 'Note', to: 'note', group: 'entries' }, + ]; + } + + /** + * Retrieves the seeder file name. + * @returns {string} + */ + get importFileName() { + return `manual-journals.csv`; + } + + /** + * Retrieve the resource name of the seeder. + * @returns {string} + */ + get resource() { + return 'ManualJournal'; + } +} diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoVendors.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoVendors.ts new file mode 100644 index 000000000..2525f08bf --- /dev/null +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoVendors.ts @@ -0,0 +1,36 @@ +import { SeedDemoAbstract } from './SeedDemoAbstract'; + +export class SeedDemoAccountVendors extends SeedDemoAbstract { + /** + * Retrieves the seeder file mapping. + */ + get mapping() { + return [ + { from: 'First Name', to: 'firstName' }, + { from: 'Last Name', to: 'lastName' }, + { from: 'Display Name', to: 'displayName' }, + { from: 'Email', to: 'email' }, + { from: 'Work Phone Number', to: 'workPhone' }, + { from: 'Personal Phone Number', to: 'personalPhone' }, + { from: 'Company Name', to: 'companyName' }, + { from: 'Website', to: 'website' }, + { from: 'Active', to: 'active' }, + ]; + } + + /** + * Retrieves the seeder file name. + * @returns {string} + */ + get importFileName() { + return `vendors.csv`; + } + + /** + * Retrieve the resource name of the seeder. + * @returns {string} + */ + get resource() { + return 'Vendor'; + } +} diff --git a/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts b/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts index e2e9d1119..62812de1f 100644 --- a/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts +++ b/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts @@ -8,6 +8,10 @@ import { SeedDemoAccountItems } from '../DemoSeeders/SeedDemoItems'; import { ImportResourceApplication } from '@/services/Import/ImportResourceApplication'; import { getImportsStoragePath } from '@/services/Import/_utils'; import { OneClickDemo } from '@/system/models/OneclickDemo'; +import { SeedDemoAccountCustomers } from '../DemoSeeders/SeedDemoCustomers'; +import { SeedDemoAccountVendors } from '../DemoSeeders/SeedDemoVendors'; +import { SeedDemoAccountManualJournals } from '../DemoSeeders/SeedDemoManualJournals'; +import { SeedDemoAccountExpenses } from '../DemoSeeders/SeedDemoExpenses'; export class SeedInitialDemoAccountDataOnOrgBuild { @Inject() @@ -27,7 +31,13 @@ export class SeedInitialDemoAccountDataOnOrgBuild { * Demo account seeder. */ get seedDemoAccountSeeders() { - return [SeedDemoAccountItems]; + return [ + SeedDemoAccountItems, + SeedDemoAccountCustomers, + SeedDemoAccountVendors, + SeedDemoAccountManualJournals, + SeedDemoAccountExpenses, + ]; } /** @@ -79,9 +89,16 @@ export class SeedInitialDemoAccountDataOnOrgBuild { seederInstance.mapping ); // Commit the imported file. - await this.importApp.process(tenantId, importedFile.import.importId); + const re = await this.importApp.process( + tenantId, + importedFile.import.importId + ); + console.log(re); }); + console.error(results.errors); + console.log(results.results); + if (results.errors) { throw results.errors; } diff --git a/packages/server/views/demo-sheets/Expenses.csv b/packages/server/views/demo-sheets/Expenses.csv new file mode 100644 index 000000000..137194144 --- /dev/null +++ b/packages/server/views/demo-sheets/Expenses.csv @@ -0,0 +1,23 @@ +Payment Date,Reference No.,Payment Account,Description,Currency Code,Exchange Rate,Expense Account,Amount,Line Description,Publish +2024-03-01,REF-1,Petty Cash,Vel et dolorem architecto veniam.,,,Office expenses,9000,Voluptates voluptas corporis vel.,T +2024-03-02,REF-2,Petty Cash,Id est molestias.,,,Office expenses,9000,Eos voluptatem cumque et voluptate reiciendis.,T +2024-03-03,REF-3,Petty Cash,Quam cupiditate at nihil dicta dignissimos non fugit illo.,,,Office expenses,9000,Hic alias rerum sed commodi dolores sint animi perferendis.,T +2024-03-04,REF-4,Petty Cash,Et voluptatem consequatur corrupti beatae sit.,,,Office expenses,9000,Exercitationem impedit praesentium et eaque.,T +2024-03-05,REF-5,Petty Cash,Illo aut ad id et non error et reiciendis optio.,,,Office expenses,9000,Accusantium modi consequuntur eaque consequatur deleniti consequuntur et qui.,T +2024-03-06,REF-6,Petty Cash,Ea consequatur placeat aut et enim.,,,Office expenses,9000,Itaque odio fugiat recusandae.,T +2024-03-07,REF-7,Petty Cash,A expedita consequatur sequi eveniet quos rerum.,,,Office expenses,9000,Quidem doloremque dignissimos totam dolor iure sed necessitatibus optio.,T +2024-03-08,REF-8,Petty Cash,Est libero deleniti animi delectus eligendi necessitatibus expedita fugit.,,,Office expenses,9000,Velit rerum aperiam mollitia ut eius error est quo aut.,T +2024-03-09,REF-9,Petty Cash,Ut dolor tempora quam consequuntur mollitia aut quos consectetur commodi.,,,Office expenses,9000,Culpa architecto ea vero nisi quis voluptas animi.,T +2024-03-10,REF-10,Petty Cash,Nihil hic soluta.,,,Office expenses,9000,Omnis recusandae ducimus vel.,T +2024-03-11,REF-11,Petty Cash,Aspernatur placeat odit asperiores et tempora quam.,,,Office expenses,9000,Sit tempora optio ullam velit beatae architecto et.,T +2024-03-12,REF-12,Petty Cash,Harum soluta sed.,,,Office expenses,9000,Nobis est earum saepe.,T +2024-03-13,REF-13,Petty Cash,Ea quod mollitia non illo dolores voluptatem distinctio.,,,Office expenses,9000,Sit eos dolores autem rerum voluptate quia ipsam.,T +2024-03-14,REF-14,Petty Cash,Et quod distinctio atque.,,,Office expenses,9000,Facilis sed expedita reiciendis.,T +2024-03-15,REF-15,Petty Cash,Omnis delectus tempore.,,,Office expenses,9000,Autem non reprehenderit placeat aut et quo.,T +2024-03-16,REF-16,Petty Cash,Dolores optio qui dolore quia aut explicabo eaque.,,,Office expenses,9000,Odit dolores ut.,T +2024-03-17,REF-17,Petty Cash,Odit quibusdam sunt in a quod error.,,,Office expenses,9000,Quo explicabo quae dolor enim nisi voluptas id et temporibus.,T +2024-03-18,REF-18,Petty Cash,Hic quibusdam officiis voluptatem facilis repellat molestiae non.,,,Office expenses,9000,Quo sit ea et itaque error.,T +2024-03-19,REF-19,Petty Cash,Dolor doloremque quia qui.,,,Office expenses,9000,Ut deleniti laboriosam et.,T +2024-03-20,REF-20,Petty Cash,Ad enim repellat sed et vero aliquid.,,,Office expenses,9000,Error in voluptas non quae quibusdam id excepturi illo neque.,T +2024-03-21,REF-21,Petty Cash,Doloribus ut excepturi.,,,Office expenses,9000,Sint magni et reiciendis harum praesentium vero sit blanditiis.,T +2024-03-22,REF-22,Petty Cash,Id rerum sunt et.,,,Office expenses,9000,Autem magnam eum error ex sunt temporibus exercitationem ullam est.,T \ No newline at end of file diff --git a/packages/server/views/demo-sheets/customers.csv b/packages/server/views/demo-sheets/customers.csv new file mode 100644 index 000000000..62e60eaab --- /dev/null +++ b/packages/server/views/demo-sheets/customers.csv @@ -0,0 +1,6 @@ +Customer Type,First Name,Last Name,Company Name,Display Name,Email,Personal Phone Number,Work Phone Number,Website,Opening Balance,Opening Balance At,Opening Balance Ex. Rate,Currency,Active,Note,Billing Address 1,Billing Address 2,Billing Address City,Billing Address Country,Billing Address Phone,Billing Address Postcode,Billing Address State,Shipping Address 1,Shipping Address 2,Shipping Address City,Shipping Address Country,Shipping Address Phone,Shipping Address Postcode,Shipping Address State +Business,Nicolette,Schamberger,Homenick - Hane,Rowland Rowe,cicero86@yahoo.com,811-603-2235,906-993-5190,http://google.com,54302.23,2022-02-02,2,LYD,F,Doloribus autem optio temporibus dolores mollitia sit.,862 Jessika Well,1091 Dorthy Mount,Deckowfort,Ghana,825-011-5207,38228,Oregon,37626 Thiel Villages,132 Batz Avenue,Pagacburgh,Albania,171-546-3701,13709,Georgia +Business,Hermann,Crooks,Veum - Schaefer,Harley Veum,immanuel56@hotmail.com,449-780-9999,970-473-5785,http://google.com,54302.23,2022-02-02,2,LYD,T,Doloribus dolore dolor dicta vitae in fugit nisi quibusdam.,532 Simonis Spring,3122 Nicolas Inlet,East Matteofort,Holy See (Vatican City State),366-084-8629,41607,Montana,2889 Tremblay Plaza,71355 Kutch Isle,D'Amorehaven,Monaco,614-189-3328,09634-0435,Nevada +Business,Nellie,Gulgowski,"Boyle, Heller and Jones",Randall Kohler,anibal_frami@yahoo.com,498-578-0740,394-550-6827,http://google.com,54302.23,2022-02-02,2,LYD,T,Vero quibusdam rem fugit aperiam est modi.,214 Sauer Villages,30687 Kacey Square,Jayceborough,Benin,332-820-1127,16425-3887,Mississippi,562 Diamond Loaf,9595 Satterfield Trafficway,Alexandrinefort,Puerto Rico,776-500-8456,30258,South Dakota +Business,Stone,Jerde,"Cassin, Casper and Maggio",Clint McLaughlin,nathanael22@yahoo.com,562-790-6059,686-838-0027,http://google.com,54302.23,2022-02-02,2,LYD,F,Quis cumque molestias rerum.,22590 Cathy Harbor,24493 Brycen Brooks,Elnorashire,Andorra,701-852-8005,5680,Nevada,5355 Erdman Bridge,421 Jeanette Camp,East Philip,Venezuela,426-119-0858,34929-0501,Tennessee +Individual,Lempi,Kling,"Schamberger, O'Connell and Bechtelar",Alexie Barton,eulah.kreiger@hotmail.com,745-756-1063,965-150-1945,http://google.com,54302.23,2022-02-02,2,LYD,F,Maxime laboriosam hic voluptate maiores est officia.,0851 Jones Flat,845 Bailee Drives,Kamrenport,Niger,220-125-0608,30311,Delaware,929 Ferry Row,020 Adam Plaza,West Carmellaside,Ghana,053-333-6679,79221-4681,Illinois \ No newline at end of file diff --git a/packages/server/views/demo-sheets/manual-journals.csv b/packages/server/views/demo-sheets/manual-journals.csv new file mode 100644 index 000000000..39098693a --- /dev/null +++ b/packages/server/views/demo-sheets/manual-journals.csv @@ -0,0 +1,3 @@ +Date,Journal No,Reference No.,Currency Code,Exchange Rate,Journal Type,Description,Credit,Debit,Note,Account,Contact,Publish +2024-02-02,J-100022,REF-10000,,,,Animi quasi qui itaque aut possimus illum est magnam enim.,1000,0,Qui reprehenderit voluptate.,Bank Account,,T +2024-02-02,J-100022,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,1000,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T \ No newline at end of file diff --git a/packages/server/views/demo-sheets/vendors.csv b/packages/server/views/demo-sheets/vendors.csv new file mode 100644 index 000000000..50287d2b9 --- /dev/null +++ b/packages/server/views/demo-sheets/vendors.csv @@ -0,0 +1,5 @@ +First Name,Last Name,Company Name,Display Name,Email,Personal Phone Number,Work Phone Number,Website,Opening Balance,Opening Balance At,Opening Balance Ex. Rate,Currency,Active,Note,Billing Address 1,Billing Address 2,Billing Address City,Billing Address Country,Billing Address Phone,Billing Address Postcode,Billing Address State,Shipping Address 1,Shipping Address 2,Shipping Address City,Shipping Address Country,Shipping Address Phone,Shipping Address Postcode,Shipping Address State +Nicolette,Schamberger,Homenick - Hane,Rowland Rowe,cicero86@yahoo.com,811-603-2235,906-993-5190,http://google.com,54302.23,2022-02-02,2,LYD,T,Doloribus autem optio temporibus dolores mollitia sit.,862 Jessika Well,1091 Dorthy Mount,Deckowfort,Ghana,825-011-5207,38228,Oregon,37626 Thiel Villages,132 Batz Avenue,Pagacburgh,Albania,171-546-3701,13709,Georgia +Hermann,Crooks,Veum - Schaefer,Harley Veum,immanuel56@hotmail.com,449-780-9999,970-473-5785,http://google.com,54302.23,2022-02-02,2,LYD,T,Doloribus dolore dolor dicta vitae in fugit nisi quibusdam.,532 Simonis Spring,3122 Nicolas Inlet,East Matteofort,Holy See (Vatican City State),366-084-8629,41607,Montana,2889 Tremblay Plaza,71355 Kutch Isle,D'Amorehaven,Monaco,614-189-3328,09634-0435,Nevada +Nellie,Gulgowski,"Boyle, Heller and Jones",Randall Kohler,anibal_frami@yahoo.com,498-578-0740,394-550-6827,http://google.com,54302.23,2022-02-02,2,LYD,T,Vero quibusdam rem fugit aperiam est modi.,214 Sauer Villages,30687 Kacey Square,Jayceborough,Benin,332-820-1127,16425-3887,Mississippi,562 Diamond Loaf,9595 Satterfield Trafficway,Alexandrinefort,Puerto Rico,776-500-8456,30258,South Dakota +Stone,Jerde,"Cassin, Casper and Maggio",Clint McLaughlin,nathanael22@yahoo.com,562-790-6059,686-838-0027,http://google.com,54302.23,2022-02-02,2,LYD,T,Quis cumque molestias rerum.,22590 Cathy Harbor,24493 Brycen Brooks,Elnorashire,Andorra,701-852-8005,5680,Nevada,5355 Erdman Bridge,421 Jeanette Camp,East Philip,Venezuela,426-119-0858,34929-0501,Tennessee \ No newline at end of file From 705b8da05339cdea8e236373221002fb47676d35 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Wed, 21 Aug 2024 01:04:18 +0200 Subject: [PATCH 09/13] fix: protect the one-click demo accounts endpoints --- .../OneClickDemo/OneClickDemoController.ts | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts b/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts index 96a41ca51..1a92c18f8 100644 --- a/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts +++ b/packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts @@ -4,7 +4,7 @@ import { body } from 'express-validator'; import asyncMiddleware from '@/api/middleware/asyncMiddleware'; import BaseController from '@/api/controllers/BaseController'; import { OneClickDemoApplication } from '@/services/OneClickDemo/OneClickDemoApplication'; - +import config from '@/config'; @Service() export class OneClickDemoController extends BaseController { @Inject() @@ -16,13 +16,29 @@ export class OneClickDemoController extends BaseController { router() { const router = Router(); - router.post('/one_click', asyncMiddleware(this.oneClickDemo.bind(this))); + // Protects the endpoints if the feature is not enabled. + const protectMiddleware = ( + req: Request, + res: Response, + next: NextFunction + ) => { + // Add your protection logic here + if (config.oneClickDemoAccounts) { + next(); + } else { + res.status(403).send({ message: 'Forbidden' }); + } + }; + router.post( + '/one_click', + protectMiddleware, + asyncMiddleware(this.oneClickDemo.bind(this)) + ); router.post( '/one_click_signin', - [ - body('demo_id').exists(), - ], + [body('demo_id').exists()], this.validationResult, + protectMiddleware, asyncMiddleware(this.oneClickSignIn.bind(this)) ); return router; From 59f480f9d5ab1131365bbde83e2aeb224fc04454 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Thu, 22 Aug 2024 13:04:51 +0200 Subject: [PATCH 10/13] feat: add more demo account seeders --- packages/server/src/config/index.ts | 5 ++ .../DemoSeeders/SeedDemoAbstract.ts | 21 ++++-- .../DemoSeeders/SeedDemoBankTransactions.ts | 35 ++++++++++ .../OneClickDemo/DemoSeeders/SeedDemoItems.ts | 13 ++-- .../DemoSeeders/SeedDemoSaleInvoices.ts | 37 +++++++++++ .../events/SeedInitialDemoAccountData.ts | 6 +- packages/server/views/.DS_Store | Bin 0 -> 6148 bytes .../views/demo-sheets/bank-transactions.csv | 4 ++ packages/server/views/demo-sheets/items.csv | 62 +++++++++++++++++- .../views/demo-sheets/manual-journals.csv | 10 ++- .../views/demo-sheets/sale-invoices.csv | 50 ++++++++++++++ 11 files changed, 228 insertions(+), 15 deletions(-) create mode 100644 packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoBankTransactions.ts create mode 100644 packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoSaleInvoices.ts create mode 100644 packages/server/views/.DS_Store create mode 100644 packages/server/views/demo-sheets/bank-transactions.csv create mode 100644 packages/server/views/demo-sheets/sale-invoices.csv diff --git a/packages/server/src/config/index.ts b/packages/server/src/config/index.ts index 128da484f..f9abb8622 100644 --- a/packages/server/src/config/index.ts +++ b/packages/server/src/config/index.ts @@ -245,4 +245,9 @@ module.exports = { loops: { apiKey: process.env.LOOPS_API_KEY, }, + + oneClickDemoAccounts: parseBoolean( + process.env.ONE_CLICK_DEMO_ACCOUNTS, + false + ), }; diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoAbstract.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoAbstract.ts index f078485f2..54bde2d70 100644 --- a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoAbstract.ts +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoAbstract.ts @@ -1,6 +1,17 @@ +export class SeedDemoAbstract { + /** + * Retrieves the seeder file mapping. + * @returns {Array<>} + */ + get mapping() { + return []; + } - - -export class SeedDemoAbstract{ - -} \ No newline at end of file + /** + * Retireves the seeder file import params. + * @returns {Record} + */ + get importParams() { + return {}; + } +} diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoBankTransactions.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoBankTransactions.ts new file mode 100644 index 000000000..a2c3aaa50 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoBankTransactions.ts @@ -0,0 +1,35 @@ +import { SeedDemoAbstract } from './SeedDemoAbstract'; + +export class SeedDemoBankTransactions extends SeedDemoAbstract { + get mapping() { + return [ + { from: 'Date', to: 'date' }, + { from: 'Payee', to: 'payee' }, + { from: 'Description', to: 'description' }, + { from: 'Reference No.', to: 'referenceNo' }, + { from: 'Amount', to: 'amount' }, + ]; + } + + /** + * Retrieves the seeder file name. + * @returns {string} + */ + get importFileName() { + return `bank-transactions.csv`; + } + + /** + * Retrieve the resource name of the seeder. + * @returns {string} + */ + get resource() { + return 'UncategorizedCashflowTransaction'; + } + + get importParams() { + return { + accountId: 1001, + }; + } +} diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoItems.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoItems.ts index 7542b8474..00a7e9ea3 100644 --- a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoItems.ts +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoItems.ts @@ -12,12 +12,15 @@ export class SeedDemoAccountItems extends SeedDemoAbstract { { from: 'Sellable', to: 'sellable' }, { from: 'Purchasable', to: 'purchasable' }, { from: 'Sell Price', to: 'sellPrice' }, - { from: 'Cost Price', to: 'cost_price' }, - { from: 'Cost Account', to: 'costAccount' }, - { from: 'Sell Account', to: 'sellAccount' }, - { from: 'Inventory Account', to: 'inventoryAccount' }, + { from: 'Cost Price', to: 'costPrice' }, + { from: 'Cost Account', to: 'costAccountId' }, + { from: 'Sell Account', to: 'sellAccountId' }, + { from: 'Inventory Account', to: 'inventoryAccountId' }, { from: 'Sell Description', to: 'sellDescription' }, - { from: 'Purchase Description', to: 'purchaseDescription' }, + { + from: 'Purchase Description', + to: 'purchaseDescription', + }, { from: 'Note', to: 'note' }, { from: 'Category', to: 'category' }, { from: 'Active', to: 'active' }, diff --git a/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoSaleInvoices.ts b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoSaleInvoices.ts new file mode 100644 index 000000000..ccf2b1524 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/DemoSeeders/SeedDemoSaleInvoices.ts @@ -0,0 +1,37 @@ +import { SeedDemoAbstract } from './SeedDemoAbstract'; + +export class SeedDemoSaleInvoices extends SeedDemoAbstract { + get mapping() { + return [ + { from: 'Invoice Date', to: 'invoiceDate' }, + { from: 'Due Date', to: 'dueDate' }, + { from: 'Reference No.', to: 'referenceNo' }, + { from: 'Invoice No.', to: 'invoiceNo' }, + { from: 'Customer', to: 'customerId' }, + { from: 'Exchange Rate', to: 'exchangeRate' }, + { from: 'Invoice Message', to: 'invoiceMessage' }, + { from: 'Terms & Conditions', to: 'termsConditions' }, + { from: 'Delivered', to: 'delivered' }, + { from: 'Item', to: 'itemId', group: 'entries' }, + { from: 'Rate', to: 'rate', group: 'entries' }, + { from: 'Quantity', to: 'quantity', group: 'entries' }, + { from: 'Description', to: 'description', group: 'entries' }, + ]; + } + + /** + * Retrieves the seeder file name. + * @returns {string} + */ + get importFileName() { + return `sale-invoices.csv`; + } + + /** + * Retrieve the resource name of the seeder. + * @returns {string} + */ + get resource() { + return 'SaleInvoice'; + } +} diff --git a/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts b/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts index 62812de1f..576248a1b 100644 --- a/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts +++ b/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts @@ -12,6 +12,8 @@ import { SeedDemoAccountCustomers } from '../DemoSeeders/SeedDemoCustomers'; import { SeedDemoAccountVendors } from '../DemoSeeders/SeedDemoVendors'; import { SeedDemoAccountManualJournals } from '../DemoSeeders/SeedDemoManualJournals'; import { SeedDemoAccountExpenses } from '../DemoSeeders/SeedDemoExpenses'; +import { SeedDemoBankTransactions } from '../DemoSeeders/SeedDemoBankTransactions'; +import { SeedDemoSaleInvoices } from '../DemoSeeders/SeedDemoSaleInvoices'; export class SeedInitialDemoAccountDataOnOrgBuild { @Inject() @@ -36,7 +38,9 @@ export class SeedInitialDemoAccountDataOnOrgBuild { SeedDemoAccountCustomers, SeedDemoAccountVendors, SeedDemoAccountManualJournals, + SeedDemoBankTransactions, SeedDemoAccountExpenses, + SeedDemoSaleInvoices, ]; } @@ -80,7 +84,7 @@ export class SeedInitialDemoAccountDataOnOrgBuild { tenantId, seederInstance.resource, seederInstance.importFileName, - {} + seederInstance.importParams || {} ); // Mapping the columns with resource fields. await this.importApp.mapping( diff --git a/packages/server/views/.DS_Store b/packages/server/views/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..68b620314e225fdd5ffdfcff627bfbe7216423f6 GIT binary patch literal 6148 zcmeHKJ8r^25S>XVkZ33=_W~5T!O9{h-~tpzP!N#fB(vUr~nn90#x8Z1+4eN=8Hf^DnJFOz@Gy4eJF6ln%D>Wrvt%9 z0N@O1H>`b@02WICYhoXW3`~Ox465dcp+QH!WL-_{1A{J_!-wXRH76AHr{nzM<)Sr^ zkqS_Op#rb5U0VNthu@k1ha~Q(02TOG3g~RJ-86Wm?5(4hvtC=^JGj+c;bvGn1;N`f j(AzOK){a+R6m`YcxL*_dK&K<`bRd5QOcxpzc(wvJKgAW7 literal 0 HcmV?d00001 diff --git a/packages/server/views/demo-sheets/bank-transactions.csv b/packages/server/views/demo-sheets/bank-transactions.csv new file mode 100644 index 000000000..0afb4a68d --- /dev/null +++ b/packages/server/views/demo-sheets/bank-transactions.csv @@ -0,0 +1,4 @@ +Amount,Date,Payee,Reference No.,Description +"6,410.19",2024-03-26,MacGyver and Sons,REF-1,Commodi quo labore. +"8,914.17",2024-01-05,Eichmann - Bergnaum,REF-1,Quia enim et. +"6,200.88",2024-02-17,"Luettgen, Mraz and Legros",REF-1,Occaecati consequuntur cum impedit illo. \ No newline at end of file diff --git a/packages/server/views/demo-sheets/items.csv b/packages/server/views/demo-sheets/items.csv index 754ed4d4c..8c0482a1f 100644 --- a/packages/server/views/demo-sheets/items.csv +++ b/packages/server/views/demo-sheets/items.csv @@ -1,5 +1,61 @@ Item Type,Item Name,Item Code,Sellable,Purchasable,Cost Price,Sell Price,Cost Account,Sell Account,Inventory Account,Sell Description,Purchase Description,Category,Note,Active -Inventory,"Hettinger, Schumm and Bartoletti",1000,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,At dolor est non tempore et quisquam.,TRUE -Inventory,Schmitt Group,1001,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Id perspiciatis at adipisci minus accusamus dolor iure dolore.,TRUE +Inventory,Amoxicillin and Clavulanatea,1000,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,At dolor est non tempore et quisquam.,TRUE +Inventory,Azithromycin,1001,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Id perspiciatis at adipisci minus accusamus dolor iure dolore.,TRUE Inventory,Marks - Carroll,1002,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Odio odio minus similique.,TRUE -Inventory,"VonRueden, Ruecker and Hettinger",1003,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quibusdam dolores illo.,TRUE \ No newline at end of file +Inventory,"VonRueden, Ruecker and Hettinger",1003,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quibusdam dolores illo.,TRUE +Inventory,Aimovig SureClick Autoinjector,1004,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Labore atque quo nam natus ducimus.,TRUE +Inventory,Romaguera Group,1005,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sit et aut rem necessitatibus.,TRUE +Inventory,Thompson - Reichert,1006,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Non non fuga esse fugit dolor soluta vel a.,TRUE +Inventory,AirDuo Digihaler with eModule,1007,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Error ut est soluta quos et qui.,TRUE +Inventory,"Reichert, Sanford and Shanahan",1008,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Nesciunt laboriosam nobis porro numquam hic expedita vel quod praesentium.,TRUE +Inventory,Crooks - Fay,1009,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Amet magni architecto voluptas itaque.,TRUE +Inventory,Becker - Kozey,1010,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Provident consequatur quos qui explicabo dicta nam.,TRUE +Inventory,Robel - Weber,1011,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quia cum eos rerum odio omnis quasi.,TRUE +Inventory,"Runte, Johns and Konopelski",1012,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Soluta et et accusantium corrupti autem repellendus assumenda fugit.,TRUE +Inventory,McCullough - Beer,1013,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quo quod sunt distinctio aliquid accusantium.,TRUE +Inventory,"Hintz, Wisozk and Mills",1014,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Asperiores esse at quos veritatis voluptas officiis.,TRUE +Inventory,"Zieme, Crist and Abbott",1015,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Ea ut qui architecto voluptates error.,TRUE +Inventory,Kiehn - Cormier,1016,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Libero sit impedit sint qui voluptatum id qui sed.,TRUE +Inventory,"Jast, Carter and Reynolds",1017,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sint sunt quaerat nisi voluptate praesentium vero labore veniam quia.,TRUE +Inventory,Stehr Inc,1018,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Voluptas aut ipsum et iste.,TRUE +Inventory,"Friesen, Hamill and Hessel",1019,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Neque tenetur minima amet aut optio et recusandae vel ad.,TRUE +Inventory,Lemke - Hayes,1020,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Deleniti enim autem corrupti fuga quibusdam non.,TRUE +Inventory,Mirtazapine,1021,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Molestiae quia asperiores praesentium et voluptas iste sit et accusantium.,TRUE +Inventory,Medroxyprogesterone,1022,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Est quia omnis at.,TRUE +Inventory,Purdy and Sons,1023,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Veniam eos quibusdam neque consectetur eius aliquam.,TRUE +Inventory,"Zemlak, Kassulke and Veum",1024,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Vitae optio odit.,TRUE +Inventory,Kris LLC,1025,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Libero voluptatibus voluptatem quo.,TRUE +Inventory,"Jaskolski, Parker and Blanda",1026,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Laborum optio est voluptas dolores sunt voluptates.,TRUE +Inventory,Roberts Kilback,1027,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Ut illo molestiae dolore recusandae aut sequi molestiae fugit eum.,TRUE +Inventory,Olson Daugherty,1028,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Non est aut sit nulla nisi labore commodi delectus.,TRUE +Inventory,Hermann Inc,1029,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Commodi maxime minus dicta quia.,TRUE +Inventory,"Rowe, Nolan and Schaefer",1030,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quos et est eum odit quam omnis velit impedit tempora.,TRUE +Inventory,Cole - Lesch,1031,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aut accusantium non.,TRUE +Inventory,"Emmerich, Prohaska and Schimmel",1032,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Doloribus aut qui sequi.,TRUE +Inventory,"Stracke, Champlin and Bayer",1033,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quisquam odio et et quod eum necessitatibus quaerat.,TRUE +Inventory,Spinka Okuneva,1034,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Rerum unde neque sit ut aut voluptas eum.,TRUE +Inventory,Swaniawski Muller,1035,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quia dolore minus voluptatibus modi.,TRUE +Inventory,Emard Satterfield,1036,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Nobis et nulla alias.,TRUE +Inventory,"Treutel, Muller and Sipes",1037,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sit perspiciatis voluptate qui eos.,TRUE +Inventory,Cole and Sons,1038,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Qui sint ab iusto.,TRUE +Inventory,"Ullrich, Murazik and Roob",1039,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Explicabo sed maiores.,TRUE +Inventory,Dare and Sons,1040,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aut eveniet omnis dolores labore qui delectus repellat.,TRUE +Inventory,Trantow and Sons,1041,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Animi rerum quaerat qui voluptas.,TRUE +Inventory,Dooley Price,1042,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Reiciendis beatae delectus qui corporis beatae autem modi laudantium.,TRUE +Inventory,"Shanahan, Considine and Towne",1043,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Molestiae nihil delectus eos.,TRUE +Inventory,"Moen, Mohr and Reilly",1044,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Dolor odio soluta eaque consequatur rerum iste vel.,TRUE +Inventory,Price Bradtke,1045,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Beatae autem illo ea alias ipsum nobis.,TRUE +Inventory,Fadel Toy,1046,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Et molestiae eum ut dolores.,TRUE +Inventory,Homenick Inc,1047,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Officia repellendus laboriosam iste quidem explicabo nemo quasi aliquam distinctio.,TRUE +Inventory,Witting Lemke,1048,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Nihil qui voluptatem unde.,TRUE +Inventory,Gerlach Thompson,1049,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quo quas debitis vel.,TRUE +Inventory,Schaefer Thompson,1050,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Minima nobis voluptas autem aut adipisci tenetur.,TRUE +Inventory,"Kovacek, Schuster and Kemmer",1051,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aspernatur earum praesentium laudantium velit.,TRUE +Inventory,Treutel Stanton,1052,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Laboriosam repellendus quisquam labore ipsum et.,TRUE +Inventory,Bartell and Sons,1053,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Sed voluptatem consequatur reprehenderit ab aut molestiae.,TRUE +Inventory,"Bergnaum, Murray and McGlynn",1054,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Ullam in ut molestiae non eveniet et totam dolor.,TRUE +Inventory,"Wilkinson, Schowalter and Lindgren",1055,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Distinctio rerum iusto explicabo fugiat doloremque aut omnis at est.,TRUE +Inventory,"Glover, Zemlak and Kerluke",1056,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Eum at laboriosam aut.,TRUE +Inventory,Durgan Kirlin,1057,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Reprehenderit sunt expedita voluptatum nobis deleniti aliquam numquam quas.,TRUE +Inventory,Towne Crooks,1058,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Aliquam animi libero modi quisquam voluptas fugiat.,TRUE +Inventory,Wuckert McGlynn,1059,T,T,10000,1000,Cost of Goods Sold,Other Income,Inventory Asset,Description ....,Description ....,sdafasdfsadf,Quidem ut et ut reprehenderit.,TRUE \ No newline at end of file diff --git a/packages/server/views/demo-sheets/manual-journals.csv b/packages/server/views/demo-sheets/manual-journals.csv index 39098693a..f0483c440 100644 --- a/packages/server/views/demo-sheets/manual-journals.csv +++ b/packages/server/views/demo-sheets/manual-journals.csv @@ -1,3 +1,11 @@ Date,Journal No,Reference No.,Currency Code,Exchange Rate,Journal Type,Description,Credit,Debit,Note,Account,Contact,Publish 2024-02-02,J-100022,REF-10000,,,,Animi quasi qui itaque aut possimus illum est magnam enim.,1000,0,Qui reprehenderit voluptate.,Bank Account,,T -2024-02-02,J-100022,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,1000,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T \ No newline at end of file +2024-02-02,J-100022,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,1000,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T +2024-02-01,J-100023,REF-10000,,,,Animi quasi qui itaque aut possimus illum est magnam enim.,1400,0,Qui reprehenderit voluptate.,Bank Account,,T +2024-02-01,J-100023,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,1400,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T +2024-02-15,J-100024,REF-10000,,,,Animi quasi qui itaque aut possimus illum est magnam enim.,1900,0,Qui reprehenderit voluptate.,Bank Account,,T +2024-02-15,J-100024,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,1900,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T +2024-02-15,J-100025,REF-10000,,,,Animi quasi qui itaque aut possimus illum est magnam enim.,1900,0,Qui reprehenderit voluptate.,Bank Account,,T +2024-02-15,J-100025,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,1900,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T +2024-02-15,J-100026,REF-10000,,,,Animi quasi qui itaque aut possimus illum est magnam enim.,3494,0,Qui reprehenderit voluptate.,Bank Account,,T +2024-02-15,J-100026,REF-10000,,,,In assumenda dicta autem non est corrupti non et.,0,3494,Omnis tempora qui fugiat neque dolor voluptatem aut repudiandae nihil.,Bank Account,,T \ No newline at end of file diff --git a/packages/server/views/demo-sheets/sale-invoices.csv b/packages/server/views/demo-sheets/sale-invoices.csv new file mode 100644 index 000000000..354c20fef --- /dev/null +++ b/packages/server/views/demo-sheets/sale-invoices.csv @@ -0,0 +1,50 @@ +Invoice No.,Reference No.,Invoice Date,Due Date,Customer,Exchange Rate,Invoice Message,Terms & Conditions,Delivered,Item,Quantity,Rate,Description +B-101,REF-0,2024-04-15,2024-04-17,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-102,REF-1,2024-04-16,2024-04-18,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-103,REF-2,2024-04-17,2024-04-19,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-104,REF-3,2024-04-18,2024-04-20,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-105,REF-4,2024-04-19,2024-04-21,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-106,REF-5,2024-04-20,2024-04-22,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-107,REF-6,2024-04-21,2024-04-23,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-108,REF-7,2024-04-22,2024-04-24,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-109,REF-8,2024-04-23,2024-04-25,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-110,REF-9,2024-04-24,2024-04-26,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-111,REF-10,2024-04-25,2024-04-27,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-112,REF-11,2024-04-26,2024-04-28,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-113,REF-12,2024-04-27,2024-04-29,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-114,REF-13,2024-04-28,2024-04-30,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-115,REF-14,2024-04-29,2024-05-01,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-116,REF-15,2024-04-30,2024-05-02,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-117,REF-16,2024-05-01,2024-05-03,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-118,REF-17,2024-05-02,2024-05-04,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-119,REF-18,2024-05-03,2024-05-05,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-120,REF-19,2024-05-04,2024-05-06,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-121,REF-20,2024-05-05,2024-05-07,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-122,REF-21,2024-05-06,2024-05-08,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-123,REF-22,2024-05-07,2024-05-09,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-124,REF-23,2024-05-08,2024-05-10,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-125,REF-24,2024-05-09,2024-05-11,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-126,REF-25,2024-05-10,2024-05-12,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-127,REF-26,2024-05-11,2024-05-13,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-128,REF-27,2024-05-12,2024-05-14,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-129,REF-28,2024-05-13,2024-05-15,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-130,REF-29,2024-05-14,2024-05-16,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-131,REF-30,2024-05-15,2024-05-17,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-132,REF-31,2024-05-16,2024-05-18,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-133,REF-32,2024-05-17,2024-05-19,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-134,REF-33,2024-05-18,2024-05-20,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-135,REF-34,2024-05-19,2024-05-21,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-136,REF-35,2024-05-20,2024-05-22,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-137,REF-36,2024-05-21,2024-05-23,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-138,REF-37,2024-05-22,2024-05-24,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-139,REF-38,2024-05-23,2024-05-25,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-140,REF-39,2024-05-24,2024-05-26,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-141,REF-40,2024-05-25,2024-05-27,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-142,REF-41,2024-05-26,2024-05-28,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-143,REF-42,2024-05-27,2024-05-29,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-144,REF-43,2024-05-28,2024-05-30,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-145,REF-44,2024-05-29,2024-05-31,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-146,REF-45,2024-05-30,2024-06-01,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-147,REF-46,2024-05-31,2024-06-02,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-148,REF-47,2024-06-01,2024-06-03,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description +B-149,REF-48,2024-06-02,2024-06-04,Harley Veum,1,Aspernatur doloremque amet quia aut.,Quia illum aut dolores.,T,Amoxicillin and Clavulanatea,100,100,Description \ No newline at end of file From 4a99f6c0cf3e09845e52a4ef6580e3c8246cac03 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Thu, 22 Aug 2024 19:21:23 +0200 Subject: [PATCH 11/13] feat: one-click demo account --- .../src/api/middleware/SettingsMiddleware.ts | 21 +++++++----- packages/server/src/interfaces/Setup.ts | 4 +++ .../events/TriggerRecognizedTransactions.ts | 3 ++ .../UncategorizedTransactionsImportable.ts | 2 +- .../src/services/Import/ImportFilePreview.ts | 2 +- .../src/services/Import/ImportFileProcess.ts | 2 +- .../Import/ImportResourceApplication.ts | 2 +- .../src/services/Items/ItemsEntriesService.ts | 6 ++-- .../OneClickDemo/CreateOneClickDemo.ts | 20 +++++------ .../src/services/OneClickDemo/_constants.ts | 12 +++++++ .../events/SeedInitialDemoAccountData.ts | 33 ++++++++++--------- .../Organization/OrganizationService.ts | 12 +++++++ .../Sales/Invoices/InvoiceGLEntries.ts | 2 +- .../Invoices/InvoiceInventoryTransactions.ts | 3 +- packages/server/src/subscribers/events.ts | 2 ++ 15 files changed, 83 insertions(+), 43 deletions(-) create mode 100644 packages/server/src/services/OneClickDemo/_constants.ts diff --git a/packages/server/src/api/middleware/SettingsMiddleware.ts b/packages/server/src/api/middleware/SettingsMiddleware.ts index fbb49b475..9832993b5 100644 --- a/packages/server/src/api/middleware/SettingsMiddleware.ts +++ b/packages/server/src/api/middleware/SettingsMiddleware.ts @@ -1,11 +1,21 @@ import { Request, Response, NextFunction } from 'express'; import { Container } from 'typedi'; import SettingsStore from '@/services/Settings/SettingsStore'; - + export default async (req: Request, res: Response, next: NextFunction) => { const { tenantId } = req.user; - const Logger = Container.get('logger'); + const settings = await initializeTenantSettings(tenantId); + req.settings = settings; + + res.on('finish', async () => { + await settings.save(); + }); + next(); +} + + +export const initializeTenantSettings = async (tenantId: number) => { const tenantContainer = Container.of(`tenant-${tenantId}`); if (tenantContainer && !tenantContainer.has('settings')) { @@ -18,10 +28,5 @@ export default async (req: Request, res: Response, next: NextFunction) => { await settings.load(); - req.settings = settings; - - res.on('finish', async () => { - await settings.save(); - }); - next(); + return settings; } \ No newline at end of file diff --git a/packages/server/src/interfaces/Setup.ts b/packages/server/src/interfaces/Setup.ts index 4f443bb8c..da776b89e 100644 --- a/packages/server/src/interfaces/Setup.ts +++ b/packages/server/src/interfaces/Setup.ts @@ -33,3 +33,7 @@ export interface IOrganizationBuildEventPayload { buildDTO: IOrganizationBuildDTO; systemUser: ISystemUser; } + +export interface IOrganizationBuiltEventPayload { + tenantId: number; +} \ No newline at end of file diff --git a/packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts b/packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts index 466f0b3b1..eba643481 100644 --- a/packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts +++ b/packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts @@ -106,6 +106,9 @@ export class TriggerRecognizedTransactions { const batch = importFile.paramsParsed.batch; const payload = { tenantId, transactionsCriteria: { batch } }; + // Cannot continue if the imported resource is not bank account transactions. + if (importFile.resource !== 'UncategorizedCashflowTransaction') return; + await this.agenda.now('recognize-uncategorized-transactions-job', payload); } } diff --git a/packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts b/packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts index 6350dc406..243affa24 100644 --- a/packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts +++ b/packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts @@ -87,7 +87,7 @@ export class UncategorizedTransactionsImportable extends Importable { } /** - * Transformes the import params before storing them. + * Transforms the import params before storing them. * @param {Record} parmas */ public transformParams(parmas: Record) { diff --git a/packages/server/src/services/Import/ImportFilePreview.ts b/packages/server/src/services/Import/ImportFilePreview.ts index 56a1df09e..b25c00a0e 100644 --- a/packages/server/src/services/Import/ImportFilePreview.ts +++ b/packages/server/src/services/Import/ImportFilePreview.ts @@ -19,7 +19,7 @@ export class ImportFilePreview { */ public async preview( tenantId: number, - importId: number + importId: string ): Promise { const knex = this.tenancy.knex(tenantId); const trx = await knex.transaction({ isolationLevel: 'read uncommitted' }); diff --git a/packages/server/src/services/Import/ImportFileProcess.ts b/packages/server/src/services/Import/ImportFileProcess.ts index 7d0548dc9..06b99a889 100644 --- a/packages/server/src/services/Import/ImportFileProcess.ts +++ b/packages/server/src/services/Import/ImportFileProcess.ts @@ -37,7 +37,7 @@ export class ImportFileProcess { */ public async import( tenantId: number, - importId: number, + importId: string, trx?: Knex.Transaction ): Promise { const importFile = await Import.query() diff --git a/packages/server/src/services/Import/ImportResourceApplication.ts b/packages/server/src/services/Import/ImportResourceApplication.ts index 97d8a00b2..6e000804c 100644 --- a/packages/server/src/services/Import/ImportResourceApplication.ts +++ b/packages/server/src/services/Import/ImportResourceApplication.ts @@ -67,7 +67,7 @@ export class ImportResourceApplication { * @param {number} importId - Import id. * @returns {Promise} */ - public async preview(tenantId: number, importId: number) { + public async preview(tenantId: number, importId: string) { return this.ImportFilePreviewService.preview(tenantId, importId); } diff --git a/packages/server/src/services/Items/ItemsEntriesService.ts b/packages/server/src/services/Items/ItemsEntriesService.ts index 1b97f6fa0..f307087b2 100644 --- a/packages/server/src/services/Items/ItemsEntriesService.ts +++ b/packages/server/src/services/Items/ItemsEntriesService.ts @@ -5,6 +5,7 @@ import { ServiceError } from '@/exceptions'; import TenancyService from '@/services/Tenancy/TenancyService'; import { ItemEntry } from '@/models'; import { entriesAmountDiff } from 'utils'; +import { Knex } from 'knex'; const ERRORS = { ITEMS_NOT_FOUND: 'ITEMS_NOT_FOUND', @@ -58,13 +59,14 @@ export default class ItemsEntriesService { */ public async filterInventoryEntries( tenantId: number, - entries: IItemEntry[] + entries: IItemEntry[], + trx?: Knex.Transaction ): Promise { const { Item } = this.tenancy.models(tenantId); const entriesItemsIds = entries.map((e) => e.itemId); // Retrieve entries inventory items. - const inventoryItems = await Item.query() + const inventoryItems = await Item.query(trx) .whereIn('id', entriesItemsIds) .where('type', 'inventory'); diff --git a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts index 787c4b019..687bb2032 100644 --- a/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts +++ b/packages/server/src/services/OneClickDemo/CreateOneClickDemo.ts @@ -7,7 +7,9 @@ import { OneClickDemo } from '@/system/models/OneclickDemo'; import { SystemUser } from '@/system/models'; import { IAuthSignInPOJO } from '@/interfaces'; import { ICreateOneClickDemoPOJO } from './interfaces'; -import { initalizeTenantServices } from '@/api/middleware/TenantDependencyInjection'; +import events from '@/subscribers/events'; +import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; +import { defaultDemoOrganizationDTO } from './_constants'; @Service() export class CreateOneClickDemo { @@ -17,6 +19,10 @@ export class CreateOneClickDemo { @Inject() private organizationService: OrganizationService; + @Inject() + private eventPublisher: EventPublisher; + + /** * Creates one-click demo account. * @returns {Promise} @@ -34,22 +40,12 @@ export class CreateOneClickDemo { const tenantId = signedIn.tenant.id; const userId = signedIn.user.id; - // Injects the given tenant IoC services. - await initalizeTenantServices(tenantId); - // Creates a new one-click demo. await OneClickDemo.query().insert({ key: demoId, tenantId, userId }); const buildJob = await this.organizationService.buildRunJob( tenantId, - { - name: 'BIGCAPITAL, INC', - base_currency: 'USD', - location: 'US', - language: 'en', - fiscal_year: 'march', - timezone: 'US/Central', - }, + defaultDemoOrganizationDTO, signedIn.user ); return { email, demoId, signedIn, buildJob }; diff --git a/packages/server/src/services/OneClickDemo/_constants.ts b/packages/server/src/services/OneClickDemo/_constants.ts new file mode 100644 index 000000000..27faecc17 --- /dev/null +++ b/packages/server/src/services/OneClickDemo/_constants.ts @@ -0,0 +1,12 @@ + + +export const defaultDemoOrganizationDTO = { + name: 'BIGCAPITAL, INC', + baseCurrency: 'USD', + location: 'US', + language: 'en', + industry: 'Technology', + fiscalYear: 'march', + timezone: 'US/Central', + dateFormat: 'MM/DD/yyyy', +} \ No newline at end of file diff --git a/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts b/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts index 576248a1b..4e18f2a39 100644 --- a/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts +++ b/packages/server/src/services/OneClickDemo/events/SeedInitialDemoAccountData.ts @@ -1,9 +1,11 @@ import { Inject } from 'typedi'; import { promises as fs } from 'fs'; import path from 'path'; +import uniqid from 'uniqid'; +import { isEmpty } from 'lodash'; import events from '@/subscribers/events'; import { PromisePool } from '@supercharge/promise-pool'; -import { IOrganizationBuildEventPayload } from '@/interfaces'; +import { IOrganizationBuiltEventPayload } from '@/interfaces'; import { SeedDemoAccountItems } from '../DemoSeeders/SeedDemoItems'; import { ImportResourceApplication } from '@/services/Import/ImportResourceApplication'; import { getImportsStoragePath } from '@/services/Import/_utils'; @@ -24,7 +26,7 @@ export class SeedInitialDemoAccountDataOnOrgBuild { */ public attach = (bus) => { bus.subscribe( - events.organization.build, + events.organization.built, this.seedInitialDemoAccountDataOnOrgBuild.bind(this) ); }; @@ -35,12 +37,12 @@ export class SeedInitialDemoAccountDataOnOrgBuild { get seedDemoAccountSeeders() { return [ SeedDemoAccountItems, + SeedDemoBankTransactions, SeedDemoAccountCustomers, SeedDemoAccountVendors, SeedDemoAccountManualJournals, - SeedDemoBankTransactions, - SeedDemoAccountExpenses, SeedDemoSaleInvoices, + SeedDemoAccountExpenses, ]; } @@ -50,11 +52,14 @@ export class SeedInitialDemoAccountDataOnOrgBuild { * @returns {Promise} */ async initiateSeederFile(fileName: string) { - const destination = path.join(getImportsStoragePath(), fileName); + const destFileName = uniqid(); const source = path.join(global.__views_dir, `/demo-sheets`, fileName); + const destination = path.join(getImportsStoragePath(), destFileName); // Use the fs.promises.copyFile method to copy the file await fs.copyFile(source, destination); + + return destFileName; } /** @@ -63,7 +68,7 @@ export class SeedInitialDemoAccountDataOnOrgBuild { */ async seedInitialDemoAccountDataOnOrgBuild({ tenantId, - }: IOrganizationBuildEventPayload) { + }: IOrganizationBuiltEventPayload) { const foundDemo = await OneClickDemo.query().findOne('tenantId', tenantId); // Can't continue if the found demo is not exists. @@ -77,14 +82,14 @@ export class SeedInitialDemoAccountDataOnOrgBuild { const seederInstance = new SeedDemoAccountSeeder(); // Initialize the seeder sheet file before importing. - await this.initiateSeederFile(seederInstance.importFileName); + const importFileName = await this.initiateSeederFile(seederInstance.importFileName); // Import the given seeder file. const importedFile = await this.importApp.import( tenantId, seederInstance.resource, - seederInstance.importFileName, - seederInstance.importParams || {} + importFileName, + seederInstance.importParams ); // Mapping the columns with resource fields. await this.importApp.mapping( @@ -92,18 +97,16 @@ export class SeedInitialDemoAccountDataOnOrgBuild { importedFile.import.importId, seederInstance.mapping ); + await this.importApp.preview(tenantId, importedFile.import.importId); + // Commit the imported file. - const re = await this.importApp.process( + await this.importApp.process( tenantId, importedFile.import.importId ); - console.log(re); }); - console.error(results.errors); - console.log(results.results); - - if (results.errors) { + if (!isEmpty(results.errors)) { throw results.errors; } } diff --git a/packages/server/src/services/Organization/OrganizationService.ts b/packages/server/src/services/Organization/OrganizationService.ts index 883db3ce5..6d7fa1621 100644 --- a/packages/server/src/services/Organization/OrganizationService.ts +++ b/packages/server/src/services/Organization/OrganizationService.ts @@ -5,6 +5,7 @@ import { ServiceError } from '@/exceptions'; import { IOrganizationBuildDTO, IOrganizationBuildEventPayload, + IOrganizationBuiltEventPayload, IOrganizationUpdateDTO, ISystemUser, ITenant, @@ -17,6 +18,8 @@ import { Tenant } from '@/system/models'; import OrganizationBaseCurrencyLocking from './OrganizationBaseCurrencyLocking'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import { ERRORS } from './constants'; +import { initializeTenantSettings } from '@/api/middleware/SettingsMiddleware'; +import { initalizeTenantServices } from '@/api/middleware/TenantDependencyInjection'; @Service() export default class OrganizationService { @@ -62,6 +65,10 @@ export default class OrganizationService { // Migrated tenant. const migratedTenant = await tenant.$query().withGraphFetched('metadata'); + // Injects the given tenant IoC services. + await initalizeTenantServices(tenantId); + await initializeTenantSettings(tenantId); + // Creates a tenancy object from given tenant model. const tenancyContext = this.tenantsManager.getSeedMigrationContext(migratedTenant); @@ -82,6 +89,11 @@ export default class OrganizationService { // await this.flagTenantDBBatch(tenantId); + + // Triggers the organization built event. + await this.eventPublisher.emitAsync(events.organization.built, { + tenantId: tenant.id, + } as IOrganizationBuiltEventPayload) } /** diff --git a/packages/server/src/services/Sales/Invoices/InvoiceGLEntries.ts b/packages/server/src/services/Sales/Invoices/InvoiceGLEntries.ts index 7b714e70e..61c575f67 100644 --- a/packages/server/src/services/Sales/Invoices/InvoiceGLEntries.ts +++ b/packages/server/src/services/Sales/Invoices/InvoiceGLEntries.ts @@ -44,7 +44,7 @@ export class SaleInvoiceGLEntries { // Find or create the A/R account. const ARAccount = await accountRepository.findOrCreateAccountReceivable( - saleInvoice.currencyCode + saleInvoice.currencyCode, {}, trx ); // Find or create tax payable account. const taxPayableAccount = await accountRepository.findOrCreateTaxPayable( diff --git a/packages/server/src/services/Sales/Invoices/InvoiceInventoryTransactions.ts b/packages/server/src/services/Sales/Invoices/InvoiceInventoryTransactions.ts index 16cbb1b0f..4a6618727 100644 --- a/packages/server/src/services/Sales/Invoices/InvoiceInventoryTransactions.ts +++ b/packages/server/src/services/Sales/Invoices/InvoiceInventoryTransactions.ts @@ -32,7 +32,8 @@ export class InvoiceInventoryTransactions { const inventoryEntries = await this.itemsEntriesService.filterInventoryEntries( tenantId, - saleInvoice.entries + saleInvoice.entries, + trx ); const transaction = { transactionId: saleInvoice.id, diff --git a/packages/server/src/subscribers/events.ts b/packages/server/src/subscribers/events.ts index 2299df01b..478d336eb 100644 --- a/packages/server/src/subscribers/events.ts +++ b/packages/server/src/subscribers/events.ts @@ -35,6 +35,8 @@ export default { */ organization: { build: 'onOrganizationBuild', + built: 'onOrganizationBuilt', + seeded: 'onOrganizationSeeded', baseCurrencyUpdated: 'onOrganizationBaseCurrencyUpdated', From 5749ccec816f1423a4b7424f941fe2b09a251881 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Thu, 22 Aug 2024 19:50:31 +0200 Subject: [PATCH 12/13] feat: seed more demo bank transactions --- .../views/demo-sheets/bank-transactions.csv | 127 +++++++++++++++++- 1 file changed, 123 insertions(+), 4 deletions(-) diff --git a/packages/server/views/demo-sheets/bank-transactions.csv b/packages/server/views/demo-sheets/bank-transactions.csv index 0afb4a68d..f1bba69ac 100644 --- a/packages/server/views/demo-sheets/bank-transactions.csv +++ b/packages/server/views/demo-sheets/bank-transactions.csv @@ -1,4 +1,123 @@ -Amount,Date,Payee,Reference No.,Description -"6,410.19",2024-03-26,MacGyver and Sons,REF-1,Commodi quo labore. -"8,914.17",2024-01-05,Eichmann - Bergnaum,REF-1,Quia enim et. -"6,200.88",2024-02-17,"Luettgen, Mraz and Legros",REF-1,Occaecati consequuntur cum impedit illo. \ No newline at end of file +Date,Amount,Description,Payee +2024-07-23,-48.25,CREDIT CARD PURCHASE SMART AND FINAL #1 ANAHEIM CA DATE 12/14 15277301931256 9 CARD 5, +2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27 ROYAL FARMS 100 MONUMENT AVE A P NATIONAL HARBOR MD 0846248421604 CARD 44, +2024-08-21,-58,72116609 POS PURCHASE EARNIN RE SC 6 721582259, +2024-08-21,-70.61,Dunkin' Donuts, +2024-08-20,-52.34,Uber Eats, +2024-08-19,-15.47,Panera Bread, +2024-08-19,-4.79,5 PURCHASE-SIG DENNY'S 366992 EUGENE OR 6 039488, +2024-08-18,-186,American Airlines, +2024-08-18,-3,3947558 VISA PURCHASE PLAYSTUD 07057808 TAYLOR MI 8840321 748, +2024-08-18,-9.95,Bojangles, +2024-08-15,-134,GrubHub, +2024-08-15,-91.53,671 POS PURCHASE EARNIN RE SC 9671543 349619, +2024-08-15,-4.78,Popeyes, +2024-08-14,496,CASH DEPOSIT, +2024-08-14,-97.67,APPLE 857979823 NEWKIRK #4, +2024-08-07,-2.81,POS PUR 449399193 04/07 TIMESTAMP THE PIZZA PLACE 4205 NEW YORK NY 634330, +2024-08-06,-4.27,QUEENS BAR 35 E GRAND RIVER AVE #9 DETROIT MI CARD 29602991, +2024-08-06,-6.28,Walmart, +2024-08-06,-20.52,60904 PURCHASE-SIG 09/21 TIMESTAMP UPLIFT RE 9123348 562542 SC 63432961 3968766, +2024-08-06,-12.2,UBER 588639690 RIDE 05/12 CA 12095 DEBIT CARD PURCHASE 04/04 TIMESTAMP 8102241, +2024-08-05,-5.58,WITHDRAWAL 02178293119 POS POUR CHOICES, +2024-08-05,-25.98,Planet Fitness, +2024-08-05,-20,CASH APP TRANSFER, +2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT PULSZ 252-291-2362 VA DATE 04/12 23978676735612 63546108 CARD 94353, +2024-08-04,-19,CASH APP TRANSFER, +2024-08-04,-3.25,MICROSOFT 979333884, +2024-08-03,-16,TOPGOLF 1010 GREENWOOD BLVD, +2024-08-03,-59.52,EFT DEBIT MICROSOFT XBOX CA 830 08/03 TIMESTAMP, +2024-08-03,-145.09,Venmo, +2024-08-03,-76.02,Albertsons, +2024-08-03,-9.79,STOP & SHOP #25402 WEST CALDWELL MODATE 01/24 31772803806094 17096869 CARD 34321 WITHDRAWAL DEBIT CARD, +2024-08-02,-103.44,Dunkin' Donuts, +2024-08-02,-72,Uber Eats, +2024-08-02,-143.93,Food Lion, +2024-08-02,-128.12,McDonald's, +2024-07-31,-37.47,CHECKCARD 538036 CLEO AI IN MOUNTAIN VIEWCA 172788892 RECURRING, +2024-07-30,-162.69,McDonald's, +2024-07-29,95,Brigit XX/XX #406735377 PMNT RCVD Brigit, +2024-07-29,-45.47,Starbucks, +2024-07-29,-595.11,INTERAC PURCHASE - 67200 TARGET #052, +2024-07-28,-89,TRANSFER PAYPAL ADD TO BALANCE INTERNET PAYMENT, +2024-07-27,-6.04,Krispy Kreme, +2024-07-27,-66.63,McDonald's, +2024-07-26,-133.56,CARD PURCHASE PAYBYPHONE 804665947 11/19, +2024-07-26,-10.02,70252237 AMAZON - LEN N, +2024-07-26,-5,BLAZE PIZZA #31 SIG PUR 9906, +2024-07-25,-30.9,CITGO, +2024-07-25,-69,Tropical Smoothie Cafe, +2024-07-24,-744,Internal Revenue Service, +2024-07-24,-15.61,Walmart, +2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT, +2024-08-05,-5.58,WITHDRAWAL POS POUR, +2024-08-06,-6.28,Walmart, +2024-07-24,-15.61,Walmart, +2024-08-03,-145.09,Venmo, +2024-08-20,-52.34,Uber Eats, +2024-08-02,-72,Uber Eats, +2024-07-25,-69,Tropical Smoothie Cafe, +2024-07-28,-89,TRANSFER ADD TO BALANCE INTERNET PAYMENT, +2024-08-03,-76.02,Albertsons, +2024-08-18,-186,American Airlines, +2024-08-15,-91.53,POS PURCHASE EARNIN RE SC 9671543 349619, +2024-07-29,-95,PMNT RCVD Brigit, +2024-08-04,-19,CASH APP TRANSFER, +2024-08-05,-20,CASH APP TRANSFER, +2024-08-14,496,CASH DEPOSIT, +2024-07-31,-37.47,CHECKCARD 538036 CLEO AI IN MOUNTAIN VIEWCA, +2024-07-25,-30.9,Citgo, +2024-08-18,-9.95,Bojangles, +2024-07-24,-744,Internal Revenue Service, +2024-07-27,-6.04,Krispy Kreme, +2024-07-27,-66.63,McDonald's, +2024-07-30,-162.69,McDonald's, +2024-08-02,-128.12,McDonald's, +2024-08-04,-3.25,MICROSOFT, +2024-08-19,-15.47,Panera Bread, +2024-08-05,-25.98,Planet Fitness, +2024-08-15,-4.78,Popeyes, +2024-08-07,-2.81,POS PUR, +2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27, +2024-07-29,-45.47,Starbucks, +2024-08-03,-9.79,WITHDRAWAL DEBIT CARD, +2024-08-03,-16,TOPGOLF 1010 GREENWOOD BLVD, +2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT, +2024-08-05,-5.58,WITHDRAWAL POS POUR, +2024-08-06,-6.28,Walmart, +2024-07-24,-15.61,Walmart, +2024-08-03,-145.09,Venmo, +2024-08-20,-52.34,Uber Eats, +2024-08-02,-72,Uber Eats, +2024-07-25,-69,Tropical Smoothie Cafe, +2024-07-28,-89,TRANSFER ADD TO BALANCE INTERNET PAYMENT, +2024-08-03,-76.02,Albertsons, +2024-08-18,-186,American Airlines, +2024-08-15,-91.53,POS PURCHASE EARNIN RE SC 9671543 349619, +2024-07-29,-95,PMNT RCVD Brigit, +2024-08-04,-19,CASH APP TRANSFER, +2024-08-05,-20,CASH APP TRANSFER, +2024-08-14,496,CASH DEPOSIT, +2024-07-31,-37.47,CHECKCARD 538036 CLEO AI IN MOUNTAIN VIEWCA, +2024-07-25,-30.9,Citgo, +2024-08-18,-9.95,Bojangles, +2024-07-24,-744,Internal Revenue Service, +2024-07-27,-6.04,Krispy Kreme, +2024-07-27,-66.63,McDonald's, +2024-07-30,-162.69,McDonald's, +2024-08-02,-128.12,McDonald's, +2024-08-04,-3.25,MICROSOFT, +2024-08-19,-15.47,Panera Bread, +2024-08-05,-25.98,Planet Fitness, +2024-08-15,-4.78,Popeyes, +2024-08-07,-2.81,POS PUR, +2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27, +2024-07-29,-45.47,Starbucks, +2024-08-03,-9.79,WITHDRAWAL DEBIT CARD, +2024-08-03,-16,TOPGOLF 1010 GREENWOOD BLVD, +2024-08-04,-38,WITHDRAWAL DEBIT CARD CONSUMER DEBIT, +2024-08-05,-5.58,WITHDRAWAL POS POUR, +2024-08-04,-3.25,MICROSOFT, +2024-08-07,-2.81,POS PUR, +2024-08-21,-21.77,PURCHASE AUTHORIZED ON 05/27, +2024-08-03,-9.79,WITHDRAWAL DEBIT CARD, \ No newline at end of file From d15fb6fe19e4616cb0daed8ed5441f25b3faa8e7 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Thu, 22 Aug 2024 20:32:48 +0200 Subject: [PATCH 13/13] chore: document http query --- .../server/src/api/middleware/SettingsMiddleware.ts | 2 +- .../webapp/src/containers/Setup/SetupLeftSection.tsx | 5 ++--- packages/webapp/src/hooks/query/oneclick-demo.ts | 10 +++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/server/src/api/middleware/SettingsMiddleware.ts b/packages/server/src/api/middleware/SettingsMiddleware.ts index 9832993b5..010971381 100644 --- a/packages/server/src/api/middleware/SettingsMiddleware.ts +++ b/packages/server/src/api/middleware/SettingsMiddleware.ts @@ -1,5 +1,5 @@ -import { Request, Response, NextFunction } from 'express'; import { Container } from 'typedi'; +import { Request, Response, NextFunction } from 'express'; import SettingsStore from '@/services/Settings/SettingsStore'; export default async (req: Request, res: Response, next: NextFunction) => { diff --git a/packages/webapp/src/containers/Setup/SetupLeftSection.tsx b/packages/webapp/src/containers/Setup/SetupLeftSection.tsx index 6ec091d52..487c4bbb9 100644 --- a/packages/webapp/src/containers/Setup/SetupLeftSection.tsx +++ b/packages/webapp/src/containers/Setup/SetupLeftSection.tsx @@ -1,13 +1,12 @@ // @ts-nocheck import React from 'react'; +import { useHistory } from 'react-router-dom'; +import { Text } from '@blueprintjs/core'; import { Icon, For, FormattedMessage as T, Stack } from '@/components'; - import { getFooterLinks } from '@/constants/footerLinks'; import { useAuthActions } from '@/hooks/state'; import style from './SetupLeftSection.module.scss'; -import { Text } from '@blueprintjs/core'; import { Config } from '@/config'; -import { useHistory } from 'react-router-dom'; /** * Footer item link. diff --git a/packages/webapp/src/hooks/query/oneclick-demo.ts b/packages/webapp/src/hooks/query/oneclick-demo.ts index 27a2544f0..b5270d5f4 100644 --- a/packages/webapp/src/hooks/query/oneclick-demo.ts +++ b/packages/webapp/src/hooks/query/oneclick-demo.ts @@ -16,7 +16,7 @@ import { import { setAuthLoginCookies } from './authentication'; import { batch } from 'react-redux'; -interface CreateOneClickDemoValues {} +interface CreateOneClickDemoValues { } interface CreateOneClickDemoRes { email: string; signedIn: any; @@ -24,7 +24,7 @@ interface CreateOneClickDemoRes { } /** - * + * Creates one-click demo account. * @param {UseMutationOptions} props * @returns {UseMutationResult} */ @@ -41,7 +41,7 @@ export function useCreateOneClickDemo( return useMutation( () => apiRequest.post(`/demo/one_click`), { - onSuccess: (res, id) => {}, + onSuccess: (res, id) => { }, ...props, }, ); @@ -50,10 +50,10 @@ export function useCreateOneClickDemo( interface OneClickSigninDemoValues { demoId: string; } -interface OneClickSigninDemoRes {} +interface OneClickSigninDemoRes { } /** - * + * Sign-in to the created one-click demo account. * @param {UseMutationOptions} props * @returns {UseMutationResult} */