@trackunit/react-core-contexts 1.3.59 → 1.3.63

package/index.cjs.js

@@ -82,8 +82,7 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlIntern
             // eslint-disable-next-line no-console
             console.error(`Error calling: '${operation.getContext().clientAwareness.name}' fetching Data for: ${operation.operationName}`, graphQLErrors);
             graphQLErrors.forEach(error => {
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                if ("extensions" in error && error.extensions) {
+                if ("extensions" in error) {
                     error.extensions.traceId = operation.getContext().response?.extensions?.traceId;
                     // eslint-disable-next-line local-rules/no-typescript-assertion
                     const traceId = error.extensions.traceId;
@@ -109,8 +108,7 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlIntern
             const invalidToken = graphQLErrors.some(x => {
                 return (
                 // saw it not unnecessary
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                (x.extensions && x.extensions.code === "UNAUTHENTICATED") ||
+                x.extensions.code === "UNAUTHENTICATED" ||
                     x.message.includes("Invalid token specified") ||
                     x.message.includes("Access denied! You need to be authorized to perform this action!"));
             });
@@ -187,12 +185,11 @@ const useApolloClient = () => {
     const { graphqlManagerUrl, graphqlPublicUrl, graphqlInternalUrl, graphqlReportUrl, environment, tracingHeaders } = reactCoreHooks.useEnvironment();
     const { token } = reactCoreHooks.useToken();
     const errorHandler = reactCoreHooks.useErrorHandler();
-    const clientRef = React.useRef(null);
-    /* DON'T CHANGE THIS ! its there to ensure we don't 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 = createApolloClient({
+    const [client] = React.useState(() => {
+        return createApolloClient({
+            /* DON'T CHANGE THIS ! its there to ensure we don't 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*/
             graphqlManagerUrl,
             graphqlPublicUrl,
             graphqlInternalUrl,
@@ -202,11 +199,11 @@ const useApolloClient = () => {
             firstToken: token,
             errorHandler,
         });
+    });
+    if (client.getToken() !== token) {
+        client.setToken(token);
     }
-    if (clientRef.current.getToken() !== token) {
-        clientRef.current.setToken(token);
-    }
-    return clientRef.current.client;
+    return client;
 };
 /**
  * This is a provider for the ManagerApolloContext.
@@ -216,7 +213,7 @@ const useApolloClient = () => {
  * @returns {ReactElement} The provider.
  */
 const ManagerApolloProvider = ({ children }) => {
-    const client$1 = useApolloClient();
+    const { client: client$1 } = useApolloClient();
     return jsxRuntime.jsx(client.ApolloProvider, { client: client$1, children: children });
 };
 

package/index.esm.js

@@ -5,7 +5,7 @@ import { onError } from '@apollo/client/link/error';
 import { removeTypenameFromVariables } from '@apollo/client/link/remove-typename';
 import { useEnvironment, useToken, useErrorHandler, AnalyticsContextProvider, AssetSortingProvider, ConfirmationDialogProvider, EnvironmentContextProvider, ErrorHandlingContextProvider, FilterBarProvider, ModalDialogContextProvider, NavigationContextProvider, OemBrandingContextProvider, ToastProvider, TokenProvider, CurrentUserProvider, CurrentUserPreferenceProvider, UserSubscriptionProvider } from '@trackunit/react-core-hooks';
 import * as React from 'react';
-import { useRef, useMemo, useEffect, useState } from 'react';
+import { useState, useMemo, useEffect } from 'react';
 import '@js-temporal/polyfill';
 import { registerTranslations, initializeTranslationsForApp } from '@trackunit/i18n-library-translation';
 import { Spinner } from '@trackunit/react-components';
@@ -62,8 +62,7 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlIntern
             // eslint-disable-next-line no-console
             console.error(`Error calling: '${operation.getContext().clientAwareness.name}' fetching Data for: ${operation.operationName}`, graphQLErrors);
             graphQLErrors.forEach(error => {
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                if ("extensions" in error && error.extensions) {
+                if ("extensions" in error) {
                     error.extensions.traceId = operation.getContext().response?.extensions?.traceId;
                     // eslint-disable-next-line local-rules/no-typescript-assertion
                     const traceId = error.extensions.traceId;
@@ -89,8 +88,7 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlIntern
             const invalidToken = graphQLErrors.some(x => {
                 return (
                 // saw it not unnecessary
-                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                (x.extensions && x.extensions.code === "UNAUTHENTICATED") ||
+                x.extensions.code === "UNAUTHENTICATED" ||
                     x.message.includes("Invalid token specified") ||
                     x.message.includes("Access denied! You need to be authorized to perform this action!"));
             });
@@ -167,12 +165,11 @@ const useApolloClient = () => {
     const { graphqlManagerUrl, graphqlPublicUrl, graphqlInternalUrl, graphqlReportUrl, environment, tracingHeaders } = useEnvironment();
     const { token } = useToken();
     const errorHandler = useErrorHandler();
-    const clientRef = useRef(null);
-    /* DON'T CHANGE THIS ! its there to ensure we don't 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 = createApolloClient({
+    const [client] = useState(() => {
+        return createApolloClient({
+            /* DON'T CHANGE THIS ! its there to ensure we don't 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*/
             graphqlManagerUrl,
             graphqlPublicUrl,
             graphqlInternalUrl,
@@ -182,11 +179,11 @@ const useApolloClient = () => {
             firstToken: token,
             errorHandler,
         });
+    });
+    if (client.getToken() !== token) {
+        client.setToken(token);
     }
-    if (clientRef.current.getToken() !== token) {
-        clientRef.current.setToken(token);
-    }
-    return clientRef.current.client;
+    return client;
 };
 /**
  * This is a provider for the ManagerApolloContext.
@@ -196,7 +193,7 @@ const useApolloClient = () => {
  * @returns {ReactElement} The provider.
  */
 const ManagerApolloProvider = ({ children }) => {
-    const client = useApolloClient();
+    const { client } = useApolloClient();
     return jsx(ApolloProvider, { client: client, children: children });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-core-contexts",
-  "version": "1.3.59",
+  "version": "1.3.63",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -11,12 +11,12 @@
     "react": "19.0.0",
     "@js-temporal/polyfill": "^0.4.4",
     "jest-fetch-mock": "^3.0.3",
-    "@trackunit/iris-app-api": "1.3.46",
-    "@trackunit/react-core-contexts-api": "1.4.45",
-    "@trackunit/react-core-hooks": "1.3.46",
-    "@trackunit/i18n-library-translation": "1.3.48",
-    "@trackunit/react-components": "1.4.54",
-    "@trackunit/iris-app-runtime-core": "1.4.46"
+    "@trackunit/iris-app-api": "1.3.48",
+    "@trackunit/react-core-contexts-api": "1.4.47",
+    "@trackunit/react-core-hooks": "1.3.49",
+    "@trackunit/i18n-library-translation": "1.3.51",
+    "@trackunit/react-components": "1.4.56",
+    "@trackunit/iris-app-runtime-core": "1.4.48"
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",