updated query for my cases and long appealtypes

actions/index.js

@@ -19,22 +19,21 @@ const API_PATH = "/api/data/v8.2/";
 
 //const WEBAPI_URL = "https://devcrm2016.llcdt.gov.wales/DVPINS" + API_PATH;
 
-const WEBAPI_URL = "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+const WEBAPI_URL =
+    process.env.RELAY_ROOT ||
+    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 const agent = new https.Agent({
     rejectUnauthorized: false,
 });
 
 export const getSASToken = () => {
-    //     var ns = "dev-pedw-ns.servicebus.windows.net";
+    var m_ResourceURI =
-    //     path = "dev-pedw-hc";
+        process.env.RELAYURI || "dev-pedw-ns.servicebus.windows.net";
-    //     keyrule = "devpedwnspolicy";
+    var m_Path = process.env.RELAYPATH || "dev-pedw-hc";
-    //     key = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=";
+    var m_SasKey =
-
+        process.env.SASKEY || "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=";
-    var m_ResourceURI = "dev-pedw-ns.servicebus.windows.net";
+    var m_SasKeyName = process.env.SASKEYNAME || "devpedwnspolicy";
-    var m_Path = "dev-pedw-hc";
-    var m_SasKey = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=";
-    var m_SasKeyName = "devpedwnspolicy";
 
     var encodedResourceUri = encodeURIComponent(
         "https://" + m_ResourceURI + "/" + m_Path + "/"
@@ -67,7 +66,7 @@ export const getSASToken = () => {
 };
 
 const accessToken =
-    "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IlVXelVaa0U3OEx0NVBGRkJ0LV9seVdoMjdjTSIsImtpZCI6IlVXelVaa0U3OEx0NVBGRkJ0LV9seVdoMjdjTSJ9.eyJhdWQiOiJodHRwczovL2RldmNybTIwMTYubGxjZHQuZ292LndhbGVzLyIsImlzcyI6Imh0dHA6Ly9mcy50ZXN0Lmdvdi53YWxlcy9hZGZzL3NlcnZpY2VzL3RydXN0IiwiaWF0IjoxNjMxMjU4ODAzLCJuYmYiOjE2MzEyNTg4MDMsImV4cCI6MTYzMTI4NzYwMywidXBuIjpbIlJvYmVydC5Cb25kQHRlc3QuZ292LndhbGVzIiwicm9iZXJ0LmJvbmRAdGVzdC5nb3Yud2FsZXMiXSwicHJpbWFyeXNpZCI6IlMtMS01LTIxLTE4MDA4NDIwNzYtMjQ1NTYwNjU5LTQyMTU3NzU0NjktMTY2MjgiLCJ1bmlxdWVfbmFtZSI6IlhNXFxCb25kUiIsImFwcHR5cGUiOiJQdWJsaWMiLCJhcHBpZCI6IjQyN2ZhNzljLWI1ZmMtNDJhZC04M2Q0LTQxMGIwMzk0OGFiNiIsImF1dGhtZXRob2QiOiJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvYXV0aGVudGljYXRpb25tZXRob2Qvd2luZG93cyIsImF1dGhfdGltZSI6IjIwMjEtMDktMTBUMDc6MjY6MzQuMjI0WiIsInZlciI6IjEuMCJ9.XFymIQJVavP-7-8V7LdoYDD4836Z-aSxveMQDD1P3y_9M3Tiy3zINiLxCbSr8JaymFOuLOzWcnNXwh7HHZKY6gDC6tD1ALVKCBXmgTDaoR9j7XAOxSUaRl6ArIecd7o6UcqsHAvfpb5zu-ZIy0KxV9PFRxY4JHF_tfLAeAMnqIBq-yDrNBOlbg4Kd9VuAbAK5lNWp-BiMIzMqZUIrmD9HjwE17SWaEnApCNqTcGZ4h2EqDBWgqKae7B1AzoV_7mfp7CscLUBLGdbM-XsXw3t_AVc0xDHoOMuWfsoMfioJONoMsPqTNUY7VQev1pMrFDEFN-jqP4yqSdNlev6H47SCg";
+    "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsIng1dCI6IlVXelVaa0U3OEx0NVBGRkJ0LV9seVdoMjdjTSIsImtpZCI6IlVXelVaa0U3OEx0NVBGRkJ0LV9seVdoMjdjTSJ9.eyJhdWQiOiJodHRwczovL2RldmNybTIwMTYubGxjZHQuZ292LndhbGVzLyIsImlzcyI6Imh0dHA6Ly9mcy50ZXN0Lmdvdi53YWxlcy9hZGZzL3NlcnZpY2VzL3RydXN0IiwiaWF0IjoxNjMyMTIxMjkxLCJuYmYiOjE2MzIxMjEyOTEsImV4cCI6MTYzMjE1MDA5MSwidXBuIjpbIlJvYmVydC5Cb25kQHRlc3QuZ292LndhbGVzIiwicm9iZXJ0LmJvbmRAdGVzdC5nb3Yud2FsZXMiXSwicHJpbWFyeXNpZCI6IlMtMS01LTIxLTE4MDA4NDIwNzYtMjQ1NTYwNjU5LTQyMTU3NzU0NjktMTY2MjgiLCJ1bmlxdWVfbmFtZSI6IlhNXFxCb25kUiIsImFwcHR5cGUiOiJQdWJsaWMiLCJhcHBpZCI6IjQyN2ZhNzljLWI1ZmMtNDJhZC04M2Q0LTQxMGIwMzk0OGFiNiIsImF1dGhtZXRob2QiOiJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvYXV0aGVudGljYXRpb25tZXRob2Qvd2luZG93cyIsImF1dGhfdGltZSI6IjIwMjEtMDktMjBUMDc6MDE6MzEuNDYzWiIsInZlciI6IjEuMCJ9.W0ID2nCBYVxh8T1eQqWKk2Wh45kRbRzCICfzrZNAs-4u54yl0UJUcVihyI8EBmQeALCEc5eY99DjK0gaqzCdJqxbxol8yk5LrFvhV5UkCiZ7SO2Wq1cLReWHVsgz39qBtrZ8vlqqZsv7DsEaRJQbtj8Djnx26Wb_kcNu-tuXwUBF0uR5GLFFvJfM3PzkRCY-ZPOTbvPTb73oN_NKe6BrsVjyaR9xSXsRJjgHPmJgWgnvq-2X0Dj7LCwXSEygDDOGlF1yqqN0Lv6qplhQoH-heZlC1K6qe_92nHPswXag6uN5nxTmk1Qw6zJt_aHMnXdwa18ghh4hGx5R0Jz53X113Q";
 
 const SASToken = getSASToken();
 
@@ -105,6 +104,17 @@ const azureHeaders = {
     },
 };
 
+// const azureHeaders = {
+//     headers: {
+//         "OData-MaxVersion": "4.0",
+//         "OData-Version": "4.0",
+//         "Accept": "application/json",
+//         "Prefer": 'odata.include-annotations="*",return=representation',
+//         "Content-Type": "application/json",
+//         "Authorization": "Bearer " + accessToken,
+//     },
+// };
+
 export const getBasicSearch = (searchString) => {
     return axios
         .get(

components/case/representation/index copy.js

@@ -93,7 +93,7 @@ let MakeRepresentation = (props) => {
             ? setRepresentationCapacity(false)
             : setRepresentationCapacity(
                   formObj["representationForm"].values.representationCapacity
-                      .replace(/[\s\-\+\(\)\,\/]/g, "")
+                      .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                       .toLowerCase()
               );
 

components/case/representation/index.js

@@ -107,7 +107,7 @@ let MakeRepresentation = (props) => {
               )
             ? false
             : formObj["representationForm"].values.representationCapacity
-                  .replace(/[\s\-\+\(\)\,\/]/g, "")
+                  .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                   .toLowerCase();
     };
 
@@ -215,14 +215,14 @@ let MakeRepresentation = (props) => {
         // console.log(_.isEmpty(currentView.representationCapacity));
         // console.log(
         //     values.representationCapacity
-        //         .replace(/[\s\-\+\(\)\,\/]/g, "")
+        //         .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
         //         .toLowerCase() == currentView.representationCapacity
         // );
 
         _.isEmpty(currentView.representationCapacity)
             ? setRepresentationCapacity(
                   values.representationCapacity
-                      .replace(/[\s\-\+\(\)\,\/]/g, "")
+                      .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                       .toLowerCase()
               )
             : setRepresentationSubmit(true);

components/case/summary.js

@@ -21,7 +21,7 @@ const CaseSummary = (props) => {
     } = props;
 
     let setCaseQueryObj = props[currentType];
-    let setCaseDetailsObj = props[currentType][currentType + "Details"];
+    let setCaseDetailsObj = props[currentType + "Details"];
 
     var casesObj = {};
 

components/newappeal/complete.js

@@ -22,7 +22,7 @@ let CompleteAppeal = (props) => {
             "pinswg_" +
             props.appealType.caseReference[
                 "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
-            ].replace(/[\s\-\+\(\)\,\&\.]/g, "") +
+            ].replace(/(\band|[\s\-\+\(\)\,\&])/g, "") +
             "Ids";
 
         Object.assign(updateBody, {
@@ -45,7 +45,7 @@ let CompleteAppeal = (props) => {
                 props.appealType.caseReference[
                     "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                 ]
-                    .replace(/[\s\-\+\(\)\,\&\.]/g, "")
+                    .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                     .toLowerCase()
         );
 
@@ -54,7 +54,7 @@ let CompleteAppeal = (props) => {
                 props.appealType.caseReference[
                     "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                 ]
-                    .replace(/[\s\-\+\(\)\,\&\.]/g, "")
+                    .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                     .toLowerCase()
         );
 

pages/case.js

@@ -39,6 +39,7 @@ const Home = (props) => {
                     <Case
                         props={props}
                         myCases={props.myCases.myCases}
+                        myCasesDetails={props.myCases.myCasesDetails}
                         searchResultsObj={
                             props.searchResultsObj.searchResultsObj
                         }

pages/myportal/index.js

@@ -102,7 +102,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
             cookies.set("pinsUser", "f8b454ed-eded-eb11-aac7-00224800be9c", {
                 httpOnly: true, // true by default
             });
-
+            //console.log("my cases ", myCases);
             const [
                 myCasesDetails,
                 // myRepresentationsDetails,
@@ -143,8 +143,7 @@ const getFormCollection = (formtype) => {
 };
 
 const getDetails = (resultsObj) => {
-    // console.log(resultsObj);
+    //console.log(resultsObj);
-
     let detailsArr = [];
     resultsObj = resultsObj.value;
     const detailsObj = resultsObj.map((searchDetail, index) => {
@@ -158,8 +157,9 @@ const getDetails = (resultsObj) => {
                             searchDetail[
                                 "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                             ]
-                                .replace(/[\s\-\+\(\)\,\&\.]/g, "")
+                                .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                                 .toLowerCase()
+                                .slice(0, 39)
                     ),
                     searchDetail.ticketnumber
                 )

pages/searchresults.js

@@ -99,7 +99,7 @@ const getSearchDetails = (searchResultsObj) => {
                             searchDetail[
                                 "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                             ]
-                                .replace(/[\s\-\+\(\)\,\&\.]/g, "")
+                                .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
                                 .toLowerCase()
                     ),
                     searchDetail.ticketnumber