Merged PR 2442: remove lodash dependecies on _.has

Related work items: #23754
This commit is contained in:
Robert Bond
2026-06-29 13:08:06 +00:00
parent 7b6af58065
commit ff699735c7
85 changed files with 870 additions and 952 deletions
+3 -3
View File
@@ -17,10 +17,10 @@
import axios from "axios";
import CryptoJS from "crypto-js";
import _ from "lodash";
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
import { consoleLogger } from "../../../actions/core/logger";
import { getToken } from "../../../actions/core/token";
import { hasOwn } from "../../../components/utils";
import { hashAPIPath } from "../../../actions/core/hash";
import { respondError, respondSuccess } from "../middleware/apiResponse";
const WORDKEY = process.env.HASHKEY;
@@ -152,9 +152,9 @@ export default async function ApiProxy(req, res) {
let dataStr;
_.has(data, "@odata.nextLink") == true &&
hasOwn(data, "@odata.nextLink") == true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
return respondSuccess(res, data);
} catch (error) {
consoleLogger(error);
+3 -3
View File
@@ -16,11 +16,11 @@
*/
import axios from "axios";
import _ from "lodash";
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
import { getToken } from "../../../actions/core/token";
import { consoleLogger } from "../../../actions/core/logger";
import { hashAPIPath } from "../../../actions/core/hash";
import { hasOwn } from "../../../components/utils";
import { respondError, respondSuccess } from "../middleware/apiResponse";
const WEBAPI_URL =
@@ -60,9 +60,9 @@ export default async function ApiProxy(req, res) {
);
let dataStr;
_.has(data, "@odata.nextLink") == true &&
hasOwn(data, "@odata.nextLink") == true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
return respondSuccess(res, data);
} catch (error) {
consoleLogger(error);
@@ -47,10 +47,10 @@
// * description: Success
// */
import _ from "lodash";
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
import { hasOwn } from "../../../components/utils";
import { RELAY_POLICY_SEARCH_PAGED } from "../middleware/relayPolicyPresets";
export default async function ApiProxy(req, res) {
@@ -109,7 +109,7 @@ export default async function ApiProxy(req, res) {
var queryString = "";
queryString +=
_.has(searchString, "q") && searchString.q != null
hasOwn(searchString, "q") && searchString.q != null
? "(contains(title, '" +
searchString.q.replace(/\'/g, "''") +
"') or contains(ticketnumber,'" +
@@ -118,25 +118,25 @@ export default async function ApiProxy(req, res) {
: "";
queryString +=
_.has(searchString, "lpaRef") && searchString.lpaRef != null
hasOwn(searchString, "lpaRef") && searchString.lpaRef != null
? "(contains(pinswg_lpareference, '" +
searchString.lpaRef.replace(/\'/g, "''") +
"')) and"
: "";
queryString +=
(_.has(searchString, "lpa") || _.has(searchString, "LPA")) &&
(hasOwn(searchString, "lpa") || hasOwn(searchString, "LPA")) &&
searchString.lpa != null
? " _pinswg_associatedlpa_value eq " + searchString.lpa + " and"
: "";
queryString +=
_.has(searchString, "apt") && searchString.apt != null
hasOwn(searchString, "apt") && searchString.apt != null
? " pinswg_appealcasetype eq " + searchString.apt + " and"
: "";
queryString +=
_.has(searchString, "statuscode") && searchString.statuscode != null
hasOwn(searchString, "statuscode") && searchString.statuscode != null
? " statuscode eq " + searchString.statuscode + " and"
: "";
@@ -152,7 +152,7 @@ export default async function ApiProxy(req, res) {
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
: "");
if (_.has(searchString, "projecttype")) {
if (hasOwn(searchString, "projecttype")) {
const sipsFilters = [
"pinswg_sips_pinswg_sipsprojecttype/any(pt: pt/pinswg_sipsprojecttypeid eq " +
searchString.projecttype +
@@ -215,7 +215,7 @@ export default async function ApiProxy(req, res) {
relayPolicy,
transformData: (data) => {
let dataStr;
_.has(data, "@odata.nextLink") === true &&
hasOwn(data, "@odata.nextLink") === true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
+3 -3
View File
@@ -16,8 +16,8 @@
* description: Success
*/
import _ from "lodash";
import { azureHeadersPaged } from "../../../actions/core/headers";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -30,9 +30,9 @@ export default async function ApiProxy(req, res) {
res,
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
transformData: (data) => {
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
@@ -9,9 +9,9 @@
* 200:
* description: Success
*/
import _ from "lodash";
import { azureHeadersPaged } from "../../../actions/core/headers";
import { getSelectQuery } from "../../../actions/selectQueryTypes";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -41,9 +41,9 @@ export default async function ApiProxy(req, res) {
res,
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
transformData: (data) => {
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
@@ -41,8 +41,7 @@
* 200:
* description: Success
*/
import _ from "lodash";
import { hasOwn } from "../../../components/utils";
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -96,9 +95,9 @@ export default async function ApiProxy(req, res) {
requestOptionsBuilder: (accessToken) =>
azureHeadersPagedCustom(accessToken, showNumberOfRecords),
transformData: (data) => {
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
@@ -16,8 +16,8 @@
* description: Success
*/
import _ from "lodash";
import { azureHeadersPaged } from "../../../actions/core/headers";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -47,9 +47,9 @@ export default async function ApiProxy(req, res) {
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
transformData: (data) => {
let dataStr;
_.has(data, "@odata.nextLink") === true &&
hasOwn(data, "@odata.nextLink") === true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
return data;
},
@@ -29,10 +29,10 @@
* description: Success
*/
import _ from "lodash";
import { azureHeaders, azureHeadersPaged } from "../../../actions/core/headers";
import { getSelectQuery } from "../../../actions/selectQueryTypes";
import { getNavigationPropertyByPrimaryAttribute } from "../../../components/utils";
import { hasOwn } from "../../../components/utils";
import { respondError, respondSuccess } from "../middleware/apiResponse";
import { relayGetData } from "../middleware/relayForwarding";
@@ -138,7 +138,7 @@ export default async function ApiProxy(req, res) {
additionalLPAs
}));
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
@@ -42,10 +42,10 @@
* description: Success
*/
import _ from "lodash";
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
import { hasOwn } from "../../../components/utils";
import { RELAY_POLICY_SEARCH_PAGED } from "../middleware/relayPolicyPresets";
export default async function ApiProxy(req, res) {
@@ -121,9 +121,9 @@ export default async function ApiProxy(req, res) {
azureHeadersPagedCustom(accessToken, showNumberOfRecords),
relayPolicy,
transformData: (data) => {
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
+3 -3
View File
@@ -10,7 +10,7 @@
* description: Success
*/
import _ from "lodash";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -34,9 +34,9 @@ export default async function ApiProxy(req, res) {
queryUrl,
res,
transformData: (data) => {
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
+3 -3
View File
@@ -10,7 +10,7 @@
* description: Success
*/
import _ from "lodash";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -31,9 +31,9 @@ export default async function ApiProxy(req, res) {
queryUrl,
res,
transformData: (data) => {
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return [data];
+3 -3
View File
@@ -1,5 +1,5 @@
import _ from "lodash";
import { azureHeaders } from "../../../actions/core/headers";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -14,9 +14,9 @@ export default async function ApiProxy(req, res) {
transformData: (data) => {
let dataStr;
_.has(data, "@odata.nextLink") === true &&
hasOwn(data, "@odata.nextLink") === true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
return data;
},
+3 -3
View File
@@ -1,5 +1,5 @@
import _ from "lodash";
import { azureHeadersPaged } from "../../../actions/core/headers";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -29,9 +29,9 @@ export default async function ApiProxy(req, res) {
requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
transformData: (data) => {
let dataStr;
_.has(data, "@odata.nextLink") === true &&
hasOwn(data, "@odata.nextLink") === true &&
((dataStr = JSON.stringify(data["@odata.nextLink"])),
(data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
(data["@odata.nextLink"] = dataStr.split("/v9.2/")[1]));
return data;
},
@@ -19,6 +19,7 @@
import CryptoJS from "crypto-js";
import _ from "lodash";
import { azureHeadersPaged } from "../../../actions/core/headers";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -70,9 +71,9 @@ export default async function ApiProxy(req, res) {
);
});
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
@@ -43,8 +43,8 @@
*/
import CryptoJS from "crypto-js";
import _ from "lodash";
import { azureHeadersPagedCustom } from "../../../actions/core/headers";
import { hasOwn } from "../../../components/utils";
import { respondError } from "../middleware/apiResponse";
import { relayGet } from "../middleware/relayForwarding";
@@ -175,9 +175,9 @@ export default async function ApiProxy(req, res) {
);
});
if (_.has(data, "@odata.nextLink") === true) {
if (hasOwn(data, "@odata.nextLink") === true) {
const dataStr = JSON.stringify(data["@odata.nextLink"]);
data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
data["@odata.nextLink"] = dataStr.split("/v9.2/")[1];
}
return data;
+1 -1
View File
@@ -45,7 +45,7 @@ export default async function ApiProxy(req, res) {
const crmUrl = "https://" + process.env.CRMURL;
const data = {
"@odata.id": crmUrl + "/api/data/v8.2/contacts(" + contactid + ")"
"@odata.id": crmUrl + "/api/data/v9.2/contacts(" + contactid + ")"
};
const config = {
+1 -1
View File
@@ -30,4 +30,4 @@ pinswg_ldp
pinswg_maintenanceoflands217
pinswg_electricityact
https://devcrm2016.llcdt.gov.wales/DVPINS/api/data/v8.2/EntityDefinitions(LogicalName='incident')/Attributes(LogicalName='pinswg_appealcasetype')/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=GlobalOptionSet($select=Options)
https://devcrm2016.llcdt.gov.wales/DVPINS/api/data/v9.2/EntityDefinitions(LogicalName='incident')/Attributes(LogicalName='pinswg_appealcasetype')/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=GlobalOptionSet($select=Options)