Commit 60b6eb0a authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge remote-tracking branch 'origin/2026Q2_RC'

parents ba8e7798 58da9a87

src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html

+4 −7
Original line number Diff line number Diff line
@@ -116,16 +116,13 @@ 
                  [formGroupName]="i" class="row align-items-center justify-content-center characteristic-value-container" [@fadeIn] >

                    <ng-template [ngIf]="!isCharValueBlockExpanded[i]" [ngIfElse]="blockExpanded">

                        <div formGroupName="value" class="col-lg-6 mt-2">

                            <div class="row">

                            <div class="row align-items-center">

                                <mat-form-field class="col-lg-6">

                                    <mat-label>Alias</mat-label>

                                    <input matInput formControlName="alias">

                                </mat-form-field>

                                <mat-form-field class="col-lg-6">

                                    <mat-label>Value</mat-label>

                                    <input matInput formControlName="value">

                                </mat-form-field>

                

                                <app-characteristic-input ngDefaultControl formControlName="value" class="col-lg-6"

                                    [valueType]="editFormCharacteristic.controls.valueType.value"></app-characteristic-input>

                            </div>

                        </div>
@@ -203,7 +200,7 @@ 
                        <div class="col-md-12 order-2 order-lg-6" formGroupName="value">

                            <mat-form-field>

                                <mat-label>Value</mat-label>

                                <textarea matTextareaAutosize="true" matAutosizeMaxRows="4" matInput formControlName="value"></textarea>

                                <textarea cdkTextareaAutosize #autosize="cdkTextareaAutosize" cdkAutosizeMinRows="1" cdkAutosizeMaxRows="15" matInput formControlName="value"></textarea>

                                <!-- <input matInput formControlName="value"> -->

                            </mat-form-field>

                        </div>

src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ export class EditResourceSpecCharacteristicsComponent implements OnInit { 


  subValueTypeCtrl = new UntypedFormControl('INTEGER')



  valueTypes = ['INTEGER', 'SMALLINT', 'LONGINT', 'FLOAT', 'BINARY', 'BOOLEAN', 'OBJECT', 'ARRAY', 'SET', 'TEXT', 'LONGTEXT', 'ENUM', 'TIMESTAMP']

  valueTypes = ['INTEGER', 'SMALLINT', 'LONGINT', 'FLOAT', 'BINARY', 'BOOLEAN', 'OBJECT', 'ARRAY', 'SET', 'TEXT', 'LONGTEXT', 'ENUM', 'TIMESTAMP', 'SECRET']

  subValueTypes = ['INTEGER', 'SMALLINT', 'LONGINT', 'FLOAT', 'BINARY', 'BOOLEAN', 'TEXT', 'LONGTEXT', 'TIMESTAMP']



  // valueSubType = new FormControl()

src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html

+8 −6
Original line number Diff line number Diff line
@@ -257,8 +257,10 @@ 
                                                          <span

                                                              *ngFor="let val of element.resourceSpecCharacteristicValue; let last = last"

                                                              [class.hidden]="!val || !val.isDefault">

                                                              <span

                                                                  *ngIf="val && val.isDefault">{{val.value.value}}

                                                              <span *ngIf="val && val.isDefault">

                                                                  <app-characteristic-value

                                                                    [value]="val.value.value"

                                                                    [valueType]="element.valueType"></app-characteristic-value>

                                                                  <span

                                                                      *ngIf="val.value.alias"> ({{val.value.alias}})</span>

                                                                  <!-- <span class="comma-separator">, </span> -->

src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html

+5 −3
Original line number Diff line number Diff line
@@ -223,7 +223,9 @@ 


                                <ng-container *ngSwitchDefault>

                                  <td class="align-middle">

                                    {{ specCharacteristic.value.value }}

                                    <app-characteristic-value

                                      [value]="specCharacteristic.value.value"

                                      [valueType]="specCharacteristic.valueType"></app-characteristic-value>

                                    <span *ngIf="specCharacteristic.value.alias"> ({{

                                      specCharacteristic.value.alias

                                      }})</span>

src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html

+4 −7
Original line number Diff line number Diff line
@@ -118,16 +118,13 @@ 
                    

                        <ng-template [ngIf]="!isCharValueBlockExpanded[i]" [ngIfElse]="blockExpanded">

                            <div formGroupName="value" class="col-lg-6 mt-2">

                                <div class="row">

                                <div class="row align-items-center">

                                    <mat-form-field class="col-lg-6">

                                        <mat-label>Alias</mat-label>

                                        <input matInput formControlName="alias">

                                    </mat-form-field>

                                    <mat-form-field class="col-lg-6">

                                        <mat-label>Value</mat-label>

                                        <input matInput formControlName="value">

                                    </mat-form-field>

                    

                                    <app-characteristic-input ngDefaultControl formControlName="value" class="col-lg-6"

                                        [valueType]="editFormCharacteristic.controls.valueType.value"></app-characteristic-input>

                                </div>

                            </div>
@@ -205,7 +202,7 @@ 
                            <div class="col-md-12 order-2 order-lg-6" formGroupName="value">

                                <mat-form-field>

                                    <mat-label>Value</mat-label>

                                    <textarea matTextareaAutosize="true" matAutosizeMaxRows="4" matInput formControlName="value"></textarea>

                                    <textarea cdkTextareaAutosize #autosize="cdkTextareaAutosize" cdkAutosizeMinRows="1" cdkAutosizeMaxRows="15" matInput formControlName="value"></textarea>

                                    <!-- <input matInput formControlName="value"> -->

                                </mat-form-field>

                            </div>