Merge pull request #1734 from OneCommunityGlobal/development

Frontend Release to Main [3.09]

Author: one-community

.circleci/config.yml

@@ -18,37 +18,32 @@ jobs:
 
   build_development:
     docker:
-      - image: ubuntu:20.04
+      # Change from Ubnutu to cimg/node:14.21.3.
+      # cimg convient image comes with node, yarn, and other pre-installed software.
+      # This will remove the steps of install node, yarn, and other software.
+      - image: cimg/node:14.21.3
     resource_class: large
     steps:
       - checkout
-      - run:
-          name: Install ubuntu updates
-          command: apt-get update && apt-get upgrade -y
-      - run:
-          name: Install curl and zip
-          command: apt-get install curl zip -y
-      - run:
-          name: Download and execute Node.js 14.x install script from node source
-          command: curl -sL https://deb.nodesource.com/setup_14.x | bash -
-      - run:
-          name: Install Node.js and NPM
-          command: apt-get install nodejs -y
-      - run:
-          name: Download and execute Yarn istallation script
-          command: curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarnkey.gpg >/dev/null
-      - run:
-          name: Add yarn to sources.list
-          command: echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list
-      - run:
-          name: Install yarn
-          command: apt-get install yarn -y
+      - restore_cache:
+          keys:
+            #   Update the key to v1.1-dependencies-{{ checksum "package-lock.json" }} since the base image switched.
+            #   Otherwise, we would have persmission issues while retriving the cache saved from the preivous image
+            - v1.1-dependencies-{{ checksum "package-lock.json" }}
       - run:
           name: Install HighestGoodNetworkApp's NodeJS dependencies
           command: npm install
       - run:
           name: Build the React client
           command: export REACT_APP_APIENDPOINT=$APIENDPOINT_DEV REACT_APP_DEF_PWD=$REACT_APP_DEF_PWD REACT_APP_SENTRY_URL=$SENTRY_URL_DEV SKIP_PREFLIGHT_CHECK=true NODE_OPTIONS=$NODE_OPTIONS && npm run build
+      - run:
+          name: Export error log if 'Build the React client' failed
+          command: |
+            mkdir -p /tmp/err_logs
+            cp -r /home/circleci/.npm/_logs/* /tmp/err_logs
+          when: on_fail
+      - store_artifacts:
+          path: /tmp/err_logs
       - run:
           name: Create ZIP archive of build directory
           command: zip -r build.zip build
@@ -61,6 +56,10 @@ jobs:
       - run:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV --project ./build
+      - save_cache:
+          key: v1.1-dependencies-{{ checksum "package-lock.json" }}
+          paths:
+            - ./node_modules
 
   build_beta:
     docker:

.eslintignore

@@ -20,10 +20,7 @@ src/components/Badge/**
 src/components/common/**
 src/components/Header/**
 src/components/BMDashboard/BMHeader/**
-src/components/Inventory/**
-src/components/Memberships/**
 src/components/MonthlyEffort/**
-src/components/NewProfileLink/**
 
 src/components/PermissionsManagement/**
 # src/components/PopUpBar/**

.vscode/settings.json

@@ -12,12 +12,12 @@
   "eslint.alwaysShowStatus": true,
   "editor.tabSize": 2,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "files.exclude": {
     "**/.classpath": true,
     "**/.project": true,
     "**/.settings": true,
     "**/.factorypath": true
   }
-}
+}

images/screenshot.png

@@ -103,14 +103,14 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-testing-library": "^3.6.0",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
     "msw": "^0.19.5",
     "node-sass": "^8.0.0",
     "prettier": "^1.19.1",
     "redux-mock-store": "^1.5.4",
     "husky": "^8.0.0",
     "sinon": "^7.3.2",
     "surge": "^0.21.6",
+    "jest-environment-jsdom-sixteen": "^1.0.3",
     "node-fetch": "^3.1.1"
   }
 }

package-lock.json

@@ -76,7 +76,9 @@ export const postTimeEntry = timeEntry => {
   return async dispatch => {
     try {
       const res = await axios.post(url, timeEntry);
-      dispatch(updateTimeEntries(timeEntry));
+      if(timeEntry.entryType == 'default'){
+        dispatch(updateTimeEntries(timeEntry));
+      }
       return res.status;
     } catch (e) {
       return e.response.status;
@@ -89,7 +91,9 @@ export const editTimeEntry = (timeEntryId, timeEntry, oldDateOfWork) => {
   return async dispatch => {
     try {
       const res = await axios.put(url, timeEntry);
-      dispatch(updateTimeEntries(timeEntry, oldDateOfWork));
+      if (timeEntry.entryType == 'default') {
+        dispatch(updateTimeEntries(timeEntry, oldDateOfWork));
+      }
       return res.status;
     } catch (e) {
       return e.response.status;
@@ -102,7 +106,9 @@ export const deleteTimeEntry = timeEntry => {
   return async dispatch => {
     try {
       const res = await axios.delete(url);
-      dispatch(updateTimeEntries(timeEntry));
+      if (timeEntry.entryType == 'default') {
+        dispatch(updateTimeEntries(timeEntry));
+      }
       return res.status;
     } catch (e) {
       return e.response.status;

package.json

@@ -1,8 +1,5 @@
-import React, { useState } from 'react';
-import { Modal, ModalHeader, ModalBody } from 'reactstrap';
-
-const Inventory = props => {
-  return <React.Fragment></React.Fragment>;
-};
+function Inventory() {
+  return null;
+}
 
 export default Inventory;

src/actions/timeEntries.js

@@ -1 +1,5 @@
-export { default } from './Inventory';
+// Assuming Inventory is the default export from './Inventory'
+import Inventory from './Inventory';
+
+// Export it as a named export
+export default Inventory;