Merge branch 'develop'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "orion-web",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "private": true,
   "devDependencies": {
     "acorn": "^7.2.0",
@@ -17,7 +17,7 @@
     "@fortawesome/free-solid-svg-icons": "5.11.2",
     "@fortawesome/react-fontawesome": "0.1.7",
     "antd": "3.26.0",
-    "axios": "0.19.0",
+    "axios": "0.21.1",
     "bootstrap-css-only": "4.3.1",
     "bowser": "2.7.0",
     "braces": "3.0.2",

src/actions/Error/errorActions.js

@@ -15,7 +15,11 @@ export const handleError = (statusCode) => {
 };
 
 export const sendMessageToBackend = (error) => {
-
+	if (!error.status) {
+		return (dispatch) => {
+			dispatch(window.location.reload());
+		}
+	}
 	if (error.response && error.response.status && error.response.status >= 400) {
 		return (dispatch) => {
 			let href = window.location.href;

src/actions/userActions.js

@@ -5,14 +5,14 @@ import { sendMessageToBackend } from './Error/errorActions';
  const api = Api.getInstance();	
 
  export const getUserInformation = () => {	
-	return (dispatch) => {	
-		api.get('/api/v1/userInformation')	
-			.then(res => {	
+	return (dispatch) => {
+		api.get('/api/v1/userInformation')
+			.then(res => {
 				dispatch(setUserInformation(res.data));	
 			})	
 			.catch(err => {
-				dispatch(sendMessageToBackend(err));	
-	        });	
+				dispatch(sendMessageToBackend(err));
+	        });
 	};	
 } 	
 

src/components/Packages/dataTypeIconHelper.js

@@ -30,6 +30,12 @@ export const iconDataTypes = new Map(
                 iconImage: 'icon_transcriptomics_132x132.png'
             }
         ],
+        ['Epigenetics',
+            {
+                iconDataType: 'Epigenetics',
+                iconImage: 'icon_epigenetics.png'
+            }
+        ],
         ['Pilot 3',
         	{
         		iconDataType: 'Pilot3',

src/components/Packages/dataTypeIconHelper.test.js

@@ -8,7 +8,8 @@ describe('getDataTypeIconInfo', () => {
 		{"iconType":"Imaging","packageTypes":["3-D Tissue Imaging","Multiplex ISH","CODEX","Whole Slide Images"]},
 		{"iconType":"Proteomics","packageTypes":["Bulk Proteomics","Sub-segmental Proteomics","Near-single-cell Proteomics"]},
 		{"iconType":"Pilot 3","packageTypes":["Pilot 3 Receipt Picture"]},
-		{"iconType":"Other","packageTypes":["DNA Methylation","Other"]}];
+		{"iconType":"Epigenetics","packageTypes":["ATAC-seq"]},
+		{"iconType":"Other","packageTypes":["Other"]}];
 
 	describe("Other types", () => {
 		it('should return Other when not in list', () => {
@@ -19,9 +20,6 @@ describe('getDataTypeIconInfo', () => {
 	    	it('should return Other when Other', () => {
 	    		expect(getDataTypeIconInfo(packageTypeIcons, "Other").iconDataType).toBe("Other");
 	    	});
-	    	it('should return Other when DNA Methylation', () => {
-	    		expect(getDataTypeIconInfo(packageTypeIcons, "DNA Methylation").iconDataType).toBe("Other");
-	    	});
     });
 
     describe("Imaging types", () => {
@@ -84,5 +82,6 @@ describe('getDataTypeIconInfo', () => {
 	    	it('should return Transcriptomics when Sub-segment RNA-Seq', () => {
 	    		expect(getDataTypeIconInfo(packageTypeIcons, "Sub-segmental RNA-Seq").iconDataType).toBe("Transcriptomics");
 	    	});
-    })
+    });
+
 });