Skip to content

Issue 184: package updates #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmroot merged 2 commits into from
Mar 6, 2026
Merged

Issue 184: package updates #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1018749
chore: migrate to ng v21
rmroot Mar 6, 2026
15765f1
deps: update dependencies to address vulnerabilities
rmroot Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7,163 changes: 3,370 additions & 3,793 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,29 @@
}
},
"dependencies": {
"@angular/animations": "20.3.15",
"@angular/animations": "21.2.1",
"@angular/cdk": "20.2.14",
"@angular/common": "20.3.15",
"@angular/compiler": "20.3.15",
"@angular/core": "20.3.15",
"@angular/forms": "20.3.15",
"@angular/platform-browser": "20.3.15",
"@angular/platform-browser-dynamic": "20.3.15",
"@angular/router": "20.3.15",
"@angular/service-worker": "20.3.15",
"@fortawesome/angular-fontawesome": "3.0.0",
"@fortawesome/fontawesome-svg-core": "6.6.0",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@angular/common": "21.2.1",
"@angular/compiler": "21.2.1",
"@angular/core": "21.2.1",
"@angular/forms": "21.2.1",
"@angular/platform-browser": "21.2.1",
"@angular/platform-browser-dynamic": "21.2.1",
"@angular/router": "21.2.1",
"@angular/service-worker": "21.2.1",
"@fortawesome/angular-fontawesome": "4.0.0",
"@fortawesome/fontawesome-svg-core": "7.2.0",
"@fortawesome/free-solid-svg-icons": "7.2.0",
"angular-plotly.js": "6.0.0",
"bootstrap": "5.3.8",
"electron-log": "5.4.0",
"electron-updater": "6.6.2",
"exceljs": "4.4.0",
"jszip": "3.10.1",
"libphonenumber-js": "1.11.3",
"ngx-indexed-db": "19.3.2",
"ngx-webstorage": "20.0.0",
"plotly.js": "3.0.0",
"ngx-indexed-db": "22.0.0",
"ngx-webstorage": "21.0.1",
"plotly.js": "3.4.0",
"rxjs": "~7.8.0",
"semver": "7.6.2",
"tslib": "2.7.0",
Expand All @@ -96,13 +96,13 @@
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular/build": "20.3.12",
"@angular/cli": "20.3.12",
"@angular/compiler-cli": "20.3.15",
"@angular/build": "^21.2.1",
"@angular/cli": "21.2.1",
"@angular/compiler-cli": "21.2.1",
"@popperjs/core": "^2.11.8",
"@types/jasmine": "5.1.4",
"electron": "36.2.0",
"electron-builder": "26.0.12",
"electron": "40.8.0",
"electron-builder": "26.8.1",
"jasmine-core": "5.3.0",
"karma": "~6.4.4",
"karma-chrome-launcher": "~3.2.0",
Expand All @@ -113,4 +113,4 @@
"pptxgenjs": "3.12.0",
"typescript": "~5.9.3"
}
}
}
45 changes: 23 additions & 22 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<div class="d-flex flex-column" [ngClass]="{'neb-container': !print}">
<app-navbar class="hide-print"></app-navbar>
<ng-template [ngIf]="dataInitialized" [ngIfElse]="initializingDataBlock">
<div class="d-flex w-100">
<div class="d-flex">
<app-sidebar></app-sidebar>
</div>
<div class="w-100 main-content" (click)="collapseSidebar()">
<router-outlet></router-outlet>
<app-toast-notifications *ngIf="!print"></app-toast-notifications>
</div>
</div>
</ng-template>
<ng-template #initializingDataBlock>
Initializing data...
</ng-template>
<ng-container *ngIf="!print">
<app-loading></app-loading>
<app-setup-wizard-modal></app-setup-wizard-modal>
<app-auto-update-toast></app-auto-update-toast>
<app-welcome-slideshow></app-welcome-slideshow>
<app-update-check></app-update-check>
</ng-container>
<app-navbar class="hide-print"></app-navbar>
@if (dataInitialized) {
<div class="d-flex w-100">
<div class="d-flex">
<app-sidebar></app-sidebar>
</div>
<div class="w-100 main-content" (click)="collapseSidebar()">
<router-outlet></router-outlet>
@if (!print) {
<app-toast-notifications></app-toast-notifications>
}
</div>
</div>
} @else {
Initializing data...
}
@if (!print) {
<app-loading></app-loading>
<app-setup-wizard-modal></app-setup-wizard-modal>
<app-auto-update-toast></app-auto-update-toast>
<app-welcome-slideshow></app-welcome-slideshow>
<app-update-check></app-update-check>
}
</div>
115 changes: 59 additions & 56 deletions src/app/core-components/backup-modal/export-backup-modal/export-backup-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,66 @@
<div [ngClass]="{'window-overlay': showExportModal}"></div>
<div class="popup" [ngClass]="{'open': showExportModal }">
<div class="popup-header">Export Data
<button type="button" class="btn-close float-end" aria-label="Close" (click)="closeExportDataModal()"></button>
<div class="popup-header">Export Data
<button type="button" class="btn-close float-end" aria-label="Close" (click)="closeExportDataModal()"></button>
</div>
<div class="popup-body">
<!-- Export file name -->
<div class="input-group">
<label for="exportFileName" class="col-form-label col-sm-4">File Name</label>
<input type="text" class="form-control col-sm-8" id="exportFileName" [(ngModel)]="exportFileName"
placeholder="Enter file name" />
</div>
<div class="popup-body">
<!-- Export file name -->
<div class="input-group">
<label for="exportFileName" class="col-form-label col-sm-4">File Name</label>
<input type="text" class="form-control col-sm-8" id="exportFileName" [(ngModel)]="exportFileName"
placeholder="Enter file name" />
<div class="fw-light small my-2">The file will be saved as {{exportFileName? exportFileName : 'JUSTIFI_backup'}}.json</div>
<!-- Export Options -->
<div class="mb-3">
<label class="form-label fw-bold">Export Option</label>
<div class="form-check">
<input class="form-check-input" type="radio" id="exportAll" name="exportOption"
[(ngModel)]="exportOption" value="all" (change)="onExportOptionChange()">
<label class="form-check-label" for="exportAll">Export all data</label>
</div>
@if (visitGuid) {
<div class="form-check">
<input class="form-check-input" type="radio" id="exportCurrentVisit" name="exportOption"
[(ngModel)]="exportOption" value="visit" (change)="onExportOptionChange()">
<label class="form-check-label" for="exportCurrentVisit">Export current visit</label>
</div>
<div class="fw-light small my-2">The file will be saved as {{exportFileName? exportFileName : 'JUSTIFI_backup'}}.json</div>
<!-- Export Options -->
<div class="mb-3">
<label class="form-label fw-bold">Export Option</label>
<div class="form-check">
<input class="form-check-input" type="radio" id="exportAll" name="exportOption"
[(ngModel)]="exportOption" value="all" (change)="onExportOptionChange()">
<label class="form-check-label" for="exportAll">Export all data</label>
</div>
<div *ngIf="visitGuid" class="form-check">
<input class="form-check-input" type="radio" id="exportCurrentVisit" name="exportOption"
[(ngModel)]="exportOption" value="visit" (change)="onExportOptionChange()">
<label class="form-check-label" for="exportCurrentVisit">Export current visit</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" id="exportCustom" name="exportOption"
[(ngModel)]="exportOption" value="custom" (change)="onExportOptionChange()">
<label class="form-check-label" for="exportCustom">Custom selection</label>
</div>
</div>
<!-- Custom Export Tree -->
<ng-template [ngIf]="exportTree && exportTree.length > 0" [ngIfElse]="noDataBlock">
<div *ngIf="exportOption === 'custom'">
<div class="d-flex gap-2 flex-wrap ms-2">
<button class="btn btn-outline-primary btn-sm border-0" (click)="selectAll()">
<fa-icon [icon]="faCheckSquare"></fa-icon> Select All</button>
<button class="btn btn-outline-secondary btn-sm border-0" (click)="unselectAll()">
<fa-icon [icon]="faSquare"></fa-icon> Unselect All</button>
<button class="btn btn-outline-primary btn-sm border-0" (click)="expandAll()">
<fa-icon [icon]="faAnglesDown"></fa-icon> Expand All</button>
<button class="btn btn-outline-secondary btn-sm border-0" (click)="collapseAll()">
<fa-icon [icon]="faAnglesUp"></fa-icon> Collapse All</button>
}
<div class="form-check">
<input class="form-check-input" type="radio" id="exportCustom" name="exportOption"
[(ngModel)]="exportOption" value="custom" (change)="onExportOptionChange()">
<label class="form-check-label" for="exportCustom">Custom selection</label>
</div>
</div>
<!-- Custom Export Tree -->
@if (exportTree && exportTree.length > 0) {
@if (exportOption === 'custom') {
<div>
<div class="d-flex gap-2 flex-wrap ms-2">
<button class="btn btn-outline-primary btn-sm border-0" (click)="selectAll()">
<fa-icon [icon]="faCheckSquare"></fa-icon> Select All</button>
<button class="btn btn-outline-secondary btn-sm border-0" (click)="unselectAll()">
<fa-icon [icon]="faSquare"></fa-icon> Unselect All</button>
<button class="btn btn-outline-primary btn-sm border-0" (click)="expandAll()">
<fa-icon [icon]="faAnglesDown"></fa-icon> Expand All</button>
<button class="btn btn-outline-secondary btn-sm border-0" (click)="collapseAll()">
<fa-icon [icon]="faAnglesUp"></fa-icon> Collapse All</button>
</div>
<hr class="mt-1 mb-2">
<app-export-backup-tree [nodes]="exportTree"></app-export-backup-tree>
</div>
<hr class="mt-1 mb-2">
<app-export-backup-tree [nodes]="exportTree"></app-export-backup-tree>
</div>
</ng-template>
<ng-template #noDataBlock>
<div class="alert alert-warning">
}
} @else {
<div class="alert alert-warning">
No data available to export.
</div>
</ng-template>
</div>
<hr class="mt-0 mb-2">
<div class="popup-footer d-flex justify-content-end">
<button class="btn btn-sm btn-secondary me-2" (click)="closeExportDataModal()">Cancel</button>
<button class="btn btn-sm btn-success" (click)="backupData()"
[disabled]="isNoneSelected(exportTree)"><fa-icon [icon]="faDownload"></fa-icon>
</div>
}
</div>
<hr class="mt-0 mb-2">
<div class="popup-footer d-flex justify-content-end">
<button class="btn btn-sm btn-secondary me-2" (click)="closeExportDataModal()">Cancel</button>
<button class="btn btn-sm btn-success" (click)="backupData()"
[disabled]="isNoneSelected(exportTree)"><fa-icon [icon]="faDownload"></fa-icon>
Export Data</button>
</div>
</div>
</div>
</div>
64 changes: 41 additions & 23 deletions ...nts/backup-modal/export-backup-modal/export-backup-tree/export-backup-tree.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,45 @@
<ul class="tree-list" *ngIf="nodes">
<li *ngFor="let node of nodes">
@if (nodes) {
<ul class="tree-list">
@for (node of nodes; track node) {
<li>
<div class="form-check">
<span *ngIf="node.children && node.children.length > 0" (click)="toggleNode(node)" class="tree-toggle">
<fa-icon [icon]="node.expanded ? faAngleDown : faAngleRight"></fa-icon>
@if (node.children && node.children.length > 0) {
<span (click)="toggleNode(node)" class="tree-toggle">
<fa-icon [icon]="node.expanded ? faAngleDown : faAngleRight"></fa-icon>
</span>
<input class="form-check-input" type="checkbox" [id]="'export_node' + node.item.guid"
[checked]="node.checked"
[indeterminate]="node.indeterminate"
[(ngModel)]="node.checked"
(change)="onCheckboxChange(node)" />
<label class="form-check-label" [for]="'export_node_' + node.item.guid">
<ng-container [ngSwitch]="node.type">
<fa-icon *ngSwitchCase="'company'" [icon]="faBuilding" class="me-1"></fa-icon>
<fa-icon *ngSwitchCase="'facility'" [icon]="faIndustry" class="me-1"></fa-icon>
<fa-icon *ngSwitchCase="'visit'" [icon]="faCalendar" class="me-1"></fa-icon>
<fa-icon *ngSwitchCase="'assessment'" [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
<fa-icon *ngSwitchDefault [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
</ng-container>
{{ node.name }}
</label>
}
<input class="form-check-input" type="checkbox" [id]="'export_node' + node.item.guid"
[checked]="node.checked"
[indeterminate]="node.indeterminate"
[(ngModel)]="node.checked"
(change)="onCheckboxChange(node)" />
<label class="form-check-label" [for]="'export_node_' + node.item.guid">
@switch (node.type) {
@case ('company') {
<fa-icon [icon]="faBuilding" class="me-1"></fa-icon>
}
@case ('facility') {
<fa-icon [icon]="faIndustry" class="me-1"></fa-icon>
}
@case ('visit') {
<fa-icon [icon]="faCalendar" class="me-1"></fa-icon>
}
@case ('assessment') {
<fa-icon [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
}
@default {
<fa-icon [icon]="faScrewdriverWrench" class="me-1"></fa-icon>
}
}
{{ node.name }}
</label>
</div>
<div class="subtree-list" *ngIf="node.expanded && node.children && node.children.length > 0">
@if (node.expanded && node.children && node.children.length > 0) {
<div class="subtree-list">
<app-export-backup-tree [nodes]="node.children"></app-export-backup-tree>
</div>
</li>
</ul>
</div>
}
</li>
}
</ul>
}
Loading