dce-reactkit 3.4.0-beta.3 → 3.4.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dce-reactkit",
-  "version": "3.4.0-beta.3",
+  "version": "3.4.0-beta.5",
   "description": "Shared components for Harvard DCE apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/client/initClient.tsx

@@ -56,32 +56,24 @@ let storedSendRequest: SendRequestFunction;
  * @returns sendRequest function
  */
 export const getSendRequest = async () => {
-  // Track timeout
-  let timedOut = false;
+  // Show timeout error if too much time passes
+  let successful = false;
   (async () => {
     await waitMs(5000);
-    timedOut = true;
+    
+    if (!successful) {
+      showFatalError(
+        new ErrorWithCode(
+          'Could not send a request because the request needed to be sent before dce-reactkit was properly initialized. Perhaps dce-reactkit was not initialized with initClient.',
+          ReactKitErrorCode.NoCACCLSendRequestFunction,
+        ),
+      );
+    }
   })(),
 
   // Wait for initialization
   await initialized;
-
-  // Error if no send request function
-  if (timedOut) {
-    showFatalError(
-      new ErrorWithCode(
-        'Could not send a request because the request needed to be sent before dce-reactkit was properly initialized. Perhaps dce-reactkit was not initialized with initClient.',
-        ReactKitErrorCode.NoCACCLSendRequestFunction,
-      ),
-    );
-
-    // Return dummy function that never resolves
-    return (
-      () => {
-        return new Promise(() => {});
-      }
-    ) as SendRequestFunction;
-  }
+  successful = true;
 
   // Return
   return storedSendRequest;

package/src/helpers/addDBEditorEndpoints.ts

@@ -1,9 +1,12 @@
 import express from 'express';
 
-// Import dce-reactkit
-import { genRouteHandler, ParamType } from 'dce-reactkit';
+// Import shared helpers
+import genRouteHandler from './genRouteHandler';
 import generateEndpointPath from '../components/DBEntryManagerPanel/helpers/generateEndpointPath';
 
+// Import shared types
+import ParamType from '../types/ParamType';
+
 /**
  * Interface for a collection in the database
  * @author Yuen Ler Chow