random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2024-11-25 23:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refresh Caches only in Portal (#129)

Browse Source
This commit is contained in:
Steve Faulkner 2020-08-05 15:54:17 -05:00 committed by GitHub
parent f132a8546c
commit 78e70cc7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jest.config.js
View File

@ -39,9 +39,9 @@ module.exports = {
// An object that configures minimum threshold enforcement for coverage results // An object that configures minimum threshold enforcement for coverage results
coverageThreshold: { coverageThreshold: {
global: { global: {
branches: 19.5, branches: 20,
functions: 24, functions: 24,
lines: 29.5, lines: 30,
statements: 29.0 statements: 29.0
} }
}, },

6
src/Common/DataAccessUtilityBase.ts
View File

@ -20,7 +20,7 @@ import { ContainerRequest } from "@azure/cosmos/dist-esm/client/Container/Contai
import { CosmosClient } from "./CosmosClient"; import { CosmosClient } from "./CosmosClient";
import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest"; import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility"; import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
import { sendCachedDataMessage, canSendMessage } from "./MessageHandler"; import { sendCachedDataMessage } from "./MessageHandler";
import { MessageTypes } from "../Contracts/ExplorerContracts"; import { MessageTypes } from "../Contracts/ExplorerContracts";
import { OfferUtils } from "../Utils/OfferUtils"; import { OfferUtils } from "../Utils/OfferUtils";
import { RequestOptions } from "@azure/cosmos/dist-esm"; import { RequestOptions } from "@azure/cosmos/dist-esm";
@ -612,7 +612,7 @@ export function createDatabase(
} }
export function refreshCachedOffers(): Q.Promise<void> { export function refreshCachedOffers(): Q.Promise<void> {
if (canSendMessage()) { if (config.platform === Platform.Portal) {
return sendCachedDataMessage(MessageTypes.RefreshOffers, []); return sendCachedDataMessage(MessageTypes.RefreshOffers, []);
} else { } else {
return Q(); return Q();
@ -620,7 +620,7 @@ export function refreshCachedOffers(): Q.Promise<void> {
} }
export function refreshCachedResources(options?: any): Q.Promise<void> { export function refreshCachedResources(options?: any): Q.Promise<void> {
if (canSendMessage()) { if (config.platform === Platform.Portal) {
return sendCachedDataMessage(MessageTypes.RefreshResources, []); return sendCachedDataMessage(MessageTypes.RefreshResources, []);
} else { } else {
return Q(); return Q();

3
src/Common/MessageHandler.ts
View File

@ -2,7 +2,6 @@ import { MessageTypes } from "../Contracts/ExplorerContracts";
import Q from "q"; import Q from "q";
import * as _ from "underscore"; import * as _ from "underscore";
import * as Constants from "./Constants"; import * as Constants from "./Constants";
import { config, Platform } from "../Config";
export interface CachedDataPromise<T> { export interface CachedDataPromise<T> {
deferred: Q.Deferred<T>; deferred: Q.Deferred<T>;
@ -60,7 +59,7 @@ export function sendMessage(data: any): void {
} }
export function canSendMessage(): boolean { export function canSendMessage(): boolean {
return config.platform === Platform.Portal && window.parent !== window; return window.parent !== window;
} }
// TODO: This is exported just for testing. It should not be. // TODO: This is exported just for testing. It should not be.

3
src/Common/dataAccess/deleteCollection.test.ts
View File

@ -1,11 +1,14 @@
jest.mock("../../Utils/arm/request"); jest.mock("../../Utils/arm/request");
jest.mock("../MessageHandler");
import { deleteCollection } from "./deleteCollection"; import { deleteCollection } from "./deleteCollection";
import { armRequest } from "../../Utils/arm/request"; import { armRequest } from "../../Utils/arm/request";
import { AuthType } from "../../AuthType"; import { AuthType } from "../../AuthType";
import { sendCachedDataMessage } from "../MessageHandler";
describe("deleteCollection", () => { describe("deleteCollection", () => {
it("should call ARM if logged in with AAD", async () => { it("should call ARM if logged in with AAD", async () => {
window.authType = AuthType.AAD; window.authType = AuthType.AAD;
(sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
await deleteCollection("database", "collection"); await deleteCollection("database", "collection");
expect(armRequest).toHaveBeenCalled(); expect(armRequest).toHaveBeenCalled();
}); });

3
src/Common/dataAccess/deleteDatabase.test.ts
View File

@ -1,11 +1,14 @@
jest.mock("../../Utils/arm/request"); jest.mock("../../Utils/arm/request");
jest.mock("../MessageHandler");
import { deleteDatabase } from "./deleteDatabase"; import { deleteDatabase } from "./deleteDatabase";
import { armRequest } from "../../Utils/arm/request"; import { armRequest } from "../../Utils/arm/request";
import { AuthType } from "../../AuthType"; import { AuthType } from "../../AuthType";
import { sendCachedDataMessage } from "../MessageHandler";
describe("deleteDatabase", () => { describe("deleteDatabase", () => {
it("should call ARM if logged in with AAD", async () => { it("should call ARM if logged in with AAD", async () => {
window.authType = AuthType.AAD; window.authType = AuthType.AAD;
(sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
await deleteDatabase("database"); await deleteDatabase("database");
expect(armRequest).toHaveBeenCalled(); expect(armRequest).toHaveBeenCalled();
}); });