Skip to content
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

fix: update placeholder text for port numbers in datasource form #24961

Merged
merged 8 commits into from
Jul 6, 2023
Merged

fix: update placeholder text for port numbers in datasource form #24961

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11e0d77
update placeholder text for port numbers
sumitsum Jun 30, 2023
5a7ef85
update placeholder text for port numbers
sumitsum Jun 30, 2023
4f5a327
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
sumitsum Jul 3, 2023
2ebe586
add Cypress TC
sumitsum Jul 4, 2023
e993631
Merge branch 'fix/fix_mssql_port_no_placeholder' of https://github.co…
sumitsum Jul 4, 2023
935075e
remove redundant renaming step
sumitsum Jul 4, 2023
dd142c3
remove redundant code from cypress tc.
sumitsum Jul 4, 2023
5082806
merge TC into one
sumitsum Jul 4, 2023
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
42 changes: 42 additions & 0 deletions app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore";

describe("Test placeholder value for port number for all datasources - tests #24960", () => {
it("1. Test MsSQL datasource port number placeholder", () => {
dataSources.NavigateToDSCreateNew();
dataSources.CreatePlugIn("Microsoft SQL Server");

const expectedPlaceholderValue = "1433";
agHelper.AssertAttribute(
dataSources._port,
"placeholder",
expectedPlaceholderValue,
);
dataSources.SaveDSFromDialog(false);
});

it("2. Test Oracle plugin datasource port number placeholder", () => {
dataSources.NavigateToDSCreateNew();
dataSources.CreatePlugIn("Oracle");

const expectedPlaceholderValue = "1521";
agHelper.AssertAttribute(
dataSources._port,
"placeholder",
expectedPlaceholderValue,
);
dataSources.SaveDSFromDialog(false);
});

it("3. Test SMTP plugin datasource port number placeholder", () => {
dataSources.NavigateToDSCreateNew();
dataSources.CreatePlugIn("SMTP");

const expectedPlaceholderValue = "25";
agHelper.AssertAttribute(
dataSources._port,
"placeholder",
expectedPlaceholderValue,
);
dataSources.SaveDSFromDialog(false);
});
});
2 changes: 1 addition & 1 deletion app/server/appsmith-plugins/mssqlPlugin/src/main/resources/form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"configProperty": "datasourceConfiguration.endpoints[*].port",
"dataType": "NUMBER",
"controlType": "KEYVALUE_ARRAY",
"placeholderText": "1443"
"placeholderText": "1433"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion app/server/appsmith-plugins/oraclePlugin/src/main/resources/form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"configProperty": "datasourceConfiguration.endpoints[*].port",
"dataType": "NUMBER",
"controlType": "KEYVALUE_ARRAY",
"placeholderText": "6003"
"placeholderText": "1521"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion app/server/appsmith-plugins/smtpPlugin/src/main/resources/form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"configProperty": "datasourceConfiguration.endpoints[*].port",
"dataType": "NUMBER",
"controlType": "KEYVALUE_ARRAY",
"placeholderText": "587"
"placeholderText": "25"
}
]
}
Expand Down