Fix issues in the add collection pane (#501)
This commit is contained in:
parent
2e7c7440d3
commit
9d63a346e4
|
@ -129,7 +129,6 @@ export interface ThroughputInputParams {
|
||||||
throughputModeRadioName: string;
|
throughputModeRadioName: string;
|
||||||
maxAutoPilotThroughputSet: ViewModels.Editable<number>;
|
maxAutoPilotThroughputSet: ViewModels.Editable<number>;
|
||||||
autoPilotUsageCost: ko.Computed<string>;
|
autoPilotUsageCost: ko.Computed<string>;
|
||||||
showAutoPilot?: ko.Observable<boolean>;
|
|
||||||
overrideWithAutoPilotSettings: ko.Observable<boolean>;
|
overrideWithAutoPilotSettings: ko.Observable<boolean>;
|
||||||
overrideWithProvisionedThroughputSettings: ko.Observable<boolean>;
|
overrideWithProvisionedThroughputSettings: ko.Observable<boolean>;
|
||||||
freeTierExceedThroughputTooltip?: ko.Observable<string>;
|
freeTierExceedThroughputTooltip?: ko.Observable<string>;
|
||||||
|
@ -158,7 +157,6 @@ export class ThroughputInputViewModel extends WaitsForTemplateViewModel {
|
||||||
public infoBubbleText: string | ko.Observable<string>;
|
public infoBubbleText: string | ko.Observable<string>;
|
||||||
public label: ko.Observable<string>;
|
public label: ko.Observable<string>;
|
||||||
public isFixed: boolean;
|
public isFixed: boolean;
|
||||||
public showAutoPilot: ko.Observable<boolean>;
|
|
||||||
public isAutoPilotSelected: ko.Observable<boolean>;
|
public isAutoPilotSelected: ko.Observable<boolean>;
|
||||||
public throughputAutoPilotRadioId: string;
|
public throughputAutoPilotRadioId: string;
|
||||||
public throughputProvisionedRadioId: string;
|
public throughputProvisionedRadioId: string;
|
||||||
|
@ -202,7 +200,6 @@ export class ThroughputInputViewModel extends WaitsForTemplateViewModel {
|
||||||
this.isFixed = !!options.isFixed;
|
this.isFixed = !!options.isFixed;
|
||||||
this.infoBubbleText = options.infoBubbleText || ko.observable<string>();
|
this.infoBubbleText = options.infoBubbleText || ko.observable<string>();
|
||||||
this.label = options.label || ko.observable<string>();
|
this.label = options.label || ko.observable<string>();
|
||||||
this.showAutoPilot = options.showAutoPilot !== undefined ? options.showAutoPilot : ko.observable<boolean>(true);
|
|
||||||
this.isAutoPilotSelected = options.isAutoPilotSelected || ko.observable<boolean>(false);
|
this.isAutoPilotSelected = options.isAutoPilotSelected || ko.observable<boolean>(false);
|
||||||
this.isAutoPilotSelected.subscribe((value) => {
|
this.isAutoPilotSelected.subscribe((value) => {
|
||||||
TelemetryProcessor.trace(Action.ToggleAutoscaleSetting, ActionModifiers.Mark, {
|
TelemetryProcessor.trace(Action.ToggleAutoscaleSetting, ActionModifiers.Mark, {
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- ko if: !isFixed -->
|
<!-- ko if: !isFixed -->
|
||||||
<div data-bind="visible: showAutoPilot" class="throughputModeContainer">
|
<div class="throughputModeContainer">
|
||||||
<input
|
<input
|
||||||
class="throughputModeRadio"
|
class="throughputModeRadio"
|
||||||
aria-label="Autopilot mode"
|
aria-label="Autopilot mode"
|
||||||
|
|
|
@ -214,7 +214,6 @@
|
||||||
maxAutoPilotThroughputSet: sharedAutoPilotThroughput,
|
maxAutoPilotThroughputSet: sharedAutoPilotThroughput,
|
||||||
autoPilotUsageCost: autoPilotUsageCost,
|
autoPilotUsageCost: autoPilotUsageCost,
|
||||||
canExceedMaximumValue: canExceedMaximumValue,
|
canExceedMaximumValue: canExceedMaximumValue,
|
||||||
showAutoPilot: !isFreeTierAccount(),
|
|
||||||
freeTierExceedThroughputTooltip: freeTierExceedThroughputTooltip
|
freeTierExceedThroughputTooltip: freeTierExceedThroughputTooltip
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
@ -435,7 +434,6 @@
|
||||||
maxAutoPilotThroughputSet: autoPilotThroughput,
|
maxAutoPilotThroughputSet: autoPilotThroughput,
|
||||||
autoPilotUsageCost: autoPilotUsageCost,
|
autoPilotUsageCost: autoPilotUsageCost,
|
||||||
canExceedMaximumValue: canExceedMaximumValue,
|
canExceedMaximumValue: canExceedMaximumValue,
|
||||||
showAutoPilot: !isFixedStorageSelected(),
|
|
||||||
freeTierExceedThroughputTooltip: freeTierExceedThroughputTooltip
|
freeTierExceedThroughputTooltip: freeTierExceedThroughputTooltip
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
|
|
@ -749,12 +749,16 @@ export default class AddCollectionPane extends ContextualPaneBase {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isAutoPilotSelected()) {
|
// return undefined if autopilot is selected for the new database/collection
|
||||||
return undefined;
|
if (this.databaseCreateNew()) {
|
||||||
}
|
// database is shared and autopilot is sleected for the database
|
||||||
|
if (this.databaseCreateNewShared() && this.isSharedAutoPilotSelected()) {
|
||||||
if (this.databaseCreateNewShared() && this.isSharedAutoPilotSelected()) {
|
return undefined;
|
||||||
return undefined;
|
}
|
||||||
|
// database is not shared and autopilot is selected for the collection
|
||||||
|
if (!this.databaseCreateNewShared() && this.isAutoPilotSelected()) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return this._getThroughput();
|
return this._getThroughput();
|
||||||
|
|
|
@ -149,7 +149,6 @@
|
||||||
maxAutoPilotThroughputSet: maxAutoPilotThroughputSet,
|
maxAutoPilotThroughputSet: maxAutoPilotThroughputSet,
|
||||||
autoPilotUsageCost: autoPilotUsageCost,
|
autoPilotUsageCost: autoPilotUsageCost,
|
||||||
canExceedMaximumValue: canExceedMaximumValue,
|
canExceedMaximumValue: canExceedMaximumValue,
|
||||||
showAutoPilot: !isFreeTierAccount(),
|
|
||||||
freeTierExceedThroughputTooltip: freeTierExceedThroughputTooltip
|
freeTierExceedThroughputTooltip: freeTierExceedThroughputTooltip
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
|
|
@ -166,7 +166,6 @@
|
||||||
autoPilotUsageCost: autoPilotUsageCost,
|
autoPilotUsageCost: autoPilotUsageCost,
|
||||||
canExceedMaximumValue: canExceedMaximumValue,
|
canExceedMaximumValue: canExceedMaximumValue,
|
||||||
costsVisible: costsVisible,
|
costsVisible: costsVisible,
|
||||||
showAutoPilot: !isFreeTierAccount()
|
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
</throughput-input-autopilot-v3>
|
</throughput-input-autopilot-v3>
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
throughputAutoPilotRadioId: throughputAutoPilotRadioId,
|
throughputAutoPilotRadioId: throughputAutoPilotRadioId,
|
||||||
throughputProvisionedRadioId: throughputProvisionedRadioId,
|
throughputProvisionedRadioId: throughputProvisionedRadioId,
|
||||||
throughputModeRadioName: throughputModeRadioName,
|
throughputModeRadioName: throughputModeRadioName,
|
||||||
showAutoPilot: userCanChangeProvisioningTypes,
|
|
||||||
isAutoPilotSelected: isAutoPilotSelected,
|
isAutoPilotSelected: isAutoPilotSelected,
|
||||||
maxAutoPilotThroughputSet: autoPilotThroughput,
|
maxAutoPilotThroughputSet: autoPilotThroughput,
|
||||||
autoPilotUsageCost: autoPilotUsageCost,
|
autoPilotUsageCost: autoPilotUsageCost,
|
||||||
|
|
|
@ -73,7 +73,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
|
||||||
public shouldShowStatusBar: ko.Computed<boolean>;
|
public shouldShowStatusBar: ko.Computed<boolean>;
|
||||||
public throughputTitle: ko.PureComputed<string>;
|
public throughputTitle: ko.PureComputed<string>;
|
||||||
public throughputAriaLabel: ko.PureComputed<string>;
|
public throughputAriaLabel: ko.PureComputed<string>;
|
||||||
public userCanChangeProvisioningTypes: ko.Observable<boolean>;
|
|
||||||
public autoPilotUsageCost: ko.PureComputed<string>;
|
public autoPilotUsageCost: ko.PureComputed<string>;
|
||||||
public warningMessage: ko.Computed<string>;
|
public warningMessage: ko.Computed<string>;
|
||||||
public canExceedMaximumValue: ko.PureComputed<boolean>;
|
public canExceedMaximumValue: ko.PureComputed<boolean>;
|
||||||
|
@ -106,7 +105,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
|
||||||
this._wasAutopilotOriginallySet = ko.observable(false);
|
this._wasAutopilotOriginallySet = ko.observable(false);
|
||||||
this.isAutoPilotSelected = editable.observable(false);
|
this.isAutoPilotSelected = editable.observable(false);
|
||||||
this.autoPilotThroughput = editable.observable<number>();
|
this.autoPilotThroughput = editable.observable<number>();
|
||||||
this.userCanChangeProvisioningTypes = ko.observable(true);
|
|
||||||
|
|
||||||
const autoscaleMaxThroughput = this.database?.offer()?.autoscaleMaxThroughput;
|
const autoscaleMaxThroughput = this.database?.offer()?.autoscaleMaxThroughput;
|
||||||
if (autoscaleMaxThroughput) {
|
if (autoscaleMaxThroughput) {
|
||||||
|
@ -118,9 +116,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
|
||||||
}
|
}
|
||||||
|
|
||||||
this._hasProvisioningTypeChanged = ko.pureComputed<boolean>(() => {
|
this._hasProvisioningTypeChanged = ko.pureComputed<boolean>(() => {
|
||||||
if (!this.userCanChangeProvisioningTypes()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (this._wasAutopilotOriginallySet() !== this.isAutoPilotSelected()) {
|
if (this._wasAutopilotOriginallySet() !== this.isAutoPilotSelected()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -448,7 +443,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
|
||||||
this.isAutoPilotSelected.setBaseline(AutoPilotUtils.isValidAutoPilotThroughput(offer.autoscaleMaxThroughput));
|
this.isAutoPilotSelected.setBaseline(AutoPilotUtils.isValidAutoPilotThroughput(offer.autoscaleMaxThroughput));
|
||||||
this.autoPilotThroughput.setBaseline(offer.autoscaleMaxThroughput);
|
this.autoPilotThroughput.setBaseline(offer.autoscaleMaxThroughput);
|
||||||
this.throughput.setBaseline(offer.manualThroughput);
|
this.throughput.setBaseline(offer.manualThroughput);
|
||||||
this.userCanChangeProvisioningTypes(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected getTabsButtons(): CommandButtonComponentProps[] {
|
protected getTabsButtons(): CommandButtonComponentProps[] {
|
||||||
|
|
Loading…
Reference in New Issue