rez_core 2.2.134 → 2.2.136

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "dbaeumer.vscode-eslint"
+    ]
+}

package/dist/module/auth/strategies/google.strategy.d.ts

@@ -2,6 +2,7 @@ import { ConfigService } from '@nestjs/config';
 import { VerifyCallback } from 'passport-google-oauth20';
 declare const GoogleStrategy_base: new (...args: any) => any;
 export declare class GoogleStrategy extends GoogleStrategy_base {
+    private configService;
     constructor(configService: ConfigService);
     validate(accessToken: string, refreshToken: string, profile: any, done: VerifyCallback): Promise<any>;
 }

package/dist/module/auth/strategies/google.strategy.js

@@ -16,25 +16,30 @@ const passport_1 = require("@nestjs/passport");
 const passport_google_oauth20_1 = require("passport-google-oauth20");
 let GoogleStrategy = class GoogleStrategy extends (0, passport_1.PassportStrategy)(passport_google_oauth20_1.Strategy, 'google') {
     constructor(configService) {
-        const clientID = configService.get('CLIENT_ID');
-        const clientSecret = configService.get('CLIENT_SECRET');
-        const callbackURL = configService.get('CALLBACK_URL');
-        console.log('Google OAuth config', {
-            clientID,
-            clientSecret,
-            callbackURL,
-        });
         super({
-            clientID,
-            clientSecret,
-            callbackURL,
-            scope: ['email', 'profile'],
+            clientID: configService.get('CLIENT_ID'),
+            clientSecret: configService.get('CLIENT_SECRET'),
+            callbackURL: configService.get('CALLBACK_URL'),
+            scope: ['openid', 'email', 'profile'],
+            accessType: 'offline',
+            prompt: 'consent',
         });
+        this.configService = configService;
     }
     async validate(accessToken, refreshToken, profile, done) {
-        const { emails, name } = profile;
-        const email = emails?.[0]?.value;
-        return done(null, { email, name });
+        const email = profile.emails?.[0]?.value ?? null;
+        const name = {
+            givenName: profile.name?.givenName ?? '',
+            familyName: profile.name?.familyName ?? '',
+            displayName: profile.displayName ?? '',
+        };
+        return done(null, {
+            email,
+            name,
+            accessToken,
+            refreshToken,
+            provider: 'google',
+        });
     }
 };
 exports.GoogleStrategy = GoogleStrategy;

package/dist/module/auth/strategies/google.strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"google.strategy.js","sourceRoot":"","sources":["../../../../src/module/auth/strategies/google.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAC/C,+CAAoD;AACpD,qEAAmE;AAG5D,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,IAAA,2BAAgB,EAAC,kCAAQ,EAAE,QAAQ,CAAC;IACtE,YAAY,aAA4B;QACtC,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAS,WAAW,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAS,eAAe,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAS,cAAc,CAAC,CAAC;QAE9D,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE;YACjC,QAAQ;YACR,YAAY;YACZ,WAAW;SACZ,CAAC,CAAC;QAEH,KAAK,CAAC;YACJ,QAAQ;YACR,YAAY;YACZ,WAAW;YACX,KAAK,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,WAAmB,EACnB,YAAoB,EACpB,OAAY,EACZ,IAAoB;QAEpB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;QACjC,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACrC,CAAC;CACF,CAAA;AA9BY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAEgB,sBAAa;GAD7B,cAAc,CA8B1B"}
+{"version":3,"file":"google.strategy.js","sourceRoot":"","sources":["../../../../src/module/auth/strategies/google.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAC/C,+CAAoD;AACpD,qEAAmE;AAG5D,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,IAAA,2BAAgB,EAAC,kCAAQ,EAAE,QAAQ,CAAC;IACtE,YAAoB,aAA4B;QAC9C,KAAK,CAAC;YACJ,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC;YACxC,YAAY,EAAE,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC;YAChD,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC;YAC9C,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC;YACrC,UAAU,EAAE,SAAS;YACrB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;QARe,kBAAa,GAAb,aAAa,CAAe;IAShD,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,WAAmB,EACnB,YAAoB,EACpB,OAAY,EACZ,IAAoB;QAEpB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC;QACjD,MAAM,IAAI,GAAG;YACX,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE;YACxC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE;YAC1C,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE;SACvC,CAAC;QAGF,OAAO,IAAI,CAAC,IAAI,EAAE;YAChB,KAAK;YACL,IAAI;YACJ,WAAW;YACX,YAAY;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAlCY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAEwB,sBAAa;GADrC,cAAc,CAkC1B"}

package/dist/module/dashboard/controller/dashboard.controller.d.ts

@@ -0,0 +1,32 @@
+import { DashboardService } from '../service/dashboard.service';
+export declare class DashboardController {
+    private readonly dashboardService;
+    constructor(dashboardService: DashboardService);
+    getDashboard(pageId: number, req: any): Promise<{
+        page_data: {
+            page_sequence: number;
+            applicable_type: string;
+            applicable_id: string;
+            is_hidden: boolean;
+            mapped_entity_type: string;
+            id: number;
+            entity_type: string;
+            name: string;
+            status: string;
+            parent_type: string;
+            parent_id: number;
+            code: string;
+            created_by: number;
+            created_date: Date;
+            modified_by: number;
+            modified_date: Date;
+            enterprise_id: number;
+            organization_id: number;
+            appcode: string;
+            level_id: string;
+            level_type: string;
+        };
+        layout_json: any;
+        widget_json: {};
+    }>;
+}

package/dist/module/dashboard/controller/dashboard.controller.js

@@ -0,0 +1,42 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DashboardController = void 0;
+const common_1 = require("@nestjs/common");
+const dashboard_service_1 = require("../service/dashboard.service");
+const jwt_guard_1 = require("../../auth/guards/jwt.guard");
+let DashboardController = class DashboardController {
+    constructor(dashboardService) {
+        this.dashboardService = dashboardService;
+    }
+    async getDashboard(pageId, req) {
+        const loggedInUser = req.user.userData;
+        return this.dashboardService.getDashboardPage(pageId, loggedInUser);
+    }
+};
+exports.DashboardController = DashboardController;
+__decorate([
+    (0, common_1.Get)('page-data/:pageId'),
+    (0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
+    __param(0, (0, common_1.Param)('pageId', common_1.ParseIntPipe)),
+    __param(1, (0, common_1.Req)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object]),
+    __metadata("design:returntype", Promise)
+], DashboardController.prototype, "getDashboard", null);
+exports.DashboardController = DashboardController = __decorate([
+    (0, common_1.Controller)('dashboard'),
+    __metadata("design:paramtypes", [dashboard_service_1.DashboardService])
+], DashboardController);
+//# sourceMappingURL=dashboard.controller.js.map

package/dist/module/dashboard/controller/dashboard.controller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard.controller.js","sourceRoot":"","sources":["../../../../src/module/dashboard/controller/dashboard.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAOwB;AACxB,oEAAgE;AAChE,2DAAgE;AAGzD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAA6B,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAI7D,AAAN,KAAK,CAAC,YAAY,CACe,MAAc,EACtC,GAAQ;QAEf,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtE,CAAC;CACF,CAAA;AAZY,kDAAmB;AAKxB;IAFL,IAAA,YAAG,EAAC,mBAAmB,CAAC;IACxB,IAAA,kBAAS,EAAC,wBAAY,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,QAAQ,EAAE,qBAAY,CAAC,CAAA;IAC7B,WAAA,IAAA,YAAG,GAAE,CAAA;;;;uDAIP;8BAXU,mBAAmB;IAD/B,IAAA,mBAAU,EAAC,WAAW,CAAC;qCAEyB,oCAAgB;GADpD,mBAAmB,CAY/B"}

package/dist/module/dashboard/dashboard.module.js

@@ -12,6 +12,9 @@ const entity_module_1 = require("../meta/entity.module");
 const typeorm_1 = require("@nestjs/typeorm");
 const widget_master_entity_1 = require("./entity/widget_master.entity");
 const dashboard_page_data_entity_1 = require("./entity/dashboard_page_data.entity");
+const dashboard_controller_1 = require("./controller/dashboard.controller");
+const dashboard_service_1 = require("./service/dashboard.service");
+const dashboard_repository_1 = require("./repository/dashboard.repository");
 let DashboardModule = class DashboardModule {
 };
 exports.DashboardModule = DashboardModule;
@@ -21,8 +24,9 @@ exports.DashboardModule = DashboardModule = __decorate([
             entity_module_1.EntityModule,
             typeorm_1.TypeOrmModule.forFeature([widget_master_entity_1.WidgetMaster, dashboard_page_data_entity_1.DashboardPageData]),
         ],
-        controllers: [],
-        providers: [],
+        controllers: [dashboard_controller_1.DashboardController],
+        providers: [dashboard_service_1.DashboardService, dashboard_repository_1.DashboardRepository],
+        exports: [dashboard_service_1.DashboardService],
     })
 ], DashboardModule);
 //# sourceMappingURL=dashboard.module.js.map

package/dist/module/dashboard/dashboard.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.module.js","sourceRoot":"","sources":["../../../src/module/dashboard/dashboard.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yDAAqD;AACrD,6CAAgD;AAChD,wEAA6D;AAC7D,oFAAwE;AAUjE,IAAM,eAAe,GAArB,MAAM,eAAe;CAAG,CAAA;AAAlB,0CAAe;0BAAf,eAAe;IAR3B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,4BAAY;YACZ,uBAAa,CAAC,UAAU,CAAC,CAAC,mCAAY,EAAE,8CAAiB,CAAC,CAAC;SAC5D;QACD,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,EAAE;KACd,CAAC;GACW,eAAe,CAAG"}
+{"version":3,"file":"dashboard.module.js","sourceRoot":"","sources":["../../../src/module/dashboard/dashboard.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yDAAqD;AACrD,6CAAgD;AAChD,wEAA6D;AAC7D,oFAAwE;AACxE,4EAAwE;AACxE,mEAA+D;AAC/D,4EAAwE;AAWjE,IAAM,eAAe,GAArB,MAAM,eAAe;CAAG,CAAA;AAAlB,0CAAe;0BAAf,eAAe;IAT3B,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,4BAAY;YACZ,uBAAa,CAAC,UAAU,CAAC,CAAC,mCAAY,EAAE,8CAAiB,CAAC,CAAC;SAC5D;QACD,WAAW,EAAE,CAAC,0CAAmB,CAAC;QAClC,SAAS,EAAE,CAAC,oCAAgB,EAAE,0CAAmB,CAAC;QAClD,OAAO,EAAE,CAAC,oCAAgB,CAAC;KAC5B,CAAC;GACW,eAAe,CAAG"}

package/dist/module/dashboard/entity/dashboard_page_data.entity.d.ts

@@ -1,7 +1,10 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 export declare class DashboardPageData extends BaseEntity {
+    constructor();
     page_sequence: number;
     applicable_type: string;
+    applicable_id: string;
     is_hidden: boolean;
     layout_json: any;
+    mapped_entity_type: string;
 }

package/dist/module/dashboard/entity/dashboard_page_data.entity.js

@@ -13,6 +13,10 @@ exports.DashboardPageData = void 0;
 const base_entity_entity_1 = require("../../meta/entity/base-entity.entity");
 const typeorm_1 = require("typeorm");
 let DashboardPageData = class DashboardPageData extends base_entity_entity_1.BaseEntity {
+    constructor() {
+        super();
+        this.entity_type = 'DASH';
+    }
 };
 exports.DashboardPageData = DashboardPageData;
 __decorate([
@@ -23,6 +27,10 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", String)
 ], DashboardPageData.prototype, "applicable_type", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", String)
+], DashboardPageData.prototype, "applicable_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'boolean', nullable: true }),
     __metadata("design:type", Boolean)
@@ -31,7 +39,12 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'json', nullable: true }),
     __metadata("design:type", Object)
 ], DashboardPageData.prototype, "layout_json", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
+    __metadata("design:type", String)
+], DashboardPageData.prototype, "mapped_entity_type", void 0);
 exports.DashboardPageData = DashboardPageData = __decorate([
-    (0, typeorm_1.Entity)({ name: 'cr_dashboard_page_data' })
+    (0, typeorm_1.Entity)({ name: 'cr_dashboard_page_data' }),
+    __metadata("design:paramtypes", [])
 ], DashboardPageData);
 //# sourceMappingURL=dashboard_page_data.entity.js.map

package/dist/module/dashboard/entity/dashboard_page_data.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard_page_data.entity.js","sourceRoot":"","sources":["../../../../src/module/dashboard/entity/dashboard_page_data.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAiE;AAG1D,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;CAYhD,CAAA;AAZY,8CAAiB;AAE5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAClB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACzB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACxB;4BAXN,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;GAC9B,iBAAiB,CAY7B"}
+{"version":3,"file":"dashboard_page_data.entity.js","sourceRoot":"","sources":["../../../../src/module/dashboard/entity/dashboard_page_data.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAiE;AAG1D,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;CAkBF,CAAA;AAtBY,8CAAiB;AAM5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAClB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACtB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACzB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACxB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACjB;4BArBhB,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAsB7B"}

package/dist/module/dashboard/entity/widget_master.entity.d.ts

@@ -1,5 +1,6 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 export declare class WidgetMaster extends BaseEntity {
+    constructor();
     api_url: string;
     function_name: string;
     view_type: string;

package/dist/module/dashboard/entity/widget_master.entity.js

@@ -13,6 +13,10 @@ exports.WidgetMaster = void 0;
 const base_entity_entity_1 = require("../../meta/entity/base-entity.entity");
 const typeorm_1 = require("typeorm");
 let WidgetMaster = class WidgetMaster extends base_entity_entity_1.BaseEntity {
+    constructor() {
+        super();
+        this.entity_type = 'WIDG';
+    }
 };
 exports.WidgetMaster = WidgetMaster;
 __decorate([
@@ -28,6 +32,7 @@ __decorate([
     __metadata("design:type", String)
 ], WidgetMaster.prototype, "view_type", void 0);
 exports.WidgetMaster = WidgetMaster = __decorate([
-    (0, typeorm_1.Entity)({ name: 'cr_widget_master' })
+    (0, typeorm_1.Entity)({ name: 'cr_widget_master' }),
+    __metadata("design:paramtypes", [])
 ], WidgetMaster);
 //# sourceMappingURL=widget_master.entity.js.map

package/dist/module/dashboard/entity/widget_master.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"widget_master.entity.js","sourceRoot":"","sources":["../../../../src/module/dashboard/entity/widget_master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,+BAAU;CAS3C,CAAA;AATY,oCAAY;AAEvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACtB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC1B;uBARP,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;GACxB,YAAY,CASxB"}
+{"version":3,"file":"widget_master.entity.js","sourceRoot":"","sources":["../../../../src/module/dashboard/entity/widget_master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,+BAAU;IAC1C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;IAC5B,CAAC;CASF,CAAA;AAbY,oCAAY;AAMvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACtB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC1B;uBAZP,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;;GACxB,YAAY,CAaxB"}

package/dist/module/dashboard/repository/dashboard.repository.d.ts

@@ -0,0 +1,9 @@
+import { DataSource } from 'typeorm';
+import { DashboardPageData } from '../entity/dashboard_page_data.entity';
+import { WidgetMaster } from '../entity/widget_master.entity';
+export declare class DashboardRepository {
+    private readonly dataSource;
+    constructor(dataSource: DataSource);
+    getDashboardPageData(pageId: number, organization_id: number): Promise<DashboardPageData | null>;
+    getWidgetsByIds(widgetIds: number[], organization_id: number): Promise<WidgetMaster[]>;
+}

package/dist/module/dashboard/repository/dashboard.repository.js

@@ -0,0 +1,47 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DashboardRepository = void 0;
+const common_1 = require("@nestjs/common");
+const typeorm_1 = require("typeorm");
+const dashboard_page_data_entity_1 = require("../entity/dashboard_page_data.entity");
+const widget_master_entity_1 = require("../entity/widget_master.entity");
+let DashboardRepository = class DashboardRepository {
+    constructor(dataSource) {
+        this.dataSource = dataSource;
+    }
+    async getDashboardPageData(pageId, organization_id) {
+        return await this.dataSource
+            .getRepository(dashboard_page_data_entity_1.DashboardPageData)
+            .createQueryBuilder('page')
+            .where('page.id = :pageId', { pageId })
+            .andWhere('page.organization_id = :organization_id', { organization_id })
+            .getOne();
+    }
+    async getWidgetsByIds(widgetIds, organization_id) {
+        if (!widgetIds.length)
+            return [];
+        return await this.dataSource
+            .getRepository(widget_master_entity_1.WidgetMaster)
+            .createQueryBuilder('widget')
+            .where('widget.id IN (:...widgetIds)', { widgetIds })
+            .andWhere('widget.organization_id = :organization_id', {
+            organization_id,
+        })
+            .getMany();
+    }
+};
+exports.DashboardRepository = DashboardRepository;
+exports.DashboardRepository = DashboardRepository = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
+], DashboardRepository);
+//# sourceMappingURL=dashboard.repository.js.map

package/dist/module/dashboard/repository/dashboard.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard.repository.js","sourceRoot":"","sources":["../../../../src/module/dashboard/repository/dashboard.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AACrC,qFAAyE;AACzE,yEAA8D;AAGvD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAA6B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;IAAG,CAAC;IAEvD,KAAK,CAAC,oBAAoB,CACxB,MAAc,EACd,eAAuB;QAEvB,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,aAAa,CAAC,8CAAiB,CAAC;aAChC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,KAAK,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,CAAC;aACtC,QAAQ,CAAC,yCAAyC,EAAE,EAAE,eAAe,EAAE,CAAC;aACxE,MAAM,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,SAAmB,EACnB,eAAuB;QAEvB,IAAI,CAAC,SAAS,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACjC,OAAO,MAAM,IAAI,CAAC,UAAU;aACzB,aAAa,CAAC,mCAAY,CAAC;aAC3B,kBAAkB,CAAC,QAAQ,CAAC;aAC5B,KAAK,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,CAAC;aACpD,QAAQ,CAAC,2CAA2C,EAAE;YACrD,eAAe;SAChB,CAAC;aACD,OAAO,EAAE,CAAC;IACf,CAAC;CACF,CAAA;AA7BY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,mBAAmB,CA6B/B"}

package/dist/module/dashboard/service/dashboard.service.d.ts

@@ -0,0 +1,32 @@
+import { DashboardRepository } from '../repository/dashboard.repository';
+export declare class DashboardService {
+    private readonly dashboardRepo;
+    constructor(dashboardRepo: DashboardRepository);
+    getDashboardPage(pageId: number, loggedInUser: any): Promise<{
+        page_data: {
+            page_sequence: number;
+            applicable_type: string;
+            applicable_id: string;
+            is_hidden: boolean;
+            mapped_entity_type: string;
+            id: number;
+            entity_type: string;
+            name: string;
+            status: string;
+            parent_type: string;
+            parent_id: number;
+            code: string;
+            created_by: number;
+            created_date: Date;
+            modified_by: number;
+            modified_date: Date;
+            enterprise_id: number;
+            organization_id: number;
+            appcode: string;
+            level_id: string;
+            level_type: string;
+        };
+        layout_json: any;
+        widget_json: {};
+    }>;
+}

package/dist/module/dashboard/service/dashboard.service.js

@@ -0,0 +1,44 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DashboardService = void 0;
+const common_1 = require("@nestjs/common");
+const dashboard_repository_1 = require("../repository/dashboard.repository");
+let DashboardService = class DashboardService {
+    constructor(dashboardRepo) {
+        this.dashboardRepo = dashboardRepo;
+    }
+    async getDashboardPage(pageId, loggedInUser) {
+        const organizationId = loggedInUser.organization_id;
+        const page = await this.dashboardRepo.getDashboardPageData(pageId, organizationId);
+        if (!page)
+            throw new common_1.NotFoundException(`Dashboard Page ${pageId} not found`);
+        const layout = page.layout_json || [];
+        const widgetIds = layout.map((b) => Number(b.w_id));
+        const widgets = await this.dashboardRepo.getWidgetsByIds(widgetIds, organizationId);
+        const widgetMap = {};
+        widgets.forEach((w) => {
+            widgetMap[w.id] = w;
+        });
+        const { layout_json, ...pageData } = page;
+        return {
+            page_data: pageData,
+            layout_json: layout,
+            widget_json: widgetMap,
+        };
+    }
+};
+exports.DashboardService = DashboardService;
+exports.DashboardService = DashboardService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [dashboard_repository_1.DashboardRepository])
+], DashboardService);
+//# sourceMappingURL=dashboard.service.js.map

package/dist/module/dashboard/service/dashboard.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard.service.js","sourceRoot":"","sources":["../../../../src/module/dashboard/service/dashboard.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA+D;AAC/D,6EAAyE;AAGlE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAA6B,aAAkC;QAAlC,kBAAa,GAAb,aAAa,CAAqB;IAAG,CAAC;IAEnE,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,YAAiB;QACtD,MAAM,cAAc,GAAG,YAAY,CAAC,eAAe,CAAC;QAEpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CACxD,MAAM,EACN,cAAc,CACf,CAAC;QACF,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,0BAAiB,CAAC,kBAAkB,MAAM,YAAY,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAGzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACtD,SAAS,EACT,cAAc,CACf,CAAC;QAGF,MAAM,SAAS,GAAG,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;QAG1C,OAAO;YACL,SAAS,EAAE,QAAQ;YACnB,WAAW,EAAE,MAAM;YACnB,WAAW,EAAE,SAAS;SACvB,CAAC;IACJ,CAAC;CACF,CAAA;AArCY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAEiC,0CAAmB;GADpD,gBAAgB,CAqC5B"}

package/dist/module/user/controller/login.controller.d.ts

@@ -1,17 +1,19 @@
 import { LoginService } from '../service/login.service';
 import { Request, Response } from 'express';
 import { UserSessionService } from '../service/user-session.service';
+import { ConfigService } from '@nestjs/config';
 export declare class LoginController {
     private loginService;
     private userSessionService;
-    constructor(loginService: LoginService, userSessionService: UserSessionService);
+    private configService;
+    constructor(loginService: LoginService, userSessionService: UserSessionService, configService: ConfigService);
     login(body: any, res: Response): Promise<Response<any, Record<string, any>>>;
     formLogin(body: any, res: Response): Promise<Response<any, Record<string, any>>>;
     logout(request: Request & {
         user: any;
     }, response: Response): Promise<void>;
     googleLogin(): Promise<void>;
-    googleAuthRedirect(req: any): Promise<string>;
+    googleAuthRedirect(req: any, res: Response): Promise<void>;
     switchCurrentLevel(req: Request & {
         user: any;
     }, data: {

package/dist/module/user/controller/login.controller.js

@@ -18,10 +18,12 @@ const login_service_1 = require("../service/login.service");
 const google_auth_guard_1 = require("../../../module/auth/guards/google-auth.guard");
 const jwt_guard_1 = require("../../auth/guards/jwt.guard");
 const user_session_service_1 = require("../service/user-session.service");
+const config_1 = require("@nestjs/config");
 let LoginController = class LoginController {
-    constructor(loginService, userSessionService) {
+    constructor(loginService, userSessionService, configService) {
         this.loginService = loginService;
         this.userSessionService = userSessionService;
+        this.configService = configService;
     }
     async login(body, res) {
         const { email_id, password, appcode, organization_id } = body;
@@ -40,9 +42,10 @@ let LoginController = class LoginController {
     }
     async googleLogin() {
     }
-    async googleAuthRedirect(req) {
-        let { email, name } = req.user.userData;
-        return this.loginService.loginWithGoogle(email, name);
+    async googleAuthRedirect(req, res) {
+        let { email, name } = req.user;
+        const token = await this.loginService.loginWithGoogle(email, name);
+        return res.redirect(`${this.configService.get('BASE_URL')}?token=${token}`);
     }
     async switchCurrentLevel(req, data) {
         const currentUser = req.user.userData;
@@ -98,8 +101,9 @@ __decorate([
     (0, common_1.Get)('google/callback'),
     (0, common_1.UseGuards)(google_auth_guard_1.GoogleAuthGuard),
     __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Res)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)
 ], LoginController.prototype, "googleAuthRedirect", null);
 __decorate([
@@ -114,6 +118,7 @@ __decorate([
 exports.LoginController = LoginController = __decorate([
     (0, common_1.Controller)('auth'),
     __metadata("design:paramtypes", [login_service_1.LoginService,
-        user_session_service_1.UserSessionService])
+        user_session_service_1.UserSessionService,
+        config_1.ConfigService])
 ], LoginController);
 //# sourceMappingURL=login.controller.js.map

package/dist/module/user/controller/login.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":"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"}

package/dist/module/user/service/login.service.d.ts

@@ -1,3 +1,4 @@
+import { BadRequestException } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
@@ -39,7 +40,7 @@ export declare class LoginService {
     }>;
     formLogin(body: any): Promise<any>;
     private getDefaultAccess;
-    loginWithGoogle(email: string, name: any): Promise<string>;
+    loginWithGoogle(email: string, name: any): Promise<string | BadRequestException>;
     logout(sessionKey: string): Promise<{
         message: string;
     } | undefined>;

package/dist/module/user/service/login.service.js

@@ -23,7 +23,6 @@ const typeorm_2 = require("typeorm");
 const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
 const role_entity_1 = require("../entity/role.entity");
 const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
-const user_entity_1 = require("../entity/user.entity");
 const user_session_service_1 = require("./user-session.service");
 const user_service_1 = require("./user.service");
 const jwt_service_1 = require("../../auth/services/jwt.service");
@@ -167,18 +166,7 @@ let LoginService = class LoginService {
     async loginWithGoogle(email, name) {
         let user = await this.userService.findByEmailId(email);
         if (!user) {
-            user = new user_entity_1.UserData();
-            user.email_id = email;
-            user.first_name = name.givenName;
-            user.last_name = name.familyName;
-            user.name = user.first_name + ' ' + user.last_name;
-            let savedUserResponse = await this.userService.createEntity(user, null);
-            if (savedUserResponse.success) {
-                user = savedUserResponse.data;
-            }
-            else {
-                throw new common_1.BadRequestException(savedUserResponse.error || 'Failed to create user');
-            }
+            return new common_1.BadRequestException('User not found');
         }
         return this.userSessionService.createSession(user);
     }

package/dist/module/user/service/login.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}

package/dist/module/workflow/repository/stage.repository.js

@@ -60,14 +60,14 @@ let StageRepository = class StageRepository {
             where: { id: stage_group_id, organization_id },
         }));
         if (!stageGroup) {
-            throw new common_1.NotFoundException('Stage group not found');
+            return [];
         }
         const rows = await this.dataSource.query(`
     SELECT 
       g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
       s.*
     FROM cr_wf_stage_group g
-    LEFT JOIN cr_wf_stage s ON s.stage_group_id = g.id
+    INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
     WHERE g.workflow_id = ? AND g.organization_id = ?
     ORDER BY g.id, s.id
     `, [stageGroup.workflow_id, organization_id]);

package/dist/module/workflow/repository/stage.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"stage.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AAExB,6CAAmD;AACnD,qCAAiD;AACjD,yDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,eAAkC,EAClC,UAAsB;QADtB,oBAAe,GAAf,eAAe,CAAmB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,cAAsB,EAAE,eAAuB;QAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SAC9B,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;QAGvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE;gBACL,cAAc;gBACd,eAAe;aAChB;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,KAAK;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,GAAG,cAAc,MAAM,KAAK,CAAC,IAAI,EAAE;SAC9C,CAAC,CAAC,CAAC;QAEJ,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,oCAAoC,CACxC,cAAsB,EACtB,eAAuB;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE;SAC/C,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtC;;;;;;;;KAQD,EACC,CAAC,UAAU,CAAC,WAAW,EAAE,eAAe,CAAC,CAC1C,CAAC;QAEF,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA3FY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,oBAAK,CAAC,CAAA;qCACU,oBAAU;QACf,oBAAU;GAJ9B,eAAe,CA2F3B"}
+{"version":3,"file":"stage.repository.js","sourceRoot":"","sources":["../../../../src/module/workflow/repository/stage.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAKwB;AAExB,6CAAmD;AACnD,qCAAiD;AACjD,yDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAEmB,eAAkC,EAClC,UAAsB;QADtB,oBAAe,GAAf,eAAe,CAAmB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,cAAsB,EAAE,eAAuB;QAC/D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE;SAC9B,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;QAGvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YAC7C,KAAK,EAAE;gBACL,cAAc;gBACd,eAAe;aAChB;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,KAAK;aAChB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,KAAK;YACR,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,GAAG,cAAc,MAAM,KAAK,CAAC,IAAI,EAAE;SAC9C,CAAC,CAAC,CAAC;QAEJ,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,oCAAoC,CACxC,cAAsB,EACtB,eAAuB;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC;QAGD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CACvD,mBAAmB,EACnB;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE;SAC/C,CACF,CAAe,CAAC;QAEjB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CACtC;;;;;;;;KAQD,EACC,CAAC,UAAU,CAAC,WAAW,EAAE,eAAe,CAAC,CAC1C,CAAC;QAEF,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA3FY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,oBAAK,CAAC,CAAA;qCACU,oBAAU;QACf,oBAAU;GAJ9B,eAAe,CA2F3B"}