@trackunit/react-core-contexts 0.4.158 → 0.4.163

package/index.cjs

@@ -62,16 +62,8 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-/**
- * This is a provider for the ManagerApolloContext.
- * It is used to provide the apollo client to the manager app.
- *
- * @param {IProps} props The props.
- * @returns {JSX.Element} The provider.
- */
-const ManagerApolloProvider = ({ children, isIrisApp }) => {
-    const { graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, tracingHeaders } = reactCoreHooks.useEnvironment();
-    const { token } = reactCoreHooks.useToken();
+const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, isIrisApp, tracingHeaders, firstToken, }) => {
+    let token = firstToken;
     const managerGraphQLLink = apolloUploadClient.createUploadLink({
         uri: request => graphqlManagerUrl + "/" + request.operationName,
     });
@@ -84,12 +76,12 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
     const reportGraphQLLink = apolloUploadClient.createUploadLink({
         uri: request => graphqlReportUrl + "/" + request.operationName,
     });
-    const authLink = React.useMemo(() => context.setContext((_, { headers }) => __awaiter(void 0, void 0, void 0, function* () {
+    const authLink = context.setContext((_, { headers }) => __awaiter(void 0, void 0, void 0, function* () {
         return {
             headers: Object.assign(Object.assign(Object.assign({}, headers), tracingHeaders), { Authorization: token ? `Bearer ${token}` : null }),
         };
-    })), [token, tracingHeaders]);
-    const errorLink = React.useMemo(() => error.onError((errorResponse) => {
+    }));
+    const errorLink = error.onError((errorResponse) => {
         var _a, _b;
         const traceIds = []; // Used to hold id's for use in Sentry
         if (errorResponse.graphQLErrors) {
@@ -141,8 +133,8 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
             // eslint-disable-next-line no-console
             console.error(errorResponse.networkError);
         }
-    }), []);
-    const defaultOptions = React.useMemo(() => ({
+    });
+    const defaultOptions = {
         watchQuery: {
             fetchPolicy: "no-cache",
             errorPolicy: "all",
@@ -150,9 +142,9 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
         query: {
             fetchPolicy: "no-cache",
         },
-    }), []);
-    const client$1 = React.useMemo(() => {
-        return new client.ApolloClient({
+    };
+    return {
+        client: new client.ApolloClient({
             name: "Manager",
             connectToDevTools: isDev,
             cache: new client.InMemoryCache(),
@@ -163,18 +155,51 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
                 client.split(operation => operation.getContext().clientName === "imageupload", imageUploadGraphQLLink),
                 client.split(operation => operation.getContext().clientName === "manager", managerGraphQLLink, client.split(operation => operation.getContext().clientName === "report", reportGraphQLLink, isIrisApp ? publicGraphQLLink : managerGraphQLLink)),
             ]),
+        }),
+        setToken: (newToken) => {
+            token = newToken;
+        },
+        getToken: () => {
+            return token;
+        },
+    };
+};
+const useApolloClient = (isIrisApp) => {
+    var _a;
+    const { graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, tracingHeaders } = reactCoreHooks.useEnvironment();
+    const { tasUserId } = reactCoreHooks.useCurrentUser();
+    const { token } = reactCoreHooks.useToken();
+    const tasUserIdRef = React__namespace.useRef(tasUserId);
+    const clientRef = React__namespace.useRef(null);
+    /* DONT CHANGE THIS ! its there to ensure we dont recreate apollo client just because the token changes,
+       the token will then be set on the instance without react reporting a new client
+       and recreating if token change from null to something*/
+    if (!clientRef.current || !clientRef.current.getToken() || tasUserIdRef.current !== tasUserId) {
+        clientRef.current = createApolloClient({
+            graphqlManagerUrl,
+            graphqlPublicUrl,
+            graphqlManagerImageUploadUrl,
+            graphqlReportUrl,
+            isDev,
+            tracingHeaders,
+            isIrisApp,
+            firstToken: token,
         });
-    }, [
-        authLink,
-        defaultOptions,
-        errorLink,
-        imageUploadGraphQLLink,
-        isDev,
-        isIrisApp,
-        managerGraphQLLink,
-        publicGraphQLLink,
-        reportGraphQLLink,
-    ]);
+    }
+    else {
+        clientRef.current.setToken(token);
+    }
+    return (_a = clientRef.current) === null || _a === void 0 ? void 0 : _a.client;
+};
+/**
+ * This is a provider for the ManagerApolloContext.
+ * It is used to provide the apollo client to the manager app.
+ *
+ * @param {IProps} props The props.
+ * @returns {JSX.Element} The provider.
+ */
+const ManagerApolloProvider = ({ children, isIrisApp }) => {
+    const client$1 = useApolloClient(isIrisApp);
     return jsxRuntime.jsx(client.ApolloProvider, Object.assign({ client: client$1 }, { children: children }));
 };
 

package/index.js

@@ -1,9 +1,9 @@
 import { jsx, Fragment } from 'react/jsx-runtime';
-import { ApolloClient, InMemoryCache, from, split, ApolloProvider } from '@apollo/client';
+import { ApolloProvider, ApolloClient, InMemoryCache, from, split } from '@apollo/client';
 import { setContext } from '@apollo/client/link/context';
 import { onError } from '@apollo/client/link/error';
 import * as Sentry from '@sentry/browser';
-import { useEnvironment, useToken, ToastProvider, AnalyticsContextProvider, AssetSortingProvider, EnvironmentContextProvider, GlobalSelectionProvider, OemBrandingContextProvider as OemBrandingContextProvider$1, TokenProvider, CurrentUserProvider, UserSubscriptionProvider as UserSubscriptionProvider$1, useURLSynchronization } from '@trackunit/react-core-hooks';
+import { useEnvironment, useCurrentUser, useToken, ToastProvider, AnalyticsContextProvider, AssetSortingProvider, EnvironmentContextProvider, GlobalSelectionProvider, OemBrandingContextProvider as OemBrandingContextProvider$1, TokenProvider, CurrentUserProvider, UserSubscriptionProvider as UserSubscriptionProvider$1, useURLSynchronization } from '@trackunit/react-core-hooks';
 import { createUploadLink } from 'apollo-upload-client';
 import * as React from 'react';
 import { useMemo, useEffect, useState } from 'react';
@@ -38,16 +38,8 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-/**
- * This is a provider for the ManagerApolloContext.
- * It is used to provide the apollo client to the manager app.
- *
- * @param {IProps} props The props.
- * @returns {JSX.Element} The provider.
- */
-const ManagerApolloProvider = ({ children, isIrisApp }) => {
-    const { graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, tracingHeaders } = useEnvironment();
-    const { token } = useToken();
+const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, isIrisApp, tracingHeaders, firstToken, }) => {
+    let token = firstToken;
     const managerGraphQLLink = createUploadLink({
         uri: request => graphqlManagerUrl + "/" + request.operationName,
     });
@@ -60,12 +52,12 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
     const reportGraphQLLink = createUploadLink({
         uri: request => graphqlReportUrl + "/" + request.operationName,
     });
-    const authLink = useMemo(() => setContext((_, { headers }) => __awaiter(void 0, void 0, void 0, function* () {
+    const authLink = setContext((_, { headers }) => __awaiter(void 0, void 0, void 0, function* () {
         return {
             headers: Object.assign(Object.assign(Object.assign({}, headers), tracingHeaders), { Authorization: token ? `Bearer ${token}` : null }),
         };
-    })), [token, tracingHeaders]);
-    const errorLink = useMemo(() => onError((errorResponse) => {
+    }));
+    const errorLink = onError((errorResponse) => {
         var _a, _b;
         const traceIds = []; // Used to hold id's for use in Sentry
         if (errorResponse.graphQLErrors) {
@@ -117,8 +109,8 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
             // eslint-disable-next-line no-console
             console.error(errorResponse.networkError);
         }
-    }), []);
-    const defaultOptions = useMemo(() => ({
+    });
+    const defaultOptions = {
         watchQuery: {
             fetchPolicy: "no-cache",
             errorPolicy: "all",
@@ -126,9 +118,9 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
         query: {
             fetchPolicy: "no-cache",
         },
-    }), []);
-    const client = useMemo(() => {
-        return new ApolloClient({
+    };
+    return {
+        client: new ApolloClient({
             name: "Manager",
             connectToDevTools: isDev,
             cache: new InMemoryCache(),
@@ -139,18 +131,51 @@ const ManagerApolloProvider = ({ children, isIrisApp }) => {
                 split(operation => operation.getContext().clientName === "imageupload", imageUploadGraphQLLink),
                 split(operation => operation.getContext().clientName === "manager", managerGraphQLLink, split(operation => operation.getContext().clientName === "report", reportGraphQLLink, isIrisApp ? publicGraphQLLink : managerGraphQLLink)),
             ]),
+        }),
+        setToken: (newToken) => {
+            token = newToken;
+        },
+        getToken: () => {
+            return token;
+        },
+    };
+};
+const useApolloClient = (isIrisApp) => {
+    var _a;
+    const { graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, tracingHeaders } = useEnvironment();
+    const { tasUserId } = useCurrentUser();
+    const { token } = useToken();
+    const tasUserIdRef = React.useRef(tasUserId);
+    const clientRef = React.useRef(null);
+    /* DONT CHANGE THIS ! its there to ensure we dont recreate apollo client just because the token changes,
+       the token will then be set on the instance without react reporting a new client
+       and recreating if token change from null to something*/
+    if (!clientRef.current || !clientRef.current.getToken() || tasUserIdRef.current !== tasUserId) {
+        clientRef.current = createApolloClient({
+            graphqlManagerUrl,
+            graphqlPublicUrl,
+            graphqlManagerImageUploadUrl,
+            graphqlReportUrl,
+            isDev,
+            tracingHeaders,
+            isIrisApp,
+            firstToken: token,
         });
-    }, [
-        authLink,
-        defaultOptions,
-        errorLink,
-        imageUploadGraphQLLink,
-        isDev,
-        isIrisApp,
-        managerGraphQLLink,
-        publicGraphQLLink,
-        reportGraphQLLink,
-    ]);
+    }
+    else {
+        clientRef.current.setToken(token);
+    }
+    return (_a = clientRef.current) === null || _a === void 0 ? void 0 : _a.client;
+};
+/**
+ * This is a provider for the ManagerApolloContext.
+ * It is used to provide the apollo client to the manager app.
+ *
+ * @param {IProps} props The props.
+ * @returns {JSX.Element} The provider.
+ */
+const ManagerApolloProvider = ({ children, isIrisApp }) => {
+    const client = useApolloClient(isIrisApp);
     return jsx(ApolloProvider, Object.assign({ client: client }, { children: children }));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-core-contexts",
-  "version": "0.4.158",
+  "version": "0.4.163",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "dependencies": {
@@ -10,9 +10,9 @@
     "@sentry/browser": "7.50.0",
     "@trackunit/i18n-library-translation": "0.0.53",
     "@trackunit/iris-app-runtime-core": "0.3.46",
-    "@trackunit/react-components": "0.1.97",
+    "@trackunit/react-components": "0.1.99",
     "@trackunit/react-core-contexts-api": "0.2.37",
-    "@trackunit/react-core-contexts-test": "0.1.68",
+    "@trackunit/react-core-contexts-test": "0.1.69",
     "@trackunit/react-core-hooks": "0.2.60",
     "apollo-upload-client": "17.0.0",
     "react": "18.2.0",