Skip to content

20/01 Daily Promotion #38765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btsgh merged 9 commits into from
Jan 20, 2025
Merged

20/01 Daily Promotion #38765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41a5110
chore: disable sourcemaps for non-prod builds and cleanup craco confi…
KelvinOm Jan 17, 2025
24a7fa5
feat: update autocomplete sorting (#38690)
devin-ai-integration[bot] Jan 17, 2025
5aeee41
chore: Make Split screen feature GA (#38731)
hetunandu Jan 17, 2025
19002c3
Updated Label Config
Nikhil-Nandagopal Jan 17, 2025
86bddaa
fix: JSObject diff error when actions are missing (#38572)
ashit-rath Jan 18, 2025
fd72197
test: adding test for page functionality (#38538)
NandanAnantharamu Jan 18, 2025
db75a6c
fix: console log update and fix modal issue (#38692)
sagar-qa007 Jan 19, 2025
2a2e37a
test: Api curl remaining cases (#38753)
sagar-qa007 Jan 19, 2025
185fefc
refactor: remove deprecated table widget tests (#38733)
rahulbarwal Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/config.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/client/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export REACT_APP_SENTRY_RELEASE=$GIT_SHA
export REACT_APP_CLIENT_LOG_LEVEL=ERROR
# Disable CRA built-in ESLint checks since we have our own config and a separate step for this
export DISABLE_ESLINT_PLUGIN=true
craco --max-old-space-size=10240 build --config craco.build.config.js
craco --max-old-space-size=7168 build --config craco.build.config.js

echo "build finished"
19 changes: 8 additions & 11 deletions app/client/craco.build.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ plugins.push(
}),
);

if (env === "PRODUCTION" || env === "STAGING") {
if (env === "PRODUCTION") {
plugins.push(
new FaroSourceMapUploaderPlugin({
appId: process.env.REACT_APP_FARO_APP_ID,
Expand All @@ -53,8 +53,6 @@ if (env === "PRODUCTION" || env === "STAGING") {
);
}

plugins.push(new CompressionPlugin());

plugins.push(
new CompressionPlugin({
algorithm: "brotliCompress",
Expand All @@ -78,17 +76,16 @@ plugins.push(
);

module.exports = merge(common, {
webpack: {
configure: {
plugins,
babel: {
plugins: ["babel-plugin-lodash"],
loaderOptions: {
cacheDirectory: false,
},
},
jest: {
webpack: {
configure: {
moduleNameMapper: {
// Jest module mapper which will detect our absolute imports.
"^@test(.*)$": "<rootDir>/test$1",
},
devtool: env === "PRODUCTION" ? "source-map" : false,
plugins,
},
},
plugins: [
Expand Down
13 changes: 0 additions & 13 deletions app/client/craco.common.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@ const path = require("path");
const webpack = require("webpack");

module.exports = {
devServer: {
client: {
webSocketURL: {
hostname: "127.0.0.1",
pathname: "/ws",
port: 3000,
protocol: "ws",
},
},
},
babel: {
plugins: ["babel-plugin-lodash"],
},
eslint: {
enable: false,
},
Expand Down
28 changes: 18 additions & 10 deletions app/client/craco.dev.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,31 @@ const common = require("./craco.common.config.js");
module.exports = merge(common, {
devServer: {
client: {
webSocketURL: {
hostname: "127.0.0.1",
pathname: "/ws",
port: 3000,
protocol: "ws",
},
overlay: {
warnings: false,
errors: false,
},
},
},
optimization: {
minimize: false,
},
cache: {
type: "filesystem",
memoryCacheUnaffected: true,
},
experiments: {
cacheUnaffected: true,
},
webpack: {
configure: {
optimization: {
minimize: false,
},
cache: {
type: "filesystem",
memoryCacheUnaffected: true,
},
experiments: {
cacheUnaffected: true,
},
},
plugins: [
new WorkboxPlugin.InjectManifest({
swSrc: "./src/serviceWorker.ts",
Expand Down
8 changes: 0 additions & 8 deletions ...ss/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_DownloadFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -163,7 +162,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -238,7 +236,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -329,7 +326,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -404,7 +400,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -481,7 +476,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -572,7 +566,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -665,7 +658,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down
11 changes: 0 additions & 11 deletions ...egression/ClientSide/ActionExecution/FrameworkFunctions_LocalRemoveValueFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.storeValue()}}`,
Expand All @@ -93,7 +92,6 @@ describe(
EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeValue()}}`,
Expand Down Expand Up @@ -164,7 +162,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeNonExistentValue()}}`,
Expand Down Expand Up @@ -233,7 +230,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeInvalidKey()}}`,
Expand Down Expand Up @@ -354,7 +350,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.storeValues()}}`,
Expand All @@ -367,7 +362,6 @@ describe(
EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeValue1()}}`,
Expand All @@ -380,7 +374,6 @@ describe(
EditorNavigation.SelectEntityByName("Button3", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeValue2()}}`,
Expand Down Expand Up @@ -516,7 +509,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.storeValues()}}`,
Expand All @@ -529,7 +521,6 @@ describe(
EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeValue1()}}`,
Expand Down Expand Up @@ -628,7 +619,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.storeTempValue()}}`,
Expand All @@ -641,7 +631,6 @@ describe(
EditorNavigation.SelectEntityByName("Button2", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.removeTempValue()}}`,
Expand Down
3 changes: 0 additions & 3 deletions ...Regression/ClientSide/ActionExecution/FrameworkFunctions_LocalStoreValueFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -229,7 +228,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -311,7 +309,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down
6 changes: 6 additions & 0 deletions .../e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_NavigateToFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
entityExplorer,
jsEditor,
propPane,
homePage,
debuggerHelper,
} from "../../../../support/Objects/ObjectsCore";
import { EntityItems } from "../../../../support/Pages/AssertHelper";
import EditorNavigation, {
Expand Down Expand Up @@ -177,9 +179,12 @@ describe(
agHelper.AssertElementVisibility(appSettings.locators._header);
agHelper.ClickButton("Submit");
agHelper.AssertURL(pageTwoUrl);
agHelper.WaitUntilEleAppear(debuggerHelper.locators._debuggerIcon);
agHelper.CypressReload();
});

it("3. To verify add a navigation using URL containing links to third party websites", () => {
agHelper.RefreshPage();
EditorNavigation.SelectEntityByName("Page1", EntityType.Page);
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", false);
Expand Down Expand Up @@ -250,6 +255,7 @@ describe(
});

it("4. To verify navigation to a hidden page in same as well a new window", () => {
agHelper.RefreshPage();
PageList.AddNewPage();
entityExplorer.ActionContextMenuByEntityName({
entityNameinLeftSidebar: "Page3",
Expand Down
6 changes: 0 additions & 6 deletions ...s/e2e/Regression/ClientSide/ActionExecution/FrameworkFunctions_ShowAlertFunctions_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -110,7 +109,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -177,7 +175,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -252,7 +249,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -327,7 +323,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down Expand Up @@ -402,7 +397,6 @@ describe(
EditorNavigation.SelectEntityByName("Button1", EntityType.Widget);
propPane.ToggleJSMode("onClick", true);
cy.get("@jsObjectName").then((jsObjectName: string) => {
console.log("Mera variable: ", jsObjectName);
propPane.EnterJSContext(
"onClick",
`{{${jsObjectName}.myFun1()}}`,
Expand Down
Loading