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

Merge branch 'release' into feat/migrate_organization_to_workspaces

Browse Source
This commit is contained in:
Sidhant Goel 2022-05-11 23:21:50 +05:30
commit 48dfbd4b33
No known key found for this signature in database
GPG Key ID: 0784E3B2D2D6C980
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/cypress/integration/Smoke_TestSuite/Application/CommunityIssues_Spec.ts
View File

@ -213,9 +213,9 @@ describe("AForce - Community Issues page validations", function () {
table.OpenNFilterTable("Title", "contains", "query", 'OR', 1) table.OpenNFilterTable("Title", "contains", "query", 'OR', 1)
table.ReadTableRowColumnData(1, 0).then(($cellData) => { 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()"); expect($cellData).to.eq("Run storeValue commands before a Query.run()");
}); });
table.RemoveFilterNVerify("Question", true, false) table.RemoveFilterNVerify("Question", true, false)

3
app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/GitSync/GitSyncedApps_spec.js
View File

@ -73,8 +73,9 @@ describe("Git sync apps", function() {
cy.get(generatePage.selectTableDropdown).click(); cy.get(generatePage.selectTableDropdown).click();
cy.get(generatePage.dropdownOption) cy.get(generatePage.dropdownOption)
.first() .contains("public.configs")
.click(); .click();
// skip optional search column selection. // skip optional search column selection.
cy.get(generatePage.generatePageFormSubmitBtn).click(); cy.get(generatePage.generatePageFormSubmitBtn).click();

1
app/client/src/ce/constants/messages.ts
View File

@ -580,6 +580,7 @@ export const WELCOME_TOUR_STICKY_BUTTON_TEXT = () => "Next mission";
// Data Sources pane // Data Sources pane
export const EMPTY_ACTIVE_DATA_SOURCES = () => "No active datasources found."; 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.`; export const SNIPPET_EXECUTION_SUCCESS = () => `Snippet executed successfully.`;

6
app/client/src/pages/Editor/Explorer/Datasources/DatasourceStructureContainer.tsx
View File

@ -1,3 +1,7 @@
import {
createMessage,
SCHEMA_NOT_AVAILABLE,
} from "@appsmith/constants/messages";
import { import {
DatasourceStructure as DatasourceStructureType, DatasourceStructure as DatasourceStructureType,
DatasourceTable, DatasourceTable,
@ -42,7 +46,7 @@ const Container = (props: Props) => {
props.datasourceStructure.error && props.datasourceStructure.error &&
props.datasourceStructure.error.message props.datasourceStructure.error.message
? props.datasourceStructure.error.message ? props.datasourceStructure.error.message
: "No information available"} : createMessage(SCHEMA_NOT_AVAILABLE)}
</EntityPlaceholder> </EntityPlaceholder>
); );
} }

4
deploy/docker/templates/supervisord/mongodb.conf
View File

@ -1,6 +1,6 @@
[program:mongodb] [program:mongodb]
directory=/appsmith-stacks/data/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 priority=10
autostart=true autostart=true
autorestart=true autorestart=true
@ -13,4 +13,4 @@ stderr_logfile_maxbytes=10MB
stdout_logfile_backups=5 stdout_logfile_backups=5
stderr_logfile_backups=5 stderr_logfile_backups=5
stdout_events_enabled=true stdout_events_enabled=true
stderr_events_enabled=true stderr_events_enabled=true