From 75bb9d83c742cb0c3ed04a4080dae74eafd6cf6f Mon Sep 17 00:00:00 2001 From: shmck Date: Sat, 29 Feb 2020 16:44:11 -0800 Subject: [PATCH 1/2] avoid using cache --- web-app/src/containers/New/index.tsx | 4 +++- web-app/src/services/apollo/index.ts | 5 +---- web-app/src/services/state/actions/context.ts | 3 +++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web-app/src/containers/New/index.tsx b/web-app/src/containers/New/index.tsx index 40385fd5..980cce3a 100644 --- a/web-app/src/containers/New/index.tsx +++ b/web-app/src/containers/New/index.tsx @@ -17,7 +17,9 @@ interface TutorialsData { } const NewPageContainer = (props: ContainerProps) => { - const { data, loading, error } = useQuery(queryTutorials) + const { data, loading, error } = useQuery(queryTutorials, { + fetchPolicy: 'network-only', + }) if (error) { return diff --git a/web-app/src/services/apollo/index.ts b/web-app/src/services/apollo/index.ts index 1a7c114b..dab3c450 100644 --- a/web-app/src/services/apollo/index.ts +++ b/web-app/src/services/apollo/index.ts @@ -1,13 +1,10 @@ -import ApolloClient, { InMemoryCache } from 'apollo-boost' +import ApolloClient from 'apollo-boost' import { GQL_URI } from '../../environment' import { authorizeHeaders } from './auth' -export const cache = new InMemoryCache() - const client = new ApolloClient({ uri: GQL_URI, request: authorizeHeaders, - cache, }) export default client diff --git a/web-app/src/services/state/actions/context.ts b/web-app/src/services/state/actions/context.ts index 76decc4d..a356722b 100644 --- a/web-app/src/services/state/actions/context.ts +++ b/web-app/src/services/state/actions/context.ts @@ -211,6 +211,9 @@ const contextActions: ActionFunctionMap = { const position: T.Position = selectors.defaultPosition() return position }, + processes() { + return [] + }, }), // @ts-ignore setError: assign({ From 543a51c2d0892ea9fbd81003fea3236b913ec306 Mon Sep 17 00:00:00 2001 From: shmck Date: Sat, 29 Feb 2020 17:12:03 -0800 Subject: [PATCH 2/2] turn off cache on tutorials due to cache error --- web-app/src/containers/New/index.tsx | 2 +- web-app/src/containers/Overview/index.tsx | 2 +- web-app/src/services/apollo/queries/tutorials.ts | 1 + web-app/src/services/state/machine.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web-app/src/containers/New/index.tsx b/web-app/src/containers/New/index.tsx index 980cce3a..f99a6571 100644 --- a/web-app/src/containers/New/index.tsx +++ b/web-app/src/containers/New/index.tsx @@ -18,7 +18,7 @@ interface TutorialsData { const NewPageContainer = (props: ContainerProps) => { const { data, loading, error } = useQuery(queryTutorials, { - fetchPolicy: 'network-only', + fetchPolicy: 'no-cache', }) if (error) { diff --git a/web-app/src/containers/Overview/index.tsx b/web-app/src/containers/Overview/index.tsx index e0fa6d19..11ab58ce 100644 --- a/web-app/src/containers/Overview/index.tsx +++ b/web-app/src/containers/Overview/index.tsx @@ -28,7 +28,7 @@ const Overview = (props: PageProps) => { throw new Error('Tutorial not found in summary page') } const { loading, error, data } = useQuery(queryTutorial, { - fetchPolicy: 'network-only', // to ensure latest + fetchPolicy: 'no-cache', // to ensure latest variables: { tutorialId: tutorial.id, // version: tutorial.version.version, // TODO: re-enable latest diff --git a/web-app/src/services/apollo/queries/tutorials.ts b/web-app/src/services/apollo/queries/tutorials.ts index 5b13e136..5b3fe79c 100644 --- a/web-app/src/services/apollo/queries/tutorials.ts +++ b/web-app/src/services/apollo/queries/tutorials.ts @@ -14,6 +14,7 @@ export default gql` description } version { + id publishedAt publishedBy { id diff --git a/web-app/src/services/state/machine.ts b/web-app/src/services/state/machine.ts index 6f539ac8..915c0d0b 100644 --- a/web-app/src/services/state/machine.ts +++ b/web-app/src/services/state/machine.ts @@ -239,7 +239,7 @@ export const createMachine = (options: any) => { }, Completed: { id: 'completed-tutorial', - onEntry: ['userTutorialComplete'], + onEntry: ['userTutorialComplete'], // unusued on: { SELECT_TUTORIAL: { target: '#select-new-tutorial',