Merge pull request #107 from cesmii/feature/import-azure-function

fix - if import fails on first try, correct to allow a subsequent try

Author: scoxen1

frontend/src/views/shared/CloudLibraryImporter.js

@@ -122,8 +122,8 @@ export function CloudLibraryImporter(props) {
                     //,inlineMessages: [{ id: new Date().getTime(), severity: "danger", body: e.response.data ? e.response.data : `An error occurred saving the imported profile.`, isTimed: false, isImporting: false }]
                 });
                 setError({ show: true, caption: 'Import Error', message: e.response && e.response.data ? e.response.data : `A system error has occurred during the profile import. Please contact your system administrator.` });
-                console.log(generateLogMessageString('handleOnSave||saveFile||' + JSON.stringify(e), CLASS_NAME, 'error'));
-                console.log(e);
+                console.error(generateLogMessageString('handleOnSave||saveFile||' + JSON.stringify(e), CLASS_NAME, 'error'));
+                console.error(e);
             }
         })
 
@@ -135,6 +135,8 @@ export function CloudLibraryImporter(props) {
     const onErrorModalClose = () => {
         //console.log(generateLogMessageString(`onErrorMessageOK`, CLASS_NAME));
         setError({ show: false, caption: null, message: null });
+        //bubble up to parent so they can update state of imported items after failed attempt
+        if (props.onImportFailed) props.onImportFailed();
     }
 
     //-------------------------------------------------------------------

frontend/src/views/shared/CloudLibraryListGrid.js

@@ -120,6 +120,12 @@ function CloudLibraryListGrid(props) {
         if (props.onImportStarted) props.onImportStarted(importLogId);
     }
 
+    const onImportFailed = () => {
+        console.log(generateLogMessageString(`onImportFailed`, CLASS_NAME));
+        setCloudLibImportItems([]);
+        if (props.onImportFailed) props.onImportFailed();
+    }
+
     const onImportSelectedClick = () => {
         console.log(generateLogMessageString(`onImportSelectedClick`, CLASS_NAME));
         setImportConfirmModal({ show: true, items: _selectedCloudProfiles });
@@ -271,7 +277,7 @@ function CloudLibraryListGrid(props) {
                         <ErrorModal modalData={_error} callback={onErrorModalClose} />
                     */}
                     {_cloudLibImportItems.length > 0 &&
-                        <CloudLibraryImporter onImportStarted={onImportStarted} items={_cloudLibImportItems} bypassConfirmation={true} />
+                        <CloudLibraryImporter onImportStarted={onImportStarted} onImportFailed={onImportFailed} items={_cloudLibImportItems} bypassConfirmation={true} />
                     }
                 </div>
             </div>