From f344688b2f4d9295970650a89809a1fe83396056 Mon Sep 17 00:00:00 2001 From: Shrikant Sharat Kandula Date: Wed, 11 May 2022 22:43:30 +0530 Subject: [PATCH 1/3] Fix log file location for MongoDB (#13744) --- deploy/docker/templates/supervisord/mongodb.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/docker/templates/supervisord/mongodb.conf b/deploy/docker/templates/supervisord/mongodb.conf index d54ee43f0b..f1024c08c1 100644 --- a/deploy/docker/templates/supervisord/mongodb.conf +++ b/deploy/docker/templates/supervisord/mongodb.conf @@ -1,6 +1,6 @@ [program:mongodb] directory=/appsmith-stacks/data/mongodb -command=mongod --port 27017 --dbpath . --logpath log --replSet mr1 --keyFile key --bind_ip localhost +command=mongod --port 27017 --dbpath . --logpath /appsmith-stacks/logs/%(program_name)s/db.log --replSet mr1 --keyFile key --bind_ip localhost priority=10 autostart=true autorestart=true @@ -13,4 +13,4 @@ stderr_logfile_maxbytes=10MB stdout_logfile_backups=5 stderr_logfile_backups=5 stdout_events_enabled=true -stderr_events_enabled=true \ No newline at end of file +stderr_events_enabled=true From 7856d8234e41307c0b42574c8d5442acf20f2c39 Mon Sep 17 00:00:00 2001 From: Maulik Date: Wed, 11 May 2022 22:45:06 +0530 Subject: [PATCH 2/3] chore: update error message for no schema available for a datasource (#13467) --- app/client/src/ce/constants/messages.ts | 1 + .../Explorer/Datasources/DatasourceStructureContainer.tsx | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 9078c9b83b..4ce0f78c95 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -580,6 +580,7 @@ export const WELCOME_TOUR_STICKY_BUTTON_TEXT = () => "Next mission"; // Data Sources pane export const EMPTY_ACTIVE_DATA_SOURCES = () => "No active datasources found."; +export const SCHEMA_NOT_AVAILABLE = () => "Schema not available"; export const SNIPPET_EXECUTION_SUCCESS = () => `Snippet executed successfully.`; diff --git a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx index 587140c45d..72bc624458 100644 --- a/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx +++ b/app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx @@ -1,3 +1,7 @@ +import { + createMessage, + SCHEMA_NOT_AVAILABLE, +} from "@appsmith/constants/messages"; import { DatasourceStructure as DatasourceStructureType, DatasourceTable, @@ -42,7 +46,7 @@ const Container = (props: Props) => { props.datasourceStructure.error && props.datasourceStructure.error.message ? props.datasourceStructure.error.message - : "No information available"} + : createMessage(SCHEMA_NOT_AVAILABLE)} ); } From 72e24b9a2ace9d697a69303ce92782306b0c24a5 Mon Sep 17 00:00:00 2001 From: Parthvi12 <80334441+Parthvi12@users.noreply.github.com> Date: Wed, 11 May 2022 23:20:12 +0530 Subject: [PATCH 3/3] test: update cypress tests as per added test data in TED (#13761) * update data table --- .../Smoke_TestSuite/Application/CommunityIssues_Spec.ts | 4 ++-- .../ClientSideTests/GitSync/GitSyncedApps_spec.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts b/app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts index 88e0cb4c98..c95a32ad5b 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts +++ b/app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts @@ -213,9 +213,9 @@ describe("AForce - Community Issues page validations", function () { table.OpenNFilterTable("Title", "contains", "query", 'OR', 1) table.ReadTableRowColumnData(1, 0).then(($cellData) => { - expect($cellData).to.eq("Question"); + expect($cellData).to.be.oneOf(['Troubleshooting','Question']) }); - table.ReadTableRowColumnData(7, 1).then(($cellData) => { + table.ReadTableRowColumnData(6, 1).then(($cellData) => { expect($cellData).to.eq("Run storeValue commands before a Query.run()"); }); table.RemoveFilterNVerify("Question", true, false) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js index 0183dc569a..d495288a9e 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js @@ -73,8 +73,9 @@ describe("Git sync apps", function() { cy.get(generatePage.selectTableDropdown).click(); cy.get(generatePage.dropdownOption) - .first() + .contains("public.configs") .click(); + // skip optional search column selection. cy.get(generatePage.generatePageFormSubmitBtn).click();