Skip to content

Commit 117f85b

Browse files
authored
Merge pull request ceph#56694 from afreen23/wip-features-to-advanced
mgr/dashboard: Move features to advanced section and expand by default rbd config section Reviewed-by: Ankush Behl <[email protected]> Reviewed-by: Nizamudeen A <[email protected]>
2 parents 626cee2 + 921a524 commit 117f85b

File tree

3 files changed

+24
-27
lines changed

3 files changed

+24
-27
lines changed

src/pybind/mgr/dashboard/frontend/cypress/e2e/pools/pools.po.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export class PoolPageHelper extends PageHelper {
4444
edit_pool_configuration(name: string, bpsLimit: string) {
4545
this.navigateEdit(name);
4646

47-
cy.get('.collapsible').click();
4847
cy.get('cd-rbd-configuration-form')
4948
.get('input[name=rbd_qos_bps_limit]')
5049
.clear()
@@ -53,7 +52,6 @@ export class PoolPageHelper extends PageHelper {
5352

5453
this.navigateEdit(name);
5554

56-
cy.get('.collapsible').click();
5755
cy.get('cd-rbd-configuration-form')
5856
.get('input[name=rbd_qos_bps_limit]')
5957
.should('have.value', bpsLimit);

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class RbdConfigurationFormComponent implements OnInit {
6969

7070
this.rbdConfigurationService
7171
.getWritableSections()
72-
.forEach((section) => (this.sectionVisibility[section.class] = false));
72+
.forEach((section) => (this.sectionVisibility[section.class] = true));
7373
}
7474

7575
getDirtyValues(includeLocalValues = false, localFieldType?: RbdConfigurationSourceField) {

src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -219,29 +219,6 @@
219219
</div>
220220
</div>
221221

222-
<!-- Features -->
223-
<div class="form-group row"
224-
formGroupName="features">
225-
<label i18n
226-
class="cd-col-form-label"
227-
for="features">Features</label>
228-
<div class="cd-col-form-input">
229-
<div class="custom-control custom-checkbox"
230-
*ngFor="let feature of featuresList">
231-
<input type="checkbox"
232-
class="custom-control-input"
233-
id="{{ feature.key }}"
234-
name="{{ feature.key }}"
235-
formControlName="{{ feature.key }}">
236-
<label class="custom-control-label"
237-
for="{{ feature.key }}">{{ feature.desc }}</label>
238-
<cd-helper *ngIf="feature.helperHtml"
239-
html="{{ feature.helperHtml }}">
240-
</cd-helper>
241-
</div>
242-
</div>
243-
</div>
244-
245222
<!-- Mirroring -->
246223
<div class="form-group row">
247224
<div class="cd-col-form-offset">
@@ -300,9 +277,31 @@
300277

301278
<!-- Advanced -->
302279
<cd-form-advanced-fieldset>
280+
<!-- Features -->
281+
<div class="form-group row"
282+
formGroupName="features">
283+
<label i18n
284+
class="cd-col-form-label"
285+
for="features">Features</label>
286+
<div class="cd-col-form-input">
287+
<div class="custom-control custom-checkbox"
288+
*ngFor="let feature of featuresList">
289+
<input type="checkbox"
290+
class="custom-control-input"
291+
id="{{ feature.key }}"
292+
name="{{ feature.key }}"
293+
formControlName="{{ feature.key }}">
294+
<label class="custom-control-label"
295+
for="{{ feature.key }}">{{ feature.desc }}</label>
296+
<cd-helper *ngIf="feature.helperHtml"
297+
html="{{ feature.helperHtml }}">
298+
</cd-helper>
299+
</div>
300+
</div>
301+
</div>
302+
303303
<h4 class="cd-header"
304304
i18n>Striping</h4>
305-
306305
<!-- Object Size -->
307306
<div class="form-group row">
308307
<label i18n

0 commit comments

Comments
 (0)