Skip to content

Commit e6f6699

Browse files
committed
Merge branch 'release' of github.com:appsmithorg/appsmith into feat/20642-file-upload-bloat-removal
2 parents 2af0e67 + 425376f commit e6f6699

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Diff for: app/client/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else
1515
fi
1616

1717
# build cra app
18-
REACT_APP_SENTRY_RELEASE=$GIT_SHA REACT_APP_CLIENT_LOG_LEVEL=ERROR EXTEND_ESLINT=true craco --max-old-space-size=4096 build --config craco.build.config.js
18+
REACT_APP_SENTRY_RELEASE=$GIT_SHA REACT_APP_CLIENT_LOG_LEVEL=ERROR EXTEND_ESLINT=true craco --max-old-space-size=7168 build --config craco.build.config.js
1919

2020
if [ "$GITHUB_REPOSITORY" == "appsmithorg/appsmith-ee" ]; then
2121
echo "Deleting sourcemaps for EE"

Diff for: app/client/cypress/integration/SanitySuite/Datasources/Airtable_Basic_Spec.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe("Validate Airtable Ds", () => {
3434

3535
_.dataSources.RunQuery();
3636
cy.get("@postExecute").then((resObj: any) => {
37-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
37+
jsonSpecies = resObj.response.body.data.body;
3838
jsonSpecies.records.forEach((record: { fields: any }) => {
3939
specieslist.push(record.fields.Species_ID);
4040
});
@@ -53,7 +53,7 @@ describe("Validate Airtable Ds", () => {
5353

5454
_.dataSources.RunQuery();
5555
cy.get("@postExecute").then((resObj: any) => {
56-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
56+
jsonSpecies = resObj.response.body.data.body;
5757
const hasOnlyAllowedKeys = jsonSpecies.records.every((record: any) => {
5858
const fieldKeys = Object.keys(record.fields);
5959
return (
@@ -79,7 +79,7 @@ describe("Validate Airtable Ds", () => {
7979
});
8080
_.dataSources.RunQuery();
8181
cy.get("@postExecute").then((resObj: any) => {
82-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
82+
jsonSpecies = resObj.response.body.data.body;
8383
expect(jsonSpecies.records.length).to.eq(11); //making sure only 11 record fields are returned
8484
});
8585

@@ -91,7 +91,7 @@ describe("Validate Airtable Ds", () => {
9191
});
9292
_.dataSources.RunQuery();
9393
cy.get("@postExecute").then((resObj: any) => {
94-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
94+
jsonSpecies = resObj.response.body.data.body;
9595
expect(jsonSpecies.records.length).to.eq(6); //making sure only 6 record fields are returned, honouring the PageSize
9696

9797
//Validating offset
@@ -104,7 +104,7 @@ describe("Validate Airtable Ds", () => {
104104
_.dataSources.RunQuery();
105105

106106
cy.get("@postExecute").then((resObj: any) => {
107-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
107+
jsonSpecies = resObj.response.body.data.body;
108108
expect(jsonSpecies.records.length).to.eq(5); //making sure only remaining records are returned
109109
});
110110
});
@@ -124,7 +124,7 @@ describe("Validate Airtable Ds", () => {
124124
_.dataSources.RunQuery();
125125

126126
cy.get("@postExecute").then((resObj: any) => {
127-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
127+
jsonSpecies = resObj.response.body.data.body;
128128
const allRecordsWithRodentTaxa = jsonSpecies.records.filter(
129129
(record: { fields: { Taxa: string } }) =>
130130
record.fields.Taxa === "Rodent",
@@ -158,7 +158,7 @@ describe("Validate Airtable Ds", () => {
158158
_.dataSources.RunQuery();
159159

160160
cy.get("@postExecute").then((resObj: any) => {
161-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
161+
jsonSpecies = resObj.response.body.data.body;
162162
const sorted = jsonSpecies.records.every(
163163
(record: { fields: { Species_ID: string } }, i: number) => {
164164
if (i === 0) {
@@ -193,7 +193,7 @@ describe("Validate Airtable Ds", () => {
193193
_.dataSources.RunQuery();
194194

195195
cy.get("@postExecute").then((resObj: any) => {
196-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
196+
jsonSpecies = resObj.response.body.data.body;
197197
const sorted = jsonSpecies.records.every(
198198
(record: { fields: { Species_ID: string } }, i: number) => {
199199
if (i === 0) {
@@ -232,7 +232,7 @@ describe("Validate Airtable Ds", () => {
232232
_.dataSources.RunQuery();
233233

234234
cy.get("@postExecute").then((resObj: any) => {
235-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
235+
jsonSpecies = resObj.response.body.data.body;
236236
const isJSONValid = jsonSpecies.records.every(
237237
(record: { fields: { Species_ID: any } }) => {
238238
const speciesID = record.fields.Species_ID;
@@ -269,7 +269,7 @@ describe("Validate Airtable Ds", () => {
269269
_.dataSources.RunQuery();
270270

271271
cy.get("@postExecute").then((resObj: any) => {
272-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
272+
jsonSpecies = resObj.response.body.data.body;
273273
//cy.log("jsonSpecies is"+ jsonSpecies)
274274
expect(jsonSpecies.records.length).to.eq(1); //making sure only inserted record is returned
275275

@@ -289,7 +289,7 @@ describe("Validate Airtable Ds", () => {
289289
_.dataSources.RunQuery();
290290

291291
cy.get("@postExecute").then((resObj: any) => {
292-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
292+
jsonSpecies = resObj.response.body.data.body;
293293
const hasOnlyInsertedRecord = () => {
294294
return (
295295
jsonSpecies.fields.Species_ID === "SF" &&
@@ -325,7 +325,7 @@ describe("Validate Airtable Ds", () => {
325325
_.dataSources.RunQuery();
326326

327327
cy.get("@postExecute").then((resObj: any) => {
328-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
328+
jsonSpecies = resObj.response.body.data.body;
329329
const hasOnlyUpdatedRecord = () => {
330330
return (
331331
jsonSpecies.records[0].fields.Species_ID === "SG" &&
@@ -348,7 +348,7 @@ describe("Validate Airtable Ds", () => {
348348
_.dataSources.RunQuery();
349349

350350
cy.get("@postExecute").then((resObj: any) => {
351-
jsonSpecies = JSON.parse(resObj.response.body.data.body);
351+
jsonSpecies = resObj.response.body.data.body;
352352
expect(jsonSpecies.deleted).to.be.true;
353353
});
354354
});

0 commit comments

Comments
 (0)