Fix failing tests for cache

Author: karthikiyengar

src/application/App.tsx

@@ -1,15 +1,15 @@
 import React, { useEffect, useState } from "react";
 import { useReactiveVar, gql, useQuery, makeVar } from "@apollo/client";
 
-import { currentScreen, Screens } from "./components/Layouts/Navigation";
+import { currentScreen } from "./components/Layouts/Navigation";
+import { Screens } from "./components/Layouts/screens";
 import { Queries } from "./components/Queries/Queries";
 import { Mutations } from "./components/Mutations/Mutations";
 import { Explorer } from "./components/Explorer/Explorer";
 import { Cache } from "./components/Cache/Cache";
 import { clients, currentClient } from ".";
 
 export const reloadStatus = makeVar<boolean>(false);
-console.log(Screens)
 
 const screens = {
   [Screens.Explorer]: Explorer,

src/application/__tests__/App.test.tsx

@@ -2,8 +2,9 @@ import React from "react";
 import { waitFor } from "@testing-library/react";
 
 import { renderWithApolloClient } from "../utilities/testing/renderWithApolloClient";
-import { currentScreen, Screens } from "../components/Layouts/Navigation";
+import { currentScreen } from "../components/Layouts/Navigation";
 import { App, reloadStatus } from "../App";
+import { Screens } from "../components/Layouts/screens";
 
 jest.mock("../components/Queries/Queries", () => ({
   Queries: ({ navigationProps }) => (

src/application/components/Cache/__tests__/Cache.test.tsx

@@ -65,9 +65,8 @@ describe("Cache component tests", () => {
 
   describe("With cache data", () => {
     beforeEach(() => {
-      client.resetStore();
-      const clientId = "client-1"
-      currentClient(clientId)
+      const clientId = "client-1";
+      currentClient(clientId);
       writeData({
         id: clientId,
         queries: [],
@@ -76,6 +75,10 @@ describe("Cache component tests", () => {
       });
     });
 
+    afterEach(() => {
+      client.resetStore();
+    });
+
     it("should show list of root cache ids in the sidebar", () => {
       const { getByTestId } = renderWithApolloClient(
         <Cache navigationProps={navigationProps} />
@@ -125,7 +128,7 @@ describe("Cache component tests", () => {
 
     beforeEach(() => {
       const clientId = "client-1";
-      currentClient(clientId)
+      currentClient(clientId);
       writeData({
         id: clientId,
         queries: [],

src/application/components/Layouts/Navigation.tsx

@@ -7,13 +7,7 @@ import { rem } from "polished";
 import { colors } from "@apollo/space-kit/colors";
 import { ApolloLogo } from "@apollo/space-kit/icons/ApolloLogo";
 import { clients, currentClient } from "../..";
-
-export enum Screens {
-  Cache = "cache",
-  Queries = "queries",
-  Mutations = "mutations",
-  Explorer = "explorer",
-}
+import { Screens } from "./screens";
 
 type NavButtonProps = {
   isSelected: boolean;

src/application/components/Layouts/screens.ts

@@ -0,0 +1,6 @@
+export enum Screens {
+  Cache = "cache",
+  Queries = "queries",
+  Mutations = "mutations",
+  Explorer = "explorer",
+}

src/application/components/Queries/RunInExplorerButton.tsx

@@ -7,7 +7,8 @@ import {
   postMessageToEmbed,
   SET_OPERATION,
 } from "../Explorer/postMessageHelpers";
-import { currentScreen, Screens } from "../Layouts/Navigation";
+import { currentScreen } from "../Layouts/Navigation";
+import { Screens } from "../Layouts/screens";
 
 interface RunInExplorerButtonProps {
   operation: string;