@trackunit/react-core-contexts 0.4.164 → 0.4.166

package/index.cjs

@@ -8,6 +8,7 @@ var context = require('@apollo/client/link/context');
 var error = require('@apollo/client/link/error');
 var Sentry = require('@sentry/browser');
 var reactCoreHooks = require('@trackunit/react-core-hooks');
+var amplitude = require('amplitude-js');
 var apolloUploadClient = require('apollo-upload-client');
 var React = require('react');
 var irisAppRuntimeCore = require('@trackunit/iris-app-runtime-core');
@@ -16,6 +17,8 @@ var i18nLibraryTranslation = require('@trackunit/i18n-library-translation');
 var reactComponents = require('@trackunit/react-components');
 var reactRouterDom = require('react-router-dom');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
     var n = Object.create(null);
@@ -35,6 +38,7 @@ function _interopNamespace(e) {
 }
 
 var Sentry__namespace = /*#__PURE__*/_interopNamespace(Sentry);
+var amplitude__default = /*#__PURE__*/_interopDefaultLegacy(amplitude);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 /******************************************************************************
@@ -119,14 +123,16 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlManage
                     ((_c = x === null || x === void 0 ? void 0 : x.message) === null || _c === void 0 ? void 0 : _c.includes("Access denied! You need to be authorized to perform this action!")));
             });
             if (invalidToken) {
-                Sentry__namespace.captureException({
-                    category: "GraphQL",
-                    message: "GraphQL Error - invalidToken",
-                    level: "warning",
-                    data: {
-                        log: JSON.stringify(errorResponse.graphQLErrors),
-                    },
-                });
+                amplitude__default["default"].getInstance().logEvent("ManagerApolloProviderError", errorResponse.graphQLErrors);
+                //Temp fix for Sentry overload
+                // Sentry.captureException({
+                //   category: "GraphQL",
+                //   message: "GraphQL Error - invalidToken",
+                //   level: "warning",
+                //   data: {
+                //     log: JSON.stringify(errorResponse.graphQLErrors),
+                //   },
+                // });
             }
         }
         if (errorResponse.networkError) {
@@ -167,17 +173,18 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlManage
 const useApolloClient = (isIrisApp) => {
     var _a;
     const { graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, tracingHeaders } = reactCoreHooks.useEnvironment();
-    const { tasUserId } = reactCoreHooks.useCurrentUser();
+    const { isAssuming } = reactCoreHooks.useCurrentUser();
     const { token } = reactCoreHooks.useToken();
-    const tasUserIdRef = React__namespace.useRef();
+    const isAssumingRef = React__namespace.useRef();
     const clientRef = React__namespace.useRef(null);
-    if (!tasUserIdRef.current) {
-        tasUserIdRef.current = tasUserId;
+    if (isAssumingRef.current === null) {
+        isAssumingRef.current = isAssuming;
     }
     /* 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) {
+    if (!clientRef.current || !clientRef.current.getToken() || isAssumingRef.current !== isAssuming) {
+        isAssumingRef.current = !isAssumingRef.current;
         clientRef.current = createApolloClient({
             graphqlManagerUrl,
             graphqlPublicUrl,

package/index.js

@@ -4,6 +4,7 @@ import { setContext } from '@apollo/client/link/context';
 import { onError } from '@apollo/client/link/error';
 import * as Sentry from '@sentry/browser';
 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 amplitude from 'amplitude-js';
 import { createUploadLink } from 'apollo-upload-client';
 import * as React from 'react';
 import { useMemo, useEffect, useState } from 'react';
@@ -95,14 +96,16 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlManage
                     ((_c = x === null || x === void 0 ? void 0 : x.message) === null || _c === void 0 ? void 0 : _c.includes("Access denied! You need to be authorized to perform this action!")));
             });
             if (invalidToken) {
-                Sentry.captureException({
-                    category: "GraphQL",
-                    message: "GraphQL Error - invalidToken",
-                    level: "warning",
-                    data: {
-                        log: JSON.stringify(errorResponse.graphQLErrors),
-                    },
-                });
+                amplitude.getInstance().logEvent("ManagerApolloProviderError", errorResponse.graphQLErrors);
+                //Temp fix for Sentry overload
+                // Sentry.captureException({
+                //   category: "GraphQL",
+                //   message: "GraphQL Error - invalidToken",
+                //   level: "warning",
+                //   data: {
+                //     log: JSON.stringify(errorResponse.graphQLErrors),
+                //   },
+                // });
             }
         }
         if (errorResponse.networkError) {
@@ -143,17 +146,18 @@ const createApolloClient = ({ graphqlManagerUrl, graphqlPublicUrl, graphqlManage
 const useApolloClient = (isIrisApp) => {
     var _a;
     const { graphqlManagerUrl, graphqlPublicUrl, graphqlManagerImageUploadUrl, graphqlReportUrl, isDev, tracingHeaders } = useEnvironment();
-    const { tasUserId } = useCurrentUser();
+    const { isAssuming } = useCurrentUser();
     const { token } = useToken();
-    const tasUserIdRef = React.useRef();
+    const isAssumingRef = React.useRef();
     const clientRef = React.useRef(null);
-    if (!tasUserIdRef.current) {
-        tasUserIdRef.current = tasUserId;
+    if (isAssumingRef.current === null) {
+        isAssumingRef.current = isAssuming;
     }
     /* 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) {
+    if (!clientRef.current || !clientRef.current.getToken() || isAssumingRef.current !== isAssuming) {
+        isAssumingRef.current = !isAssumingRef.current;
         clientRef.current = createApolloClient({
             graphqlManagerUrl,
             graphqlPublicUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-core-contexts",
-  "version": "0.4.164",
+  "version": "0.4.166",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "dependencies": {
@@ -14,6 +14,7 @@
     "@trackunit/react-core-contexts-api": "0.2.37",
     "@trackunit/react-core-contexts-test": "0.1.69",
     "@trackunit/react-core-hooks": "0.2.60",
+    "amplitude-js": "7.4.4",
     "apollo-upload-client": "17.0.0",
     "react": "18.2.0",
     "react-router-dom": "6.4.5"