From 31606299c45f00cacff5d2cef9e3459f33d611dd Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Fri, 5 Sep 2025 08:26:48 +0200 Subject: [PATCH] refs #2759. Improved partition. initialice with 'empty' --- .../partition-assistant.component.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts index 5ebafb9..729da20 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.ts @@ -251,7 +251,7 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes partitionNumber: partition.partitionNumber, size: this.convertBytesToGB(partition.partitionNumber === 1 && this.partitionCode === 'GPT' ? 512 : partition.size), memoryUsage: partition.memoryUsage, - partitionCode: partition.partitionNumber === 1 && this.partitionCode === 'GPT' ? 'EFI' : partition.partitionCode, + partitionCode: partition.partitionNumber === 1 && this.partitionCode === 'GPT' ? 'EFI' : this.validatePartitionCode(partition.partitionCode), filesystem: partition.partitionNumber === 1 && this.partitionCode === 'GPT' ? 'FAT32' : partition.filesystem, sizeBytes: partition.partitionNumber === 1 && this.partitionCode === 'GPT' ? 512 : partition.size, format: false, @@ -360,7 +360,7 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes disk.partitions.push({ partitionNumber: newPartitionNumber, size: 0, - partitionCode: 'LINUX', + partitionCode: 'EMPTY', filesystem: 'EXT4', memoryUsage: 0, sizeBytes: 0, @@ -822,4 +822,14 @@ export class PartitionAssistantComponent implements OnInit, AfterViewInit, OnDes private getColorForPartition(partitionNumber: number): string { return this.partitionColors[(partitionNumber - 1) % this.partitionColors.length]; } + + + private validatePartitionCode(partitionCode: string | undefined | null): string { + if (!partitionCode || partitionCode.trim() === '') { + return 'EMPTY'; + } + + const isValidCode = this.partitionTypes.some(type => type.name === partitionCode); + return isValidCode ? partitionCode : 'EMPTY'; + } }