Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.html =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.html (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.html (working copy) @@ -0,0 +1,51 @@ +

Tasks

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
SNo.{{ i | globalSerial }}Name{{ element?.device_list }}Type{{ element?.type }}Status +
+ @if (element?.state === 'done') { + Done + } @else { + {{element?.state}} + } +
+
No results found.
+
+
+ Show all Tasks +
+
+ + +
+ +
+ Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.scss (added) =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.scss (revision 0) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.scss (revision 0) Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.spec.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.spec.ts (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.spec.ts (working copy) @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LatestTasks } from './latest-tasks'; + +describe('LatestTasks', () => { + let component: LatestTasks; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [LatestTasks] + }) + .compileComponents(); + + fixture = TestBed.createComponent(LatestTasks); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.ts (nonexistent) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/common/latest-tasks/latest-tasks.ts (working copy) @@ -0,0 +1,51 @@ +import {Component, inject, OnInit} from '@angular/core'; +import {SharedModule} from '../../../shared/shared-module'; +import {MatDialogRef} from '@angular/material/dialog'; +import {MatTableDataSource} from '@angular/material/table'; +import {GlobalSerialPipe} from '../../../pipes/global-serial-pipe'; +import {SystemService} from '../../../services/system-service'; +import {take} from 'rxjs/operators'; + +@Component({ + selector: 'app-latest-tasks', + imports: [SharedModule, GlobalSerialPipe], + templateUrl: './latest-tasks.html', + styleUrl: './latest-tasks.scss' +}) +export class LatestTasks implements OnInit { + + readonly dialogRef = inject(MatDialogRef); + tasksColumns: Array = ['serial', 'name', 'type', 'status']; + tasksDataSource: MatTableDataSource = new MatTableDataSource() + + constructor( + private _system: SystemService, + ) { + } + + ngOnInit() { + setTimeout(() => { + this.getTasks(); + }) + } + + getTasks() { + this._system.getTasks({"start": 0, "number": 10}) + .pipe(take(1)).subscribe({ + next: (result: any) => { + if (result && result?.task && result?.task?.data) { + if (result?.task?.data.length > 0) { + this.tasksDataSource.data = result?.task?.data; + } + } + }, + error: error => { + console.log(error?.message || 'Failed to get tasks'); + } + }) + } + + onCancel() { + this.dialogRef.close(); + } +} Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/navigation/navigation.html =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/navigation/navigation.html (revision 2709) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/navigation/navigation.html (working copy) @@ -7,7 +7,7 @@ Array Management Platform
- +               @@ -58,11 +58,11 @@ @if (!item.children) {
  • + (click)="isSidebarCollapsed && toggleSidebar()" class="a-link"> @if (item.icon != '') { - + } - {{ item?.label }} +  {{ item?.label }}
    • } @else { @@ -71,12 +71,13 @@ (click)="toggleSubMenu(item)" [class.active]="isParentActive(item)" [class.expanded]="item.expanded" + class="a-link" > @if (item.icon != '') { - + } - {{ item?.label }} - +  {{ item?.label }} + @if (item.expanded) {
    @@ -58,9 +58,10 @@ Save Changes   @@ -113,5 +114,4 @@ - Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/storage-primary/storage-primary.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/storage-primary/storage-primary.ts (revision 2714) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/components/sub-components/storage-primary/storage-primary.ts (working copy) @@ -80,7 +80,6 @@ size: result?.paths[0]?.size || 0, path: result?.paths[0]?.path || 'N/A', }); - console.log(this.storageMetrics); this.sManagementDataSource.data = this.storageMetrics; }, error: error => { @@ -90,6 +89,29 @@ } updateStorageCleanupConfig() { - console.log(this.configForm.value); + this._system.updateStorageCleanupConfig(this.configForm.value) + .pipe(take(1)).subscribe({ + next: (result: any) => { + this._notification.showSuccess(`Successfully updated storage cleanup config.`); + }, + error: error => { + this._notification.showError(`Error: ${error?.message || 'Failed to update storage cleanup config.'}`); + } + }) } + + initiateStorageCleanup() { + this._system.initiateStorageCleanup({ + duration: this.configForm.value?.duration, + percent: this.configForm.value?.percent, + }) + .pipe(take(1)).subscribe({ + next: (result: any) => { + this._notification.showSuccess(`Successfully initialized storage cleanup activity.`); + }, + error: error => { + this._notification.showError(`Error: ${error?.message || 'Failed to initialize storage cleanup activity.'}`); + } + }) + } } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (revision 2714) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/api_urls.ts (working copy) @@ -170,8 +170,12 @@ GET_SSL_VPN_MONITORING_METRICS_URL: `${PREFIX}/ssl_vpn_stats`, GET_SECONDARY_STORAGE_URL: `${PREFIX}/log/storage?type=secondary`, GET_STORAGE_CLEANUP_CONFIG_URL: `${PREFIX}/storage/crontab`, + UPDATE_STORAGE_CLEANUP_CONFIG_URL: `${PREFIX}/storage/crontab`, GET_STORAGE_ALLOCATION_URL: `${PREFIX}/storage/allocation`, GET_STORAGE_QUERY_URL: `${PREFIX}/storage/query`, + GET_LOGS_ARCHIVES_URL: `${PREFIX}/log/archives`, + CREATE_LOGS_ARCHIVE_URL: `${PREFIX}/log/archive`, + PERFORM_STORAGE_CLEANUP_URL: `${PREFIX}/storage/clean`, // AVX GET_AVX_DEVICES_URL: `${PREFIX}/api/cm/virtualization/Host/_get_list_data`, ADD_AVX_DEVICE_URL: `${PREFIX}/api/cm/virtualization/Host/_add`, Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/menu.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/menu.ts (revision 2709) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/constants/menu.ts (working copy) @@ -3,14 +3,14 @@ export const MENU_ITEMS: MenuItem[] = [ { label: 'Dashboard', - icon: '', + icon: 'house-signal', routerLink: '/dashboard', roles: ['super_admin', 'device_admin', 'common_admin'], permissions: ['Dashboard'], }, { label: 'Inventory', - icon: '', + icon: 'network-wired', expanded: false, children: [ { @@ -31,7 +31,7 @@ }, { label: 'System', - icon: '', + icon: 'gear', expanded: false, children: [ { @@ -80,7 +80,7 @@ }, { label: 'Device Services', - icon: '', + icon: 'laptop-code', expanded: false, children: [ { @@ -116,7 +116,7 @@ }, { label: 'APV Volume License', - icon: '', + icon: 'people-line', expanded: false, children: [ { @@ -137,21 +137,21 @@ }, { label: 'Upgrade Centre', - icon: '', + icon: 'cloud-arrow-up', routerLink: '/upgrade-centre', roles: ['super_admin'], permissions: ['UpgradeCentre'] }, { label: 'Configuration Hub', - icon: '', + icon: 'microchip', routerLink: '/configuration-hub', roles: ['super_admin', 'device_admin'], permissions: ['ConfigurationHub'] }, { label: 'AVX Management', - icon: '', + icon: 'hard-drive', expanded: false, children: [ { @@ -172,7 +172,7 @@ }, { label: 'Monitoring', - icon: '', + icon: 'eye', expanded: false, children: [ { @@ -193,7 +193,7 @@ }, { label: 'Alerting', - icon: '', + icon: 'bell', expanded: false, children: [ { @@ -221,14 +221,14 @@ }, { label: 'Reports', - icon: '', + icon: 'file-lines', routerLink: '/reports', roles: ['super_admin', 'device_admin', 'common_admin'], permissions: ['Reports'] }, { label: 'Log Analysis', - icon: '', + icon: 'magnifying-glass-chart', routerLink: '/log-analysis', expanded: false, roles: ['super_admin', 'device_admin', 'common_admin'], @@ -236,7 +236,7 @@ }, { label: 'Observability', - icon: '', + icon: 'signal', routerLink: '/observability', roles: ['super_admin', 'device_admin', 'common_admin'], permissions: ['Observability'] Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts (revision 2714) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/services/system-service.ts (working copy) @@ -513,9 +513,37 @@ getStorageQuery(payload: any) { return this.http.post(URLS.GET_STORAGE_QUERY_URL, payload, { + csrf: true, + isFormData: false, + csrfInFormData: true + }); + } + + getStorageArchives(storage: string = 'primary') { + return this.http.get(`${URLS.GET_LOGS_ARCHIVES_URL}?location=${storage}`); + } + + createLogsArchive(payload: any) { + return this.http.post(URLS.CREATE_LOGS_ARCHIVE_URL, payload, { + csrf: true, + isFormData: false, + csrfInFormData: true + }); + } + + updateStorageCleanupConfig(payload: any) { + return this.http.post(URLS.UPDATE_STORAGE_CLEANUP_CONFIG_URL, payload, { csrf: true, isFormData: false, csrfInFormData: true }); } + + initiateStorageCleanup(payload: any) { + return this.http.post(URLS.PERFORM_STORAGE_CLEANUP_URL, payload, { + csrf: true, + isFormData: false, + csrfInFormData: true + }); + } } Index: /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts =================================================================== --- /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (revision 2709) +++ /branches/amp_4_0/src/webui/webui/htdocs/new/src/gui/src/app/shared/shared-module.ts (working copy) @@ -2,68 +2,13 @@ import {CommonModule} from '@angular/common'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; + +// FontAwesome Imports import {FaIconLibrary, FontAwesomeModule} from '@fortawesome/angular-fontawesome'; -import { - faBars, - faQuestionCircle, - faCog, - faUserCircle, - faSignOutAlt, - faPencilRuler, - faFileAlt, - faCogs, - faShieldAlt, - faSitemap, - faTools, - faCubes, - faClipboardList, - faCompass, - faChevronRight, - faAngleDoubleLeft, - faAngleDoubleRight, - faTv, - faTerminal, - faIdBadge, - faServer, - faTimeline, - faCodeCompare, - faListCheck, - faGears, - faEthernet, - faEye, - faUpRightAndDownLeftFromCenter, - faExpand, - faFileExport, - faClockRotateLeft, - faRepeat, - faCircleInfo, - faArrowUpLong, - faArrowDownLong, -} from '@fortawesome/free-solid-svg-icons'; -import { - faBell, - faRectangleList, - faFloppyDisk, - faCircleDown, - faWindowMaximize, - faChartBar, - faCircleXmark, - faTrashCan, - faCheckCircle, - faCircleLeft, - faSave, - faCalendar, - faEdit, - faXmarkCircle, - faBuilding, - faPlayCircle, - faCircleStop, - faCopy, - faClone, - faClock, - faWindowRestore, - faCircleUp, -} from '@fortawesome/free-regular-svg-icons'; +import * as solidIcons from '@fortawesome/free-solid-svg-icons'; +import * as regularIcons from '@fortawesome/free-regular-svg-icons'; + +// Angular Material Imports import {MatGridListModule} from '@angular/material/grid-list'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatCardModule} from '@angular/material/card'; @@ -81,10 +26,14 @@ import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import {MatTabsModule} from '@angular/material/tabs'; import {MatDatepickerModule} from '@angular/material/datepicker'; -import {MatTimepickerModule} from '@angular/material/timepicker'; import {MatPaginatorModule} from '@angular/material/paginator'; -import {NgxEchartsModule} from 'ngx-echarts'; import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatTimepickerModule} from '@angular/material/timepicker'; + + +// Third-Party Modules +import {NgxEchartsModule} from 'ngx-echarts'; + import { NgxMatDatepickerActions, NgxMatDatepickerApply, @@ -94,143 +43,95 @@ NgxMatDatetimepicker, } from '@ngxmc/datetime-picker'; +const allSolidIcons = Object.values(solidIcons).filter((icon: any) => icon.iconName); +const allRegularIcons = Object.values(regularIcons).filter((icon: any) => icon.iconName); + +const customSolidIcons = [ + solidIcons.faBars, solidIcons.faQuestionCircle, solidIcons.faCog, solidIcons.faUserCircle, + solidIcons.faSignOutAlt, solidIcons.faPencilRuler, solidIcons.faFileAlt, solidIcons.faCogs, + solidIcons.faShieldAlt, solidIcons.faSitemap, solidIcons.faTools, solidIcons.faCubes, + solidIcons.faClipboardList, solidIcons.faCompass, solidIcons.faChevronRight, + solidIcons.faAngleDoubleLeft, solidIcons.faAngleDoubleRight, solidIcons.faTv, + solidIcons.faTerminal, solidIcons.faIdBadge, solidIcons.faServer, solidIcons.faTimeline, + solidIcons.faCodeCompare, solidIcons.faListCheck, solidIcons.faGears, solidIcons.faEthernet, + solidIcons.faEye, solidIcons.faUpRightAndDownLeftFromCenter, solidIcons.faExpand, + solidIcons.faFileExport, solidIcons.faClockRotateLeft, solidIcons.faRepeat, + solidIcons.faCircleInfo, solidIcons.faArrowUpLong, solidIcons.faArrowDownLong, + solidIcons.faHouseSignal, solidIcons.faMagnifyingGlassChart, solidIcons.faFileLines, + solidIcons.faDesktop, solidIcons.faNetworkWired, solidIcons.faCloudArrowUp, + solidIcons.faPeopleLine, solidIcons.faMicrochip, solidIcons.faSignal, solidIcons.faBell, + solidIcons.faLaptopCode, solidIcons.faHardDrive, solidIcons.faSpinner +]; + +const customRegularIcons = [ + regularIcons.faBell, regularIcons.faRectangleList, regularIcons.faFloppyDisk, + regularIcons.faCircleDown, regularIcons.faWindowMaximize, regularIcons.faChartBar, + regularIcons.faCircleXmark, regularIcons.faTrashCan, regularIcons.faCheckCircle, + regularIcons.faCircleLeft, regularIcons.faSave, regularIcons.faCalendar, regularIcons.faEdit, + regularIcons.faXmarkCircle, regularIcons.faBuilding, regularIcons.faPlayCircle, + regularIcons.faCircleStop, regularIcons.faCopy, regularIcons.faClone, regularIcons.faClock, + regularIcons.faWindowRestore, regularIcons.faCircleUp, +]; + +const allCustomIcons = [...customSolidIcons, ...customRegularIcons]; + +const angularModules = [ + CommonModule, + FormsModule, + ReactiveFormsModule, + RouterModule, +]; + +const materialModules = [ + MatGridListModule, + MatFormFieldModule, + MatCardModule, + MatButtonModule, + MatInputModule, + MatNavList, + MatListModule, + MatExpansionModule, + MatIconModule, + MatSnackBarModule, + MatTableModule, + MatTooltipModule, + MatDialogModule, + MatSelectModule, + MatRadioModule, + MatSlideToggleModule, + MatTabsModule, + MatDatepickerModule, + MatTimepickerModule, + MatPaginatorModule, + MatProgressBarModule, +]; + +const thirdPartyModules = [ + FontAwesomeModule, + NgxEchartsModule, + NgxMatDatepickerActions, + NgxMatDatepickerApply, + NgxMatDatepickerCancel, + NgxMatDatepickerClear, + NgxMatDatepickerInput, + NgxMatDatetimepicker, +]; + @NgModule({ declarations: [], imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - RouterModule, - FontAwesomeModule, - MatGridListModule, - MatFormFieldModule, - MatCardModule, - MatButtonModule, - MatInputModule, - MatNavList, - MatIconModule, - MatExpansionModule, - MatListModule, - MatSnackBarModule, - MatTableModule, - MatTooltipModule, - MatDialogModule, - MatSelectModule, - MatRadioModule, - MatSlideToggleModule, - MatTabsModule, - MatDatepickerModule, - MatTimepickerModule, - MatPaginatorModule, - NgxEchartsModule, - MatExpansionModule, - MatProgressBarModule, - NgxMatDatepickerActions, - NgxMatDatepickerActions, - NgxMatDatepickerApply, - NgxMatDatepickerCancel, - NgxMatDatepickerClear, - NgxMatDatepickerInput, - NgxMatDatetimepicker, + ...angularModules, + ...materialModules, + ...thirdPartyModules, ], exports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - RouterModule, - FontAwesomeModule, - MatGridListModule, - MatFormFieldModule, - MatCardModule, - MatButtonModule, - MatInputModule, - MatNavList, - MatIconModule, - MatExpansionModule, - MatListModule, - MatTableModule, - MatTooltipModule, - MatDialogModule, - MatSelectModule, - MatRadioModule, - MatSlideToggleModule, - MatTabsModule, - MatDatepickerModule, - MatTimepickerModule, - MatPaginatorModule, - NgxEchartsModule, - MatExpansionModule, - MatProgressBarModule, - NgxMatDatepickerActions, - NgxMatDatepickerActions, - NgxMatDatepickerApply, - NgxMatDatepickerCancel, - NgxMatDatepickerClear, - NgxMatDatepickerInput, - NgxMatDatetimepicker, + ...angularModules, + ...materialModules, + ...thirdPartyModules, ] }) export class SharedModule { constructor(library: FaIconLibrary) { - library.addIcons( - faBars, - faQuestionCircle, - faBell, - faCog, - faUserCircle, - faSignOutAlt, - faPencilRuler, - faFileAlt, - faCogs, - faShieldAlt, - faSitemap, - faTools, - faCubes, - faClipboardList, - faChartBar, - faCompass, - faChevronRight, - faAngleDoubleLeft, - faAngleDoubleRight, - faRectangleList, - faFloppyDisk, - faCircleDown, - faWindowMaximize, - faChartBar, - faCircleXmark, - faTrashCan, - faCheckCircle, - faCircleLeft, - faSave, - faTv, - faTerminal, - faIdBadge, - faCalendar, - faEdit, - faXmarkCircle, - faServer, - faBuilding, - faPlayCircle, - faCircleStop, - faCopy, - faTimeline, - faCodeCompare, - faClone, - faListCheck, - faClock, - faWindowRestore, - faGears, - faCircleUp, - faEthernet, - faEye, - faUpRightAndDownLeftFromCenter, - faExpand, - faFileExport, - faClockRotateLeft, - faRepeat, - faCircleInfo, - faArrowUpLong, - faArrowDownLong, - ); + library.addIcons(...allCustomIcons); } }