random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-10-13 15:28:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move serverId

Browse Source
This commit is contained in:
Steve Faulkner 2020-12-15 23:26:30 -06:00
parent 661fb66f7b
commit 0f8c36bbf0
8 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ConfigContext.ts
View File

@ -26,6 +26,7 @@ interface ConfigContext {
GITHUB_CLIENT_SECRET?: string; // No need to inject secret for prod. Juno already knows it.
hostedExplorerURL: string;
armAPIVersion?: string;
serverId?: string;
}
// Default configuration

2
src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx
View File

@ -165,7 +165,7 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
private getThroughputInputComponent = (): JSX.Element => (
<ThroughputInputAutoPilotV3Component
databaseAccount={this.props.container.databaseAccount()}
serverId={this.props.container.serverId()}
serverId={configContext.serverId}
throughput={this.props.throughput}
throughputBaseline={this.props.throughputBaseline}
onThroughputChange={this.props.onThroughputChange}

12
src/Explorer/Explorer.ts
View File

@ -133,7 +133,6 @@ export default class Explorer {
public isAccountReady: ko.Observable<boolean>;
public canSaveQueries: ko.Computed<boolean>;
public features: ko.Observable<any>;
public serverId: ko.Observable<string>;
public isTryCosmosDBSubscription: ko.Observable<boolean>;
public queriesClient: QueriesClient;
public tableDataClient: TableDataClient;
@ -365,7 +364,6 @@ export default class Explorer {
this.memoryUsageInfo = ko.observable<DataModels.MemoryUsageInfo>();
this.features = ko.observable();
this.serverId = ko.observable<string>();
this.queriesClient = new QueriesClient(this);
this.isTryCosmosDBSubscription = ko.observable<boolean>(false);
@ -1854,7 +1852,6 @@ export default class Explorer {
this.collectionCreationDefaults = inputs.defaultCollectionThroughput;
}
this.features(inputs.features);
this.serverId(inputs.serverId);
this.databaseAccount(databaseAccount);
this.subscriptionType(inputs.subscriptionType);
this.hasWriteAccess(inputs.hasWriteAccess);
@ -1866,7 +1863,8 @@ export default class Explorer {
updateConfigContext({
BACKEND_ENDPOINT: inputs.extensionEndpoint || "",
ARM_ENDPOINT: normalizeArmEndpoint(inputs.csmEndpoint || configContext.ARM_ENDPOINT)
ARM_ENDPOINT: normalizeArmEndpoint(inputs.csmEndpoint || configContext.ARM_ENDPOINT),
serverId: inputs.serverId
});
updateUserContext({
@ -1953,9 +1951,9 @@ export default class Explorer {
public isRunningOnNationalCloud(): boolean {
return (
this.serverId() === Constants.ServerIds.blackforest ||
this.serverId() === Constants.ServerIds.fairfax ||
this.serverId() === Constants.ServerIds.mooncake
userContext === Constants.ServerIds.blackforest ||
userContext === Constants.ServerIds.fairfax ||
userContext === Constants.ServerIds.mooncake
);
}

8
src/Explorer/Panes/AddCollectionPane.ts
View File

@ -186,7 +186,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
return "";
}
const serverId: string = this.container.serverId();
const serverId = configContext.serverId;
const regions =
(account &&
account.properties &&
@ -200,7 +200,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
if (!this.isSharedAutoPilotSelected()) {
throughputSpendAckText = PricingUtils.getEstimatedSpendAcknowledgeString(
offerThroughput,
serverId,
configContext.serverId,
regions,
multimaster,
this.isSharedAutoPilotSelected()
@ -240,7 +240,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
return "";
}
const serverId: string = this.container.serverId();
const serverId: string = configContext.serverId;
const regions =
(account &&
account.properties &&
@ -482,7 +482,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
});
this.upsellMessage = ko.pureComputed<string>(() => {
return PricingUtils.getUpsellMessage(this.container.serverId(), this.isFreeTierAccount());
return PricingUtils.getUpsellMessage(configContext.serverId, this.isFreeTierAccount());
});
this.upsellMessageAriaLabel = ko.pureComputed<string>(() => {

4
src/Explorer/Panes/AddDatabasePane.ts
View File

@ -122,7 +122,7 @@ export default class AddDatabasePane extends ContextualPaneBase {
return "";
}
const serverId = this.container.serverId();
const serverId = configContext.serverId;
const regions =
(account &&
account.properties &&
@ -220,7 +220,7 @@ export default class AddDatabasePane extends ContextualPaneBase {
});
this.upsellMessage = ko.pureComputed<string>(() => {
return PricingUtils.getUpsellMessage(this.container.serverId(), this.isFreeTierAccount());
return PricingUtils.getUpsellMessage(configContext.serverId, this.isFreeTierAccount());
});
this.upsellMessageAriaLabel = ko.pureComputed<string>(() => {

4
src/Explorer/Panes/CassandraAddCollectionPane.ts
View File

@ -127,7 +127,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
return "";
}
const serverId = this.container.serverId();
const serverId = configContext.serverId;
const regions =
(account &&
account.properties &&
@ -172,7 +172,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
return "";
}
const serverId = this.container.serverId();
const serverId = configContext.serverId;
const regions =
(account &&
account.properties &&

2
src/Explorer/Tabs/DatabaseSettingsTab.ts
View File

@ -139,7 +139,7 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
return "";
}
const serverId = this.container.serverId();
const serverId = configContext.serverId;
const regions =
(account &&
account.properties &&

2
src/Explorer/Tabs/MongoShellTab.ts
View File

@ -33,7 +33,7 @@ export default class MongoShellTab extends TabsBase {
this._runtimeEndpoint = configContext.platform === Platform.Hosted ? configContext.BACKEND_ENDPOINT : "";
const extensionEndpoint: string = configContext.BACKEND_ENDPOINT || this._runtimeEndpoint || "";
let baseUrl = "/content/mongoshell/dist/";
if (this._container.serverId() === "localhost") {
if (configContext.serverId === "localhost") {
baseUrl = "/content/mongoshell/";
}