From be16f58e5656ac0f176e8ed83cbc5d5d2f747506 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:12:56 -0700
Subject: [PATCH] Remove ngx-filesize
---
src-ui/angular.json | 1 -
src-ui/package-lock.json | 23 -------------------
src-ui/package.json | 1 -
src-ui/src/app/app.module.ts | 2 --
.../system-status-dialog.component.html | 2 +-
.../system-status-dialog.component.spec.ts | 5 ++--
6 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src-ui/angular.json b/src-ui/angular.json
index 4b1848953..a1bb47f1a 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -77,7 +77,6 @@
"scripts": [],
"allowedCommonJsDependencies": [
"ng2-pdf-viewer",
- "filesize",
"file-saver"
],
"vendorChunk": true,
diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json
index 66fd9c836..14a2e7ef3 100644
--- a/src-ui/package-lock.json
+++ b/src-ui/package-lock.json
@@ -30,7 +30,6 @@
"ngx-color": "^9.0.0",
"ngx-cookie-service": "^18.0.0",
"ngx-file-drop": "^16.0.0",
- "ngx-filesize": "^3.0.3",
"ngx-ui-tour-ng-bootstrap": "^14.0.3",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
@@ -10160,15 +10159,6 @@
"node": ">=10"
}
},
- "node_modules/filesize": {
- "version": "9.0.11",
- "resolved": "https://registry.npmjs.org/filesize/-/filesize-9.0.11.tgz",
- "integrity": "sha512-gTAiTtI0STpKa5xesyTA9hA3LX4ga8sm2nWRcffEa1L/5vQwb4mj2MdzMkoHoGv4QzfDshQZuYscQSf8c4TKOA==",
- "peer": true,
- "engines": {
- "node": ">= 0.4.0"
- }
- },
"node_modules/fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -14531,19 +14521,6 @@
"@angular/core": ">=14.0.0"
}
},
- "node_modules/ngx-filesize": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/ngx-filesize/-/ngx-filesize-3.0.3.tgz",
- "integrity": "sha512-qqP2p4WbbF7R+NXC9NqRQdAfWfMAYJ2Ijf4ezRCq7j3tPY6ybSP9AZ3FY1U7/95n1hmOJ2U5oY+oFb7LhHQRBw==",
- "dependencies": {
- "tslib": "^2.3.0"
- },
- "peerDependencies": {
- "@angular/common": ">= 14.2.0 < 18.0.0",
- "@angular/core": ">= 14.2.0 < 18.0.0",
- "filesize": ">= 6.0.0 < 10.0.0"
- }
- },
"node_modules/ngx-ui-tour-ng-bootstrap": {
"version": "14.0.3",
"resolved": "https://registry.npmjs.org/ngx-ui-tour-ng-bootstrap/-/ngx-ui-tour-ng-bootstrap-14.0.3.tgz",
diff --git a/src-ui/package.json b/src-ui/package.json
index bd2ba7013..04a262de7 100644
--- a/src-ui/package.json
+++ b/src-ui/package.json
@@ -32,7 +32,6 @@
"ngx-color": "^9.0.0",
"ngx-cookie-service": "^18.0.0",
"ngx-file-drop": "^16.0.0",
- "ngx-filesize": "^3.0.3",
"ngx-ui-tour-ng-bootstrap": "^14.0.3",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts
index 2ff1cd7e8..3c4edc085 100644
--- a/src-ui/src/app/app.module.ts
+++ b/src-ui/src/app/app.module.ts
@@ -119,7 +119,6 @@ import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
import { ConfirmButtonComponent } from './components/common/confirm-button/confirm-button.component'
import { MonetaryComponent } from './components/common/input/monetary/monetary.component'
import { SystemStatusDialogComponent } from './components/common/system-status-dialog/system-status-dialog.component'
-import { NgxFilesizeModule } from 'ngx-filesize'
import { RotateConfirmDialogComponent } from './components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component'
import { MergeConfirmDialogComponent } from './components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component'
import { SplitConfirmDialogComponent } from './components/common/confirm-dialog/split-confirm-dialog/split-confirm-dialog.component'
@@ -518,7 +517,6 @@ function initializeApp(settings: SettingsService) {
TourNgBootstrapModule,
DragDropModule,
NgxBootstrapIconsModule.pick(icons),
- NgxFilesizeModule,
],
providers: [
{
diff --git a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
index 713ae06ee..2dc934df4 100644
--- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
+++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
@@ -28,7 +28,7 @@
Media Storage
- {{status.storage.available | filesize}} available ({{status.storage.total | filesize}} total)
+ {{status.storage.available | fileSize}} available ({{status.storage.total | fileSize}} total)
diff --git a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts
index 36f3f715f..43e336adb 100644
--- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts
+++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts
@@ -19,8 +19,8 @@ import {
} from 'src/app/data/system-status'
import { provideHttpClientTesting } from '@angular/common/http/testing'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { NgxFilesizeModule } from 'ngx-filesize'
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
+import { FileSizePipe } from 'src/app/pipes/file-size.pipe'
const status: SystemStatus = {
pngx_version: '2.4.3',
@@ -58,12 +58,11 @@ describe('SystemStatusDialogComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [SystemStatusDialogComponent],
+ declarations: [SystemStatusDialogComponent, FileSizePipe],
imports: [
NgbModalModule,
ClipboardModule,
NgxBootstrapIconsModule.pick(allIcons),
- NgxFilesizeModule,
NgbPopoverModule,
NgbProgressbarModule,
],