From 620db07ad64624ec0964b06b1aa668cd1e766e1b Mon Sep 17 00:00:00 2001 From: Vladimir Vinogradenko Date: Sun, 15 Oct 2023 13:45:11 -0400 Subject: [PATCH 1/2] Empty commit to create PR on github. You should reset it From 32604c64103f239cad67e3c397e6521fe53ea443 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpov Date: Mon, 16 Oct 2023 15:05:11 +0300 Subject: [PATCH 2/2] NAS-124569: PR update --- .../core/classes/hardware/{es102s.ts => es102g2.ts} | 8 ++++---- .../enclosure-disks/enclosure-disks.component.ts | 10 +++++----- .../es102s_960w.png => es102g2/es102g2_960w.png} | Bin .../es102g2_960w_drivetray.png} | Bin .../es102g2_960w_drivetray_bg.png} | Bin .../es102g2_960w_drivetray_handle.png} | Bin 6 files changed, 9 insertions(+), 9 deletions(-) rename src/app/core/classes/hardware/{es102s.ts => es102g2.ts} (93%) rename src/assets/images/hardware/{es102s/es102s_960w.png => es102g2/es102g2_960w.png} (100%) rename src/assets/images/hardware/{es102s/es102s_960w_drivetray.png => es102g2/es102g2_960w_drivetray.png} (100%) rename src/assets/images/hardware/{es102s/es102s_960w_drivetray_bg.png => es102g2/es102g2_960w_drivetray_bg.png} (100%) rename src/assets/images/hardware/{es102s/es102s_960w_drivetray_handle.png => es102g2/es102g2_960w_drivetray_handle.png} (100%) diff --git a/src/app/core/classes/hardware/es102s.ts b/src/app/core/classes/hardware/es102g2.ts similarity index 93% rename from src/app/core/classes/hardware/es102s.ts rename to src/app/core/classes/hardware/es102g2.ts index 4bcb0a30d7a..3fe409e732d 100644 --- a/src/app/core/classes/hardware/es102s.ts +++ b/src/app/core/classes/hardware/es102g2.ts @@ -9,16 +9,16 @@ interface LayoutColumn { iomIndex: number; } -export class ES102S extends Chassis { +export class ES102G2 extends Chassis { constructor() { super(); this.model = 'es102'; this.front = new ChassisView(); this.front.container = new PIXI.Container(); - this.front.chassisPath = 'assets/images/hardware/es102s/es102s_960w.png'; - this.front.driveTrayBackgroundPath = 'assets/images/hardware/es102s/es102s_960w_drivetray_bg.png'; - this.front.driveTrayHandlePath = 'assets/images/hardware/es102s/es102s_960w_drivetray_handle.png'; + this.front.chassisPath = 'assets/images/hardware/es102g2/es102g2_960w.png'; + this.front.driveTrayBackgroundPath = 'assets/images/hardware/es102g2/es102g2_960w_drivetray_bg.png'; + this.front.driveTrayHandlePath = 'assets/images/hardware/es102g2/es102g2_960w_drivetray_handle.png'; this.front.totalDriveTrays = 102; this.front.rows = 12; diff --git a/src/app/pages/system/viewenclosure/enclosure-disks/enclosure-disks.component.ts b/src/app/pages/system/viewenclosure/enclosure-disks/enclosure-disks.component.ts index efaec21df61..1415d2f4112 100644 --- a/src/app/pages/system/viewenclosure/enclosure-disks/enclosure-disks.component.ts +++ b/src/app/pages/system/viewenclosure/enclosure-disks/enclosure-disks.component.ts @@ -31,7 +31,7 @@ import { E60 } from 'app/core/classes/hardware/e60'; import { ES60 } from 'app/core/classes/hardware/es60'; import { ES60G2 } from 'app/core/classes/hardware/es60g2'; import { ES102 } from 'app/core/classes/hardware/es102'; -import { ES102S } from 'app/core/classes/hardware/es102s'; +import { ES102G2 } from 'app/core/classes/hardware/es102g2'; import { MINIR } from 'app/core/classes/hardware/mini-r'; import { DiskComponent } from './components/disk.component'; import { TabContentComponent } from './components/tab-content/tab-content.component'; @@ -466,8 +466,8 @@ export class EnclosureDisksComponent implements AfterContentInit, OnChanges, OnD this.chassis = new ES102(); this.showCaption = false; break; - case 'ES102S': - this.chassis = new ES102S(); + case 'ES102G2': + this.chassis = new ES102G2(); this.showCaption = false; break; default: @@ -590,8 +590,8 @@ export class EnclosureDisksComponent implements AfterContentInit, OnChanges, OnD case 'ES102': chassis = new ES102(); break; - case 'ES102S': - chassis = new ES102S(); + case 'ES102G2': + chassis = new ES102G2(); break; default: this.controllerEvents.next({ diff --git a/src/assets/images/hardware/es102s/es102s_960w.png b/src/assets/images/hardware/es102g2/es102g2_960w.png similarity index 100% rename from src/assets/images/hardware/es102s/es102s_960w.png rename to src/assets/images/hardware/es102g2/es102g2_960w.png diff --git a/src/assets/images/hardware/es102s/es102s_960w_drivetray.png b/src/assets/images/hardware/es102g2/es102g2_960w_drivetray.png similarity index 100% rename from src/assets/images/hardware/es102s/es102s_960w_drivetray.png rename to src/assets/images/hardware/es102g2/es102g2_960w_drivetray.png diff --git a/src/assets/images/hardware/es102s/es102s_960w_drivetray_bg.png b/src/assets/images/hardware/es102g2/es102g2_960w_drivetray_bg.png similarity index 100% rename from src/assets/images/hardware/es102s/es102s_960w_drivetray_bg.png rename to src/assets/images/hardware/es102g2/es102g2_960w_drivetray_bg.png diff --git a/src/assets/images/hardware/es102s/es102s_960w_drivetray_handle.png b/src/assets/images/hardware/es102g2/es102g2_960w_drivetray_handle.png similarity index 100% rename from src/assets/images/hardware/es102s/es102s_960w_drivetray_handle.png rename to src/assets/images/hardware/es102g2/es102g2_960w_drivetray_handle.png