Skip to content

Commit 95cfe4e

Browse files
LNK-4339: Internal Admin UI: Update main Menu bar to match Site map (#1197)
* Update menu * Add report dashboard page * Add placeholder for future Guided Onboarding management * Add placeholder page for shared query plans * Add app-configuration placeholder page * Add placeholder page for Kafka UI. Add links to Grafana and Kafka UI with new app.config.json settings. * Add environment variables for Grafana and Kafka urls. Update main.js to read them. * Add Normalization Operations to menu --------- Co-authored-by: nmLantana <nick.montalto@lantanagroup.com>
1 parent ea83247 commit 95cfe4e

36 files changed

Lines changed: 692 additions & 410 deletions

File tree

Web/Admin.UI/server/main.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,15 @@ function getConfig() {
128128
}
129129
}
130130

131+
if (process.env.GRAFANA_URL !== undefined) {
132+
config.grafanaUrl = process.env.GRAFANA_URL;
133+
console.log('Found GRAFANA_URL:', config.grafanaUrl);
134+
}
135+
136+
if (process.env.KAFKA_URL !== undefined) {
137+
config.kafkaUrl = process.env.KAFKA_URL;
138+
console.log('Found KAFKA_URL:', config.kafkaUrl);
139+
}
140+
131141
return config;
132142
}

Web/Admin.UI/src/app/app-routing.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@ const routes: Routes = [
2222
{ path: 'validation-config', loadComponent: () => import('./components/validation-config/validation-config.component').then(mod => mod.ValidationConfigComponent) },
2323
{ path: 'monitor/health', loadComponent: () => import('./components/monitor/link-health-check/link-health-check.component').then(mod => mod.LinkHealthCheckComponent) },
2424
{ path: 'themes', loadComponent: () => import('./components/theme-showcase/theme-showcase.component').then(mod => mod.ThemeShowcaseComponent) },
25+
{ path: 'reports', loadComponent: () => import('./components/reports/reports-dashboard/reports-dashboard.component').then(mod => mod.ReportsDashboardComponent) },
2526
{ path: 'reports/generate-report', loadComponent: () => import('./components/reports/generate-report/generate-report-form.component').then(mod => mod.GenerateReportFormComponent) },
2627
{ path: 'unauthorized', loadComponent: () => import('./components/core/unauthorized/unauthorized.component').then(mod => mod.UnauthorizedComponent) },
2728
{ path: 'sub-pre-qual-report/facility/:facilityId/report/:submissionId', loadComponent: () => import('./components/sub-pre-qual-report/sub-pre-qual-report.component').then(mod => mod.SubPreQualReportComponent) },
2829
{ path: 'validation-config/validation-categories', loadComponent: () => import('./components/validation-config/validation-categories/validation-categories-list/validation-categories-list.component').then(mod => mod.ValidationCategoriesComponent) },
2930
{ path: 'validation-config/validation-categories/:id/edit', loadComponent: () => import('./components/validation-config/validation-categories/edit-validation-category/edit-validation-category.component').then(mod => mod.EditValidationCategoryComponent) },
31+
{ path: 'query-plans', loadComponent: () => import('./components/query-plans/query-plans-dashboard/query-plans-dashboard.component').then(mod => mod.QueryPlansDashboardComponent) },
32+
{ path: 'app-configuration', loadComponent: () => import('./components/app-configuration/app-configuration-dashboard/app-configuration-dashboard.component').then(mod => mod.AppConfigurationDashboardComponent) },
33+
{ path: 'kafka', loadComponent: () => import('./components/kafka/kafka-dashboard/kafka-dashboard.component').then(mod => mod.KafkaDashboardComponent) },
3034
{ path: '**', redirectTo: '' },
3135
];
3236

Web/Admin.UI/src/app/app.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</span>
2525
</mat-toolbar>
2626
<div>
27-
<app-link-nav-bar></app-link-nav-bar>
27+
<link-nav-bar></link-nav-bar>
2828
<!-- <app-breadcrumb></app-breadcrumb> -->
2929
</div>
3030
<div>
3131
<app-loading-indicator></app-loading-indicator>
3232
<router-outlet></router-outlet>
3333
</div>
34-
<app-footer></app-footer>
34+
<app-footer></app-footer>

Web/Admin.UI/src/app/app.module.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { BrowserModule } from '@angular/platform-browser';
1212
import { FooterComponent } from "./components/core/footer/footer.component";
1313
import { HttpInterceptorProviders } from './interceptors/interceptor.barrel';
1414
import { LayoutModule } from '@angular/cdk/layout';
15-
import { LinkAdminSubnavBarComponent } from "./components/core/link-admin-subnav-bar/link-admin-subnav-bar.component";
1615
import { LinkNavBarComponent } from './components/core/link-nav-bar/link-nav-bar.component';
1716
import { LoadingIndicatorComponent } from './components/core/loading-indicator/loading-indicator.component';
1817
import { MatButtonModule } from '@angular/material/button';
@@ -35,6 +34,9 @@ import { VdButtonComponent } from './components/core/vd-button/vd-button.compone
3534
import { VdIconComponent } from './components/core/vd-icon/vd-icon.component';
3635
import { provideCharts, withDefaultRegisterables } from 'ng2-charts';
3736
import { TenantSearchBarComponent } from "./components/core/tenant-search-bar/tenant-search-bar/tenant-search-bar.component";
37+
import { QueryPlansDashboardComponent } from './components/query-plans/query-plans-dashboard/query-plans-dashboard.component';
38+
import { AppConfigurationDashboardComponent } from './components/app-configuration/app-configuration-dashboard/app-configuration-dashboard.component';
39+
import { KafkaDashboardComponent } from './components/kafka/kafka-dashboard/kafka-dashboard.component';
3840

3941
export function initConfig(appConfig: AppConfigService, oauthService: OAuthService, authService: AuthenticationService, oauthModuleConfig: OAuthModuleConfig) {
4042
const configPromise = appConfig.loadConfig()
@@ -99,13 +101,15 @@ export function initConfig(appConfig: AppConfigService, oauthService: OAuthServi
99101
}),
100102
VdIconComponent,
101103
VdButtonComponent,
102-
LinkAdminSubnavBarComponent,
103104
SubPreQualReportComponent,
104105
SubPreQualReportBannerComponent,
105106
SubPreQualReportMetaComponent,
106107
SubPreQualReportSummaryComponent,
107108
SubPreQualReportCategoriesTableComponent,
108-
TenantSearchBarComponent
109+
TenantSearchBarComponent,
110+
QueryPlansDashboardComponent,
111+
AppConfigurationDashboardComponent,
112+
KafkaDashboardComponent
109113
],
110114
providers: [
111115
{
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="content">
2+
<p>Placeholder page for managing app configuration settings.</p>
3+
</div>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@use '../../../../styles/core.scss';
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { AppConfigurationDashboardComponent } from './app-configuration-dashboard.component';
4+
5+
describe('AppConfigurationDashboardComponent', () => {
6+
let component: AppConfigurationDashboardComponent;
7+
let fixture: ComponentFixture<AppConfigurationDashboardComponent>;
8+
9+
beforeEach(async () => {
10+
await TestBed.configureTestingModule({
11+
imports: [AppConfigurationDashboardComponent]
12+
})
13+
.compileComponents();
14+
15+
fixture = TestBed.createComponent(AppConfigurationDashboardComponent);
16+
component = fixture.componentInstance;
17+
fixture.detectChanges();
18+
});
19+
20+
it('should create', () => {
21+
expect(component).toBeTruthy();
22+
});
23+
});
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
3+
@Component({
4+
selector: 'app-app-configuration-dashboard',
5+
imports: [],
6+
templateUrl: './app-configuration-dashboard.component.html',
7+
styleUrl: './app-configuration-dashboard.component.scss'
8+
})
9+
export class AppConfigurationDashboardComponent {
10+
11+
}

Web/Admin.UI/src/app/components/core/link-admin-subnav-bar/link-admin-subnav-bar.component.html

Lines changed: 0 additions & 33 deletions
This file was deleted.

Web/Admin.UI/src/app/components/core/link-admin-subnav-bar/link-admin-subnav-bar.component.scss

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)