Merge pull request #62 from KPMP/develop

Release v1.5

.env.example

@@ -0,0 +1 @@
+REACT_APP_GLOBUS_INBOX=

.github/workflows/node.js.yml

@@ -0,0 +1,32 @@
+# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm install
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test

.gitignore

@@ -6,3 +6,4 @@ node_modules
 node_modules/*
 .project
 *.css
+.env

src/actions/Packages/packageActions.js

@@ -4,37 +4,30 @@ import { sendMessageToBackend } from '../Error/errorActions';
 
 const api = Api.getInstance();
 
-export const getPackages = () => {
-    return (dispatch) => {
-        api.get('/api/v1/packages?shouldExclude=false')
-            .then(res => {
-                dispatch(setPackages(res.data));
-            })
-            .catch(err => {
-                dispatch(sendMessageToBackend(err));
-            });
-    };
-}
+export const getPackagesStateless = () => {
+
+    return api.get('/api/v1/packages?shouldExclude=false')
+        .then(res=> {
+            return res.data
+        })
+        .catch(error => {
+            console.log(error)
+            alert("We hit an error getting packages...talk to a dev.")
+        });
+}   
 
 export const movePackageFiles = (packageId) => {
     return (dispatch) => {
         api.post('/api/v1/packages/' + packageId + '/files/move')
             .then(res => {
-                alert(res.data);
+                alert("Package marked as ready to move.");
             })
             .catch(err => {
                 alert("There was a problem moving the files.");
             });
     }
 }
 
-export const setPackages = (packages) => {
-    return {
-        type: actionNames.SET_PACKAGES,
-        payload: packages
-    }
-}
-
 export const setStateDisplayMap = (stateDisplayMap) => {
 	return {
 		type: actionNames.SET_STATE_DISPLAY_MAP,

src/actions/actionNames.js

@@ -2,7 +2,6 @@ const actionNames = {
 	CLEAR_VALIDATION_RESULT: 'CLEAR_VALIDATION_RESULT',
 	GET_PACKAGES: 'GET_PACKAGES',
 	RESET_STATE: 'RESET_STATE',
-	SET_PACKAGES: 'SET_PACKAGES',
 	SET_STATE_DISPLAY_MAP: 'SET_STATE_DISPLAY_MAP',
 	SET_VALIDATION_RESULT: 'SET_VALIDATION_RESULT'
 };

src/components/PackageDashboard/PackageDashboardPage.js

@@ -6,7 +6,7 @@ import PackageTable from './PackageTable';
 class PackageDashboardPage extends Component {
 
 	componentDidMount() {
-		this.props.getPackages();
+		this.props.getStateDisplay();
 	}
 
 	render() {
@@ -22,7 +22,6 @@ class PackageDashboardPage extends Component {
 				<Row className='mt-3'>
 					<Col sm={12}>
 					<PackageTable
-						packages={this.props.packages} 
 						movePackageFiles={this.props.movePackageFiles}
 						stateDisplayMap={this.props.stateDisplayMap}
 					/>