From bee89fc12b8a5335505e39e63fbc94c2ffe39ada Mon Sep 17 00:00:00 2001 From: Gaurav Kumar Date: Fri, 7 Nov 2025 09:29:41 +0530 Subject: [PATCH] new --- .../app/modules/main/main-routing.module.ts | 83 ++++++--- .../src/app/modules/main/main.module.ts | 167 +++++++++++------- 2 files changed, 161 insertions(+), 89 deletions(-) diff --git a/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index 46bcfad..fcf1339 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,4 +1,5 @@ + import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component'; import { Component, NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -37,10 +38,7 @@ import { AccesstypeComponent } from './admin/accesstype/accesstype.component'; import { ModulesComponent } from './admin/modules/modules.component'; import { SessionloggerComponent } from './admin/sessionlogger/sessionlogger.component'; -import { ReportRunnerComponent } from './builder/report-runner/report-runner.component'; import { ReportrunnerallComponent } from './builder/report-runner/reportrunnerall/reportrunnerall.component'; -import { Reportrunneredit2Component } from './builder/report-runner/reportrunneredit2/reportrunneredit2.component'; -import { ReportrunnereditComponent } from './builder/report-runner/reportrunneredit/reportrunneredit.component'; import { ReportBuildComponent } from './builder/report-build/report-build.component'; import { ReportbuildallComponent } from './builder/report-build/reportbuildall/reportbuildall.component'; import { ReportbuildaddComponent } from './builder/report-build/reportbuildadd/reportbuildadd.component'; @@ -82,6 +80,10 @@ import { MappingruleallComponent } from './datamanagement/mappingrule/mappingrul import { MappingruleaddComponent } from './datamanagement/mappingrule/mappingruleadd/mappingruleadd.component'; import { MappingruleeditComponent } from './datamanagement/mappingrule/mappingruleedit/mappingruleedit.component'; import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component'; +import { AllapiregisteryComponent } from './fnd/apiregistery/allapiregistery/allapiregistery.component'; +import { AddapiregisteryComponent } from './fnd/apiregistery/addapiregistery/addapiregistery.component'; +import { EditapiregisteryComponent } from './fnd/apiregistery/editapiregistery/editapiregistery.component'; +import { ApiregisterylineComponent } from './fnd/apiregistery/Apiregisteryline/Apiregisteryline.component'; import { Token_registeryComponent } from './fnd/Token_registery/Token_registery.component'; import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component'; import { ThemeCustomizationComponent } from './theme-customization/theme-customization.component'; @@ -89,13 +91,18 @@ import { Data_lakeComponent } from './builder/dashboardnew/Data_lake/Data_lake.c import { SureconnectComponent } from './builder/dashboardnew/sureconnect/sureconnect.component'; import { EditsureconnectComponent } from './builder/dashboardnew/sureconnect/editsureconnect/editsureconnect.component'; import { OauthComponent } from './builder/dashboardnew/sureconnect/oauth/oauth.component'; -// import { QueryComponent } from './superadmin/query/query.component'; -// import { QueryaddComponent } from './superadmin/queryadd/queryadd.component'; -// import { QueryeditComponent } from './superadmin/queryedit/queryedit.component'; - - - - +import { QueryComponent } from './superadmin/query/query.component'; +import { QueryaddComponent } from './superadmin/queryadd/queryadd.component'; +import { QueryeditComponent } from './superadmin/queryedit/queryedit.component'; +import { ChartTypePageComponent } from './builder/dashboardnew/chart-type-manager/chart-type-page.component'; +import { AddChartTypeComponent } from './builder/dashboardnew/chart-type-manager/add-chart-type.component'; +import { EditChartTypeComponent } from './builder/dashboardnew/chart-type-manager/edit-chart-type.component'; +import { ChartTypeUiComponentsComponent } from './builder/dashboardnew/chart-type-manager/chart-type-ui-components.component'; +import { ChartTypeTemplatesComponent } from './builder/dashboardnew/chart-type-manager/chart-type-templates.component'; +import { ChartTypeFieldsComponent } from './builder/dashboardnew/chart-type-manager/chart-type-fields.component'; +import { ReportRunnerComponent } from './builder/report-runner/report-runner.component'; +import { ReportrunnereditComponent } from './builder/report-runner/reportrunneredit/reportrunneredit.component'; +import { Reportrunneredit2Component } from './builder/report-runner/reportrunneredit2/reportrunneredit2.component'; const routes: Routes = [ //Important: The sequence of path is important as the router go over then in sequential manner { path: '', redirectTo: '/cns-portal/dashboard', pathMatch: 'full' }, @@ -125,11 +132,13 @@ const routes: Routes = [ { path: 'about', component: AboutComponent }, { path: 'setupicon', component: SetupiconComponent }, { path: 'myworkspace', component: MyworkspaceComponent }, - { path: 'theme-customization', component: ThemeCustomizationComponent }, - { path: 'datalake', component: Data_lakeComponent }, - { path: 'sureconnect', component: SureconnectComponent }, - { path: 'oauth', component: OauthComponent }, - { path: 'editconnect/:id', component: EditsureconnectComponent }, + { path: 'theme-customization', component: ThemeCustomizationComponent }, + { path: 'datalake', component: Data_lakeComponent }, + { path: 'sureconnect', component: SureconnectComponent }, + { path: 'oauth', component: OauthComponent }, + { path: 'editconnect/:id', component: EditsureconnectComponent }, + + { @@ -143,9 +152,9 @@ const routes: Routes = [ //SUPER ADMIN - // { path: 'query', component: QueryComponent, canActivate: [AuthGuard], data: { roles: [Role.Admin] } }, - // { path: 'reportQuery/:id/queryadd', component: QueryaddComponent, canActivate: [AuthGuard], data: { roles: [Role.Admin] } }, - // { path: 'reportQuery/queryedit/:id', component: QueryeditComponent, canActivate: [AuthGuard], data: { roles: [Role.Admin] } }, + { path: 'query', component: QueryComponent, canActivate: [AuthGuard], data: { roles: [Role.Admin] } }, + { path: 'reportQuery/:id/queryadd', component: QueryaddComponent, canActivate: [AuthGuard], data: { roles: [Role.Admin] } }, + { path: 'reportQuery/queryedit/:id', component: QueryeditComponent, canActivate: [AuthGuard], data: { roles: [Role.Admin] } }, @@ -186,9 +195,21 @@ const routes: Routes = [ { path: 'editdata/:id', component: EditformnewdashComponent }, { path: 'editdashn/:id', component: EditnewdashComponent }, { path: 'schedule/:id', component: ScheduleComponent }, + { path: 'chart-types', component: ChartTypePageComponent }, + { path: 'chart-types/add', component: AddChartTypeComponent }, + { path: 'chart-types/edit/:id', component: EditChartTypeComponent }, + { path: 'chart-types/:id/ui-components', component: ChartTypeUiComponentsComponent }, + { path: 'chart-types/:id/templates', component: ChartTypeTemplatesComponent }, + { path: 'chart-types/:id/fields', component: ChartTypeFieldsComponent }, ] }, + // Shield Dashboard + { + path: 'shield-dashboard', + loadChildren: () => import('./builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard-routing.module').then(m => m.ShieldDashboardRoutingModule) + }, + { path: 'dashboardrunner', component: DashboardrunnerComponent, children: [ @@ -236,8 +257,20 @@ const routes: Routes = [ ], }, { path: 'SequenceGenerator', component: SequencegenaratorComponent }, - { path: 'apiregistery', component: ApiregisteryComponent }, + // Api registery + + { + path: 'apiregistery', component: ApiregisteryComponent, + children: [ + { path: '', redirectTo: 'all', pathMatch: 'full' }, + { path: 'all', component: AllapiregisteryComponent }, + { path: 'add', component: AddapiregisteryComponent }, + { path: 'edit/:id', component: EditapiregisteryComponent }, + { path: 'line/:id', component: ApiregisterylineComponent }, + + ], + }, // DATA MANAGEMENT @@ -270,18 +303,16 @@ const routes: Routes = [ // buildercomponents + + + + + { path: 'tokenregistery', component: Token_registeryComponent }, { path: 'Stepper_workflow', component: Stepper_workflowComponent }, - - - - - - - { path: '**', component: PageNotFoundComponent }, ] diff --git a/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 57b4f91..62cae29 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -53,9 +53,6 @@ import { ReportbuildeditComponent } from './builder/report-build/reportbuildedit import { ReportbuildqueryComponent } from './builder/report-build/reportbuildquery/reportbuildquery.component'; import { ReportBuild2Component } from './builder/report-build2/report-build2.component'; import { ReportBuild2editComponent } from './builder/report-build2/report-build2edit/report-build2edit.component'; -import { ReportRunnerComponent } from './builder/report-runner/report-runner.component'; -import { ReportrunnereditComponent } from './builder/report-runner/reportrunneredit/reportrunneredit.component'; -import { Reportrunneredit2Component } from './builder/report-runner/reportrunneredit2/reportrunneredit2.component'; import { DashboardnewComponent } from './builder/dashboardnew/dashboardnew.component'; @@ -74,6 +71,9 @@ import { RadarChartComponent } from './builder/dashboardnew/gadgets/radar-chart/ import { ScatterChartComponent } from './builder/dashboardnew/gadgets/scatter-chart/scatter-chart.component'; import { ToDoChartComponent } from './builder/dashboardnew/gadgets/to-do-chart/to-do-chart.component'; import { ScheduleComponent } from './builder/dashboardnew/schedule/schedule.component'; +import { CommonFilterComponent } from './builder/dashboardnew/common-filter/common-filter.component'; +import { ChartWrapperComponent } from './builder/dashboardnew/common-filter/chart-wrapper.component'; +import { CompactFilterComponent } from './builder/dashboardnew/common-filter/compact-filter.component'; import { AddextensionComponent } from './fnd/extension/addextension/addextension.component'; import { AllextensionComponent } from './fnd/extension/allextension/allextension.component'; import { EditextensionComponent } from './fnd/extension/editextension/editextension.component'; @@ -91,6 +91,9 @@ import { RadarRunnerComponent } from './builder/dashboardrunner/dashrunnerline/r import { ScatterRunnerComponent } from './builder/dashboardrunner/dashrunnerline/scatter-runner/scatter-runner.component'; import { TodoRunnerComponent } from './builder/dashboardrunner/dashrunnerline/todo-runner/todo-runner.component'; +// Import CompactFilterRunnerComponent +import { CompactFilterRunnerComponent } from './builder/dashboardrunner/dashrunnerline/compact-filter-runner/compact-filter-runner.component'; + import { ApiregisteryComponent } from './fnd/apiregistery/apiregistery.component'; import { BulkimportComponent } from './datamanagement/bulkimport/bulkimport.component'; @@ -106,18 +109,59 @@ import { MappingruleaddComponent } from './datamanagement/mappingrule/mappingrul import { MappingruleallComponent } from './datamanagement/mappingrule/mappingruleall/mappingruleall.component'; import { MappingruleeditComponent } from './datamanagement/mappingrule/mappingruleedit/mappingruleedit.component'; import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/Stepper_workflow/Stepper_workflow.component'; +import { AllapiregisteryComponent } from './fnd/apiregistery/allapiregistery/allapiregistery.component'; +import { AddapiregisteryComponent } from './fnd/apiregistery/addapiregistery/addapiregistery.component'; +import { EditapiregisteryComponent } from './fnd/apiregistery/editapiregistery/editapiregistery.component'; +import { ApiregisterylineComponent } from './fnd/apiregistery/Apiregisteryline/Apiregisteryline.component'; + import { Token_registeryComponent } from './fnd/Token_registery/Token_registery.component'; import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component'; import { ThemeCustomizationComponent } from './theme-customization/theme-customization.component'; +import { QueryComponent } from './superadmin/query/query.component'; +import { QueryaddComponent } from './superadmin/queryadd/queryadd.component'; +import { QueryeditComponent } from './superadmin/queryedit/queryedit.component'; + +import { FieldTypesModule } from '../../shared/components/field-types/field-types.module'; +import { SharedModule } from '../../shared/shared.module'; import { Data_lakeComponent } from './builder/dashboardnew/Data_lake/Data_lake.component'; import { CronJobBuilderComponent } from './builder/dashboardnew/Data_lake/cron-job-builder/cron-job-builder.component'; import { SureconnectComponent } from './builder/dashboardnew/sureconnect/sureconnect.component'; import { EditsureconnectComponent } from './builder/dashboardnew/sureconnect/editsureconnect/editsureconnect.component'; import { OauthComponent } from './builder/dashboardnew/sureconnect/oauth/oauth.component'; -// import { QueryComponent } from './superadmin/query/query.component'; -// import { QueryaddComponent } from './superadmin/queryadd/queryadd.component'; -// import { QueryeditComponent } from './superadmin/queryedit/queryedit.component'; +// Import Shield Dashboard Module +import { ShieldDashboardModule } from './builder/dashboardnew/gadgets/shield-dashboard/shield-dashboard.module'; +// Import UnifiedChartComponent +import { UnifiedChartComponent } from './builder/dashboardnew/gadgets/unified-chart/unified-chart.component'; +// Import ChartConfigManagerComponent +import { ChartConfigManagerComponent } from './builder/dashboardnew/chart-config/chart-config-manager.component'; +// Import ChartTypeManagerComponent +import { ChartTypeManagerComponent } from './builder/dashboardnew/chart-type-manager/chart-type-manager.component'; +// Import ChartTypePageComponent +import { ChartTypePageComponent } from './builder/dashboardnew/chart-type-manager/chart-type-page.component'; +// Import AddChartTypeComponent +import { AddChartTypeComponent } from './builder/dashboardnew/chart-type-manager/add-chart-type.component'; +// Import EditChartTypeComponent +import { EditChartTypeComponent } from './builder/dashboardnew/chart-type-manager/edit-chart-type.component'; +// Import ChartTypeUiComponentsComponent +import { ChartTypeUiComponentsComponent } from './builder/dashboardnew/chart-type-manager/chart-type-ui-components.component'; +// Import ChartTypeTemplatesComponent +import { ChartTypeTemplatesComponent } from './builder/dashboardnew/chart-type-manager/chart-type-templates.component'; +// Import ChartTypeFieldsComponent +import { ChartTypeFieldsComponent } from './builder/dashboardnew/chart-type-manager/chart-type-fields.component'; +// Import new form components +import { ChartTypeFormComponent } from './builder/dashboardnew/chart-config/forms/chart-type-form.component'; +import { UiComponentFormComponent } from './builder/dashboardnew/chart-config/forms/ui-component-form.component'; +import { ComponentPropertyFormComponent } from './builder/dashboardnew/chart-config/forms/component-property-form.component'; +import { ChartTemplateFormComponent } from './builder/dashboardnew/chart-config/forms/chart-template-form.component'; +import { DynamicFieldFormComponent } from './builder/dashboardnew/chart-config/forms/dynamic-field-form.component'; +// Import ChartConfigModalComponent +import { ChartConfigModalComponent } from './builder/dashboardnew/editnewdash/chart-config-modal.component'; +// Import DynamicChartLoaderService +import { DynamicChartLoaderService } from './builder/dashboardnew/chart-config/dynamic-chart-loader.service'; +import { ReportRunnerComponent } from './builder/report-runner/report-runner.component'; +import { ReportrunnereditComponent } from './builder/report-runner/reportrunneredit/reportrunneredit.component'; +import { Reportrunneredit2Component } from './builder/report-runner/reportrunneredit2/reportrunneredit2.component'; @NgModule({ declarations: [ @@ -128,72 +172,64 @@ import { OauthComponent } from './builder/dashboardnew/sureconnect/oauth/oauth.c UsermaintanceaddComponent, UsermaintanceeditComponent, SubmenuComponent, ModulesComponent, SessionloggerComponent, DashboardnewComponent, EditformnewdashComponent, EditnewdashComponent, ScheduleComponent, - DoughnutChartComponent, LineChartComponent, RadarChartComponent, BarChartComponent, BubbleChartComponent, DynamicChartComponent, ScatterChartComponent, PolarChartComponent, PieChartComponent, FinancialChartComponent, ToDoChartComponent, GridViewComponent, + CommonFilterComponent, ChartWrapperComponent, CompactFilterComponent, DoughnutChartComponent, LineChartComponent, RadarChartComponent, BarChartComponent, BubbleChartComponent, DynamicChartComponent, ScatterChartComponent, PolarChartComponent, PieChartComponent, FinancialChartComponent, ToDoChartComponent, GridViewComponent, + // Add UnifiedChartComponent to declarations + UnifiedChartComponent, + // Add ChartConfigManagerComponent to declarations + ChartConfigManagerComponent, + // Add ChartTypeManagerComponent to declarations + ChartTypeManagerComponent, + // Add ChartTypePageComponent to declarations + ChartTypePageComponent, + // Add AddChartTypeComponent to declarations + AddChartTypeComponent, + // Add EditChartTypeComponent to declarations + EditChartTypeComponent, + // Add ChartTypeUiComponentsComponent to declarations + ChartTypeUiComponentsComponent, + // Add ChartTypeTemplatesComponent to declarations + ChartTypeTemplatesComponent, + // Add ChartTypeFieldsComponent to declarations + ChartTypeFieldsComponent, + // Add new form components to declarations + ChartTypeFormComponent, + UiComponentFormComponent, + ComponentPropertyFormComponent, + ChartTemplateFormComponent, + DynamicFieldFormComponent, + // Add ChartConfigModalComponent to declarations + ChartConfigModalComponent, + // Add ChartTypeDisplayComponent to declarations + + DashrunnerlineComponent, BarRunnerComponent, LineRunnerComponent, DoughnutRunnerComponent, GridRunnerComponent, PieRunnerComponent, PolarRunnerComponent, RadarRunnerComponent, ScatterRunnerComponent, TodoRunnerComponent, BubbleRunnerComponent, + // Add CompactFilterRunnerComponent to declarations + CompactFilterRunnerComponent, ReportBuildComponent, ReportbuildeditComponent, ReportbuildqueryComponent, ReportBuild2Component, ReportBuild2editComponent, - // QueryComponent, QueryaddComponent, QueryeditComponent, + QueryComponent, QueryaddComponent, QueryeditComponent, ExtensionComponent, AllextensionComponent, - AddextensionComponent, EditextensionComponent, ApiregisteryComponent, - DatamanagementComponent, DatamananementworkflowComponent, BulkimportComponent, BulkimportallComponent, BulkimportaddComponent, BulkimporteditComponent, BulkimportlineComponent, BulkimporteditlineComponent, MappingruleComponent, - MappingruleallComponent, MappingruleaddComponent, MappingruleeditComponent, - ThemeCustomizationComponent, + AddextensionComponent, EditextensionComponent, ApiregisteryComponent, AllapiregisteryComponent, AddapiregisteryComponent, EditapiregisteryComponent, + + ApiregisterylineComponent, + DatamanagementComponent, DatamananementworkflowComponent, BulkimportComponent, BulkimportallComponent, BulkimportaddComponent, BulkimporteditComponent, BulkimportlineComponent, BulkimporteditlineComponent, MappingruleComponent, MappingruleallComponent, + MappingruleaddComponent, + MappingruleeditComponent, Stepper_workflowComponent, Customer_informationComponent, Data_lakeComponent, - SureconnectComponent, - EditsureconnectComponent, - OauthComponent, - CronJobBuilderComponent, + SureconnectComponent, + EditsureconnectComponent, + OauthComponent, + CronJobBuilderComponent, + // FileUploadListComponent, // buildercomponents - + ThemeCustomizationComponent, + Token_registeryComponent, - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Stepper_workflowComponent, - - - - - - ], + ], imports: [ QRCodeModule, CommonModule, @@ -212,12 +248,17 @@ import { OauthComponent } from './builder/dashboardnew/sureconnect/oauth/oauth.c NgChartsModule, NgxChartsModule, DynamicModule, + FieldTypesModule, + SharedModule, + ShieldDashboardModule, ], providers: [ CookieService, WireframeService, - - + DynamicChartLoaderService + ], + exports: [ + ChartConfigManagerComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] })