Merge branch 'get-progress-from-blob' into migrate-auth-db-to-sql-server

actions/index.js

@@ -1154,3 +1154,21 @@ export const downloadBlob = (containerName, blobName) => {
             console.log("this serror", error);
         });
 };
+
+export const getProgressFromBlob = async (containerName) => {
+    console.log("cont:", containerName);
+    try {
+        const res = await axios.get(
+            BASE_URL +
+                "/api/file/getprogressobjblob?container=" +
+                containerName.toLowerCase() +
+                hashAPIPath(
+                    "/api/file/getprogressobjblob?container=" +
+                        containerName.toLowerCase()
+                )
+        );
+        return res.data;
+    } catch (error) {
+        console.log("this serror", error);
+    }
+};

components/myportal.js

@@ -21,7 +21,7 @@ const MyPortal = (props) => {
     const { locale } = router;
 
     const handleLogout = () => {
-        console.log("////////////\n" + "logout" + "\n////////////");
+        console.info("////////////\n" + "logout" + "\n////////////");
         destroyCookie({}, "pinsUser"),
             window.localStorage.clear(),
             //router.replace(props.ggLogout);

components/search/dnssearchresults.js

@@ -408,35 +408,54 @@ const DNSSearchResults = (props) => {
                                                           )[0]
                                                     : ""
                                                 : ""}
-
                                             {_.has(
                                                 detailsObj,
                                                 "pinswg_siteaddressline1"
                                             )
                                                 ? detailsObj.pinswg_siteaddressline1
                                                 : ""}
-                                            <br />
                                             {_.has(
                                                 detailsObj,
                                                 "pinswg_siteaddressline1"
+                                            ) &&
+                                                detailsObj.pinswg_siteaddressline1 !=
+                                                    null && <br />}
+                                            {_.has(
+                                                detailsObj,
+                                                "pinswg_siteaddressline2"
                                             )
                                                 ? detailsObj.pinswg_siteaddressline2
                                                 : ""}
-                                            <br />
+                                            {_.has(
+                                                detailsObj,
+                                                "pinswg_siteaddressline2"
+                                            ) &&
+                                                detailsObj.pinswg_siteaddressline2 !=
+                                                    null && <br />}
                                             {_.has(
                                                 detailsObj,
                                                 "pinswg_siteaddressline1"
                                             )
                                                 ? detailsObj.pinswg_siteaddresstown
                                                 : ""}
-                                            <br />
+                                            {_.has(
+                                                detailsObj,
+                                                "pinswg_siteaddresstown"
+                                            ) &&
+                                                detailsObj.pinswg_siteaddresstown !=
+                                                    null && <br />}
                                             {_.has(
                                                 detailsObj,
                                                 "pinswg_siteaddressline1"
                                             )
                                                 ? detailsObj.pinswg_siteaddresscounty
                                                 : ""}
-                                            <br />
+                                            {_.has(
+                                                detailsObj,
+                                                "pinswg_siteaddresscounty"
+                                            ) &&
+                                                detailsObj.pinswg_siteaddresscounty !=
+                                                    null && <br />}
                                             {_.has(
                                                 detailsObj,
                                                 "pinswg_siteaddressline1"

components/timeout/index.js

@@ -39,7 +39,7 @@ const TimeOut = (props) => {
     };
 
     const handleLogout = () => {
-        console.log("////////////\n" + "logout" + "\n////////////");
+        console.info("////////////\n" + "logout" + "\n////////////");
         destroyCookie({}, "pinsUser"),
             window.localStorage.clear(),
             signOut({ callbackUrl: "/logout" });

pages/myportal/[appealtypes].js

@@ -12,6 +12,7 @@ import {
     getPickLists,
     getPartSavedAppeal,
     getFilesFromBlob,
+    getProgressFromBlob,
 } from "../../actions";
 import { getProviderConfig } from "../../actions/govgateway";
 import Breadcrumbs from "../../components/breadcrumbs";
@@ -36,6 +37,7 @@ import { setForm } from "../../store/formData/action";
 import { getGovGatewayConfig } from "../../store/govgateway/action";
 import { wrapper } from "../../store/store";
 import { getPartSavedDetails } from "../../components/utils";
+import { getProgressBlobs } from "../../actions/azurestorage";
 
 let Home = (props) => {
     const { footerLinks, pages, formData } = props;
@@ -62,7 +64,7 @@ let Home = (props) => {
 
     var tabs = xpath.select("//form/tabs/tab[*]", doc);
 
-    let optionsStr = props.appealType.appealTypeOptions.value;
+    let optionsStr = props.appealType.appealTypeOptions.value || {};
 
     // let selectedObj = jsonpath.query(optionsStr, "$..value");
 
@@ -215,38 +217,50 @@ export const getServerSideProps = wrapper.getServerSideProps(
         console.log("the query", query.appealtypes);
         let loggedInUser = cookies.pinsUser;
 
-        const [appealTypeData, mandatoryFieldsData, pickListData, blobList] =
+        const [
-            await Promise.all([
+            appealTypeData,
-                await getAppealsTypes(),
+            mandatoryFieldsData,
-                await getMandatoryFields(query.appealtypes),
+            pickListData,
-                await getPickLists(query.appealtypes),
+            blobList,
-                await getFilesFromBlob(query.casereference),
+            blobProgress,
-            ]);
+        ] = await Promise.all([
+            await getAppealsTypes(),
+            await getMandatoryFields(query.appealtypes),
+            await getPickLists(query.appealtypes),
+            await getFilesFromBlob(query.casereference),
+            await getProgressFromBlob(query.casereference),
+        ]);
 
-        let searchResultsObj = await getPartSavedAppeal(query.casereference);
+        console.log("has blobprgess:", blobProgress);
-        //console.log("eeee:", searchResultsObj);
-        let searchDetailsObj = await getPartSavedDetails(searchResultsObj);
 
-        searchDetailsObj = searchDetailsObj[0].value[0];
+        //
+        // Removed to make progress from Blob not CRM
+        //
 
-        Object.keys(searchDetailsObj).forEach((key) => {
+        // let searchResultsObj = await getPartSavedAppeal(query.casereference);
-            if (searchDetailsObj[key] === null) {
+        // //console.log("eeee:", searchResultsObj);
-                delete searchDetailsObj[key];
+        // let searchDetailsObj = await getPartSavedDetails(searchResultsObj);
-            }
+
-        });
+        // searchDetailsObj = searchDetailsObj[0].value[0];
+
+        // Object.keys(searchDetailsObj).forEach((key) => {
+        //     if (searchDetailsObj[key] === null) {
+        //         delete searchDetailsObj[key];
+        //     }
+        // });
 
         //console.log("appeal:", searchDetailsObj);
 
-        searchDetailsObj = JSON.stringify(searchDetailsObj);
+        // searchDetailsObj = JSON.stringify(searchDetailsObj);
-        searchDetailsObj = searchDetailsObj.replace(/:true/gm, `:"Yes"`);
+        // searchDetailsObj = searchDetailsObj.replace(/:true/gm, `:"Yes"`);
-        searchDetailsObj = searchDetailsObj.replace(/:false/gm, `:"No"`);
+        // searchDetailsObj = searchDetailsObj.replace(/:false/gm, `:"No"`);
-        searchDetailsObj = JSON.parse(searchDetailsObj);
+        // searchDetailsObj = JSON.parse(searchDetailsObj);
 
         let caseReference = {};
 
         caseReference.ticketnumber = query.casereference;
         caseReference.incidentid = query.inid;
-        caseReference.caseDetails = searchDetailsObj;
+        caseReference.caseDetails = blobProgress; //searchDetailsObj;
 
         var path = require("path");
         const configDirectory = path.resolve(process.cwd(), "data/formsxml");