merged in dev

Author: bhsauro

main_process/main_httpController.js

@@ -229,6 +229,7 @@ const httpController = {
       reqResObj.isHTTP2 = true;
       reqResObj.timeReceived = Date.now();
       response.headers = headers;
+      response.status = headers[':status'];
 
       // if cookie exists, parse the cookie(s)
       if (headers['set-cookie']) {
@@ -285,6 +286,16 @@ const httpController = {
 
       reqResObj.response.events.push(dataEvent);
 
+
+      console.log('this is reqresobj respons right beforetest', reqResObj.response);
+      // check if there is a test script to run
+      if (reqResObj.request.testContent) {
+         reqResObj.response.testResult = testingController.runTest(
+           reqResObj.request.testContent,
+           reqResObj
+         );
+      }
+
       event.sender.send('reqResUpdate', reqResObj);
     });
   },

main_process/main_testingController.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-useless-escape */
 const { NodeVM } = require('vm2');
 const chai = require('chai');
+const { status } = require('@grpc/grpc-js');
 
 const testHttpController = {};
 
@@ -12,6 +13,13 @@ testHttpController.runTest = (
 ) => {
   const { request } = reqResObj;
   let { response } = reqResObj;
+
+  console.log('this is response in backend', response);
+  console.log('HSOULD BE HEADERS', response.headers);
+  console.log('is status acessable', response.status);
+  console.log('TRYING WITH BRackets', response.headers[':status']);
+  // console.log('TRYING WITH just colon', response.headers:status);
+
   // final test result objects will be stored in this array
   const testResults = [];
 
@@ -70,9 +78,9 @@ testHttpController.runTest = (
 
       addOneResult({
         message: errObj.message,
-        status: 'FAIL',
+        status: 'FAILhi',
         expected: errObj.expected,
-        actual: errObj.actual,
+        actual: err,
       });
     }
     `;
@@ -90,6 +98,7 @@ testHttpController.runTest = (
     vm.run(testScript, 'main.js');
     // deep clone the testResults array since sending functions, DOM elements, and non-cloneable
     // JS objects is not supported IPC channels past Electron 9
+    // console.log('this is test results from back end', testResults);
     return JSON.parse(JSON.stringify(testResults));
   } catch (err) {
     console.log(

src/assets/style/base.scss

@@ -34,7 +34,7 @@ input:focus {
   color: $neutral-100;
   display: flex;
   align-items: center;
-  justify-content: space-around;
+  justify-content: space-between;
   height: 2.5rem !important;
   opacity: 0.8;
   margin: 0;

src/client/components/main/TRPC-composer/TRPCMethodAndEndpointEntryForm.tsx

@@ -7,7 +7,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import { RootState } from '../../../toolkit-refactor/store';
 import { fieldsReplaced } from '../../../toolkit-refactor/slices/newRequestFieldsSlice';
 
-const TRPCMethodAndEndpointEntryForm = (props) => {
+const TRPCMethodAndEndpointEntryForm = (props: any) => {
   const requestFields = useSelector(
     (state: RootState) => state.newRequestFields
   );

src/client/components/navbar/GeneralInfo.tsx

@@ -26,8 +26,8 @@ export default function GeneralInfo() {
         data-show-count="true"
         aria-label="Star open-source-labs/Swell on GitHub"
       >
-        Star
       </GitHubButton>
+
     </Box>
   );
 }

src/client/components/navbar/ProtocolSelect.tsx

@@ -46,7 +46,7 @@ const CustomButton = styled(ButtonUnstyled)`
   transition: all 150ms ease;
   cursor: pointer;
   border: none;
-  width: 8vw;
+  width: 15vw;
 
   &:hover,
   &:active {
@@ -154,29 +154,36 @@ function ProtocolSelect() {
     });
   };
 
+  /*EXPERIMENTAL BUTTONS ARE COMMENTED OUT BELOW:
+   We did this because having partially working features accessible to all seemed counter-intuitive
+    to having a fully functional application for any user to download and use. Some experimentals
+    are closer to fully-functional more than others and if they do get fleshed out they can be added
+    to the other set of functional features*/
+  
   return (
     <Box
       key="page-selector"
       sx={{
         flexGrow: 1,
         display: { xs: 'none', md: 'flex' },
-        justifyContent: 'center',
+        justifyContent: 'space-evenly',
         alignItems: 'center',
       }}
     >
       {createButtons(pages)}
-      <Divider sx={{ ml: 1 }} orientation="vertical" flexItem />
-      <SwellTooltip title={experimentalTooltipText}>
-        <ScienceRoundedIcon
+
+      {/* <Divider sx={{ ml: 1 }} orientation="vertical" flexItem /> */}
+      {/* <SwellTooltip title={experimentalTooltipText}> */}
+        {/* <ScienceRoundedIcon
           sx={{
             ml: 1.5,
             mr: 1,
             color: `${white[500]}`,
             '&:hover': { color: '#58a4b0' },
           }}
         />
-      </SwellTooltip>
-      {createButtons(experimentalPages)}
+      </SwellTooltip> */}
+      {/* {createButtons(experimentalPages)} */}
     </Box>
   );
 }