Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into release-7mar23

Browse Source
This commit is contained in:
Aishwarya-U-R 2023-03-07 14:35:04 +05:30 committed by GitHub
commit e8db4e7415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Autocomplete/Autocomplete_JS_spec.ts
View File

@ -18,7 +18,6 @@ describe("Autocomplete tests", () => {
it("1. Bug #13613 Verify widgets autocomplete: ButtonGroup & Document viewer widget", () => { it("1. Bug #13613 Verify widgets autocomplete: ButtonGroup & Document viewer widget", () => {
_.entityExplorer.DragDropWidgetNVerify(WIDGET.BUTTON_GROUP, 200, 200); _.entityExplorer.DragDropWidgetNVerify(WIDGET.BUTTON_GROUP, 200, 200);
_.entityExplorer.DragDropWidgetNVerify(WIDGET.DOCUMENT_VIEWER, 200, 500); _.entityExplorer.DragDropWidgetNVerify(WIDGET.DOCUMENT_VIEWER, 200, 500);
// create js object // create js object
_.jsEditor.CreateJSObject(jsObjectBody, { _.jsEditor.CreateJSObject(jsObjectBody, {
paste: true, paste: true,
@ -61,7 +60,6 @@ describe("Autocomplete tests", () => {
it("2. Check for bindings not available in other page", () => { it("2. Check for bindings not available in other page", () => {
// dependent on above case: 1st page should have DocumentViewer widget // dependent on above case: 1st page should have DocumentViewer widget
_.entityExplorer.AddNewPage(); _.entityExplorer.AddNewPage();
// create js object // create js object
_.jsEditor.CreateJSObject(jsObjectBody, { _.jsEditor.CreateJSObject(jsObjectBody, {
paste: true, paste: true,
@ -284,7 +282,6 @@ describe("Autocomplete tests", () => {
it("8. Multiple binding in single line", () => { it("8. Multiple binding in single line", () => {
_.dataSources.CreateDataSource("Postgres", true, false); _.dataSources.CreateDataSource("Postgres", true, false);
_.dataSources.CreateQueryAfterDSSaved( _.dataSources.CreateQueryAfterDSSaved(
"SELECT * FROM worldCountryInfo where {{appsmith.store}} {{appsmith}}", "SELECT * FROM worldCountryInfo where {{appsmith.store}} {{appsmith}}",
); );

1
app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_focus_spec.js
View File

@ -71,7 +71,6 @@ describe("Modal focus", function() {
}); });
it("2. Should not focus on the input field if autofocus is disabled", () => { it("2. Should not focus on the input field if autofocus is disabled", () => {
cy.openPropertyPaneFromModal("inputwidgetv2"); cy.openPropertyPaneFromModal("inputwidgetv2");
// autofocus for input field is disabled // autofocus for input field is disabled
cy.get(".t--property-control-autofocus") cy.get(".t--property-control-autofocus")
.find(".bp3-switch input") .find(".bp3-switch input")

1
app/client/yarn.lock
View File

@ -9967,7 +9967,6 @@ des.js@^1.0.0:
dependencies: dependencies:
inherits "^2.0.1" inherits "^2.0.1"
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
"design-system-old@npm:@appsmithorg/design-system-old@1.0.52": "design-system-old@npm:@appsmithorg/design-system-old@1.0.52":
version "1.0.52" version "1.0.52"
resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.0.52.tgz#031b179a9b3689a081e29c3994b7296935fa3edb" resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.0.52.tgz#031b179a9b3689a081e29c3994b7296935fa3edb"

2
deploy/docker/entrypoint.sh Executable file → Normal file
View File

@ -168,7 +168,7 @@ init_replica_set() {
mongod --fork --port 27017 --dbpath "$MONGO_DB_PATH" --logpath "$MONGO_LOG_PATH" --replSet mr1 --keyFile /mongodb-key --bind_ip localhost mongod --fork --port 27017 --dbpath "$MONGO_DB_PATH" --logpath "$MONGO_LOG_PATH" --replSet mr1 --keyFile /mongodb-key --bind_ip localhost
echo "Waiting 10s for MongoDB to start with Replica Set" echo "Waiting 10s for MongoDB to start with Replica Set"
sleep 10 sleep 10
mongosh "$APPSMITH_MONGODB_URI" --eval 'rs.initiate()' mongo "$APPSMITH_MONGODB_URI" --eval 'rs.initiate()'
mongod --dbpath "$MONGO_DB_PATH" --shutdown || true mongod --dbpath "$MONGO_DB_PATH" --shutdown || true
fi fi