@gen3/core 0.10.48 → 0.10.50

package/dist/cjs/index.js

@@ -2,10 +2,10 @@
 
 var toolkit = require('@reduxjs/toolkit');
 var react = require('@reduxjs/toolkit/query/react');
-var React = require('react');
-var reactRedux = require('react-redux');
 var cookiesNext = require('cookies-next');
 var query = require('@reduxjs/toolkit/query');
+var React = require('react');
+var reactRedux = require('react-redux');
 var lodash = require('lodash');
 var Queue = require('queue');
 var jsonpathPlus = require('jsonpath-plus');
@@ -62,32 +62,6 @@ const FILE_DELIMITERS = {
     csv: ','
 };
 
-// From here down is react-related code. If we wanted to create a UI-agnotic core,
-// we could need to move the following code and the provider into a new workspace,
-// such as core-react.
-/**
- * The initial context is never used in practice. A little casting voodoo to satisfy TS.
- *
- * Note: Should the action type be AnyAction (from redux) or PayloadAction (from redux-toolkit)?
- * If we are creating all of our actions through RTK, then PayloadAction might be the
- * correct opinionated type.
- */ const CoreContext = React.createContext(undefined);
-const useCoreSelector = reactRedux.createSelectorHook(CoreContext);
-const useCoreDispatch = reactRedux.createDispatchHook(CoreContext);
-const useCoreStore = reactRedux.createStoreHook(CoreContext);
-
-/**
- * Creates a custom Redux Toolkit core API
- * See: https://redux-toolkit.js.org/rtk-query/usage/customizing-create-api
- * @returns: created core API.
- */ const coreCreateApi = react.buildCreateApi(react.coreModule(), react.reactHooksModule({
-    hooks: {
-        useSelector: useCoreSelector,
-        useStore: useCoreStore,
-        useDispatch: useCoreDispatch
-    }
-}));
-
 /**
  * Template for fence error response dict
  * @returns: An error dict response from a RESTFUL API request
@@ -121,7 +95,7 @@ const useCoreStore = reactRedux.createStoreHook(CoreContext);
     });
 };
 
-const userAuthApi = coreCreateApi({
+const userAuthApi = react.createApi({
     reducerPath: 'userAuthApi',
     refetchOnMountOrArgChange: 1800,
     refetchOnReconnect: true,
@@ -218,7 +192,7 @@ const selectHeadersWithCSRFToken = toolkit.createSelector([
  * @param baseQuery: - The template query which the slices will addon to
  * @param endpoints - Base API endpoints that should exist in every slice
  * @returns: The generated base API
- */ const gen3Api = coreCreateApi({
+ */ const gen3Api = react.createApi({
     reducerPath: 'gen3Services',
     baseQuery: react.fetchBaseQuery({
         baseUrl: `${GEN3_API}`,
@@ -358,6 +332,18 @@ const credentialsWithTags = gen3Api.enhanceEndpoints({
 });
 const { useGetJWKKeysQuery } = jwtApi;
 
+// From here down is react-related code. If we wanted to create a UI-agnotic core,
+// we could need to move the following code and the provider into a new workspace,
+// such as core-react.
+/**
+ * The initial context is never used in practice. A little casting voodoo to satisfy TS.
+ *
+ * Note: Should the action type be AnyAction (from redux) or PayloadAction (from redux-toolkit)?
+ * If we are creating all of our actions through RTK, then PayloadAction might be the
+ * correct opinionated type.
+ */ const useCoreSelector = reactRedux.useSelector.withTypes();
+const useCoreDispatch = reactRedux.useDispatch.withTypes();
+
 const usePrevious = (value)=>{
     const ref = React.useRef();
     React.useEffect(()=>{
@@ -787,7 +773,7 @@ const cohortReducer = cohortSlice.reducer;
 /**
  * Creates a base class core API for guppy API calls.
  * @returns: guppy core API with guppyAPIFetch base query
- */ const guppyApi = coreCreateApi({
+ */ const guppyApi = react.createApi({
     reducerPath: 'guppy',
     // TODO: refactor to use fetchBaseQuery
     baseQuery: async (query, api)=>{
@@ -852,8 +838,7 @@ query.setupListeners(coreStore.dispatch);
 
 const CoreProvider = ({ children })=>{
     return /*#__PURE__*/ React.createElement(reactRedux.Provider, {
-        store: coreStore,
-        context: CoreContext
+        store: coreStore
     }, children);
 };
 
@@ -1095,7 +1080,7 @@ const createAppStore = (options)=>{
                 }
             })
     });
-    const context = /*#__PURE__*/ React.createContext(undefined);
+    const context = /*#__PURE__*/ React.createContext(null);
     const useAppSelector = reactRedux.createSelectorHook(context);
     const useAppDispatch = reactRedux.createDispatchHook(context);
     const useAppStore = reactRedux.createStoreHook(context);
@@ -1138,8 +1123,8 @@ const createGen3AppWithOwnStore = (options)=>{
 };
 
 const createAppApiForRTKQ = (reducerPath, baseQuery)=>{
-    const appContext = React__namespace.createContext(undefined);
-    const useAppSelector = reactRedux.createSelectorHook(appContext);
+    const appContext = React__namespace.createContext(null);
+    const useAppSelector = reactRedux.useSelector.withTypes();
     const useAppDispatch = reactRedux.createDispatchHook(appContext);
     const useAppStore = reactRedux.createStoreHook(appContext);
     const appCreateApi = react.buildCreateApi(react.coreModule(), react.reactHooksModule({
@@ -2230,7 +2215,6 @@ const SubmissionGraphqlQuery = `query transactionList {
 });
 const { useGetProjectsQuery, useGetSubmissionGraphQLQuery, useGetProjectsDetailsQuery, useLazyGetProjectsQuery, useLazyGetSubmissionGraphQLQuery, useGetSubmissionsQuery, useGetDictionaryQuery } = submissionApi;
 
-exports.CoreContext = CoreContext;
 exports.CoreProvider = CoreProvider;
 exports.GEN3_API = GEN3_API;
 exports.GEN3_AUTHZ_API = GEN3_AUTHZ_API;
@@ -2333,7 +2317,6 @@ exports.useAskQuestionMutation = useAskQuestionMutation;
 exports.useAuthorizeFromCredentialsMutation = useAuthorizeFromCredentialsMutation;
 exports.useCoreDispatch = useCoreDispatch;
 exports.useCoreSelector = useCoreSelector;
-exports.useCoreStore = useCoreStore;
 exports.useDownloadFromGuppyMutation = useDownloadFromGuppyMutation;
 exports.useFetchUserDetailsQuery = useFetchUserDetailsQuery;
 exports.useGeneralGQLQuery = useGeneralGQLQuery;