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.

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

26/09 - Daily promotion #36568

Merged
merged 17 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/config.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,12 @@ jobs:
run: |
scripts/generate_info_json.sh
- name: Place server artifacts-es
run: |
if [[ -f scripts/prepare_server_artifacts.sh ]]; then
scripts/prepare_server_artifacts.sh
fi
- name: Login to DockerHub
uses: docker/login-action@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-release-to-pg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

# This is the ChannelId of the proj postgres channel.
body="$(jq -nc \
--arg channel C06Q3A97USE \
--arg channel C07JMLWEXDJ \
--arg text "$slack_message" \
'$ARGS.named'
)"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/test-build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,12 @@ jobs:
scripts/generate_info_json.sh
fi
- name: Place server artifacts-es
run: |
if [[ -f scripts/prepare_server_artifacts.sh ]]; then
scripts/prepare_server_artifacts.sh
fi
- name: Set up Depot CLI
uses: depot/setup-action@v1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {
agHelper.GetNClick(propPane._navigateToType("URL"));
agHelper.TypeText(
propPane._actionSelectorFieldByLabel("Enter URL"),
"https://google.com",
"https://www.appsmith.com",
);
agHelper.GetNClick(propPane._actionSelectorPopupClose);
propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
);

// Add third action
Expand All @@ -80,7 +80,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {
// Validate the code
propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
);

// Delete the third action
Expand All @@ -97,7 +97,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {
// Assert the code for the remaining actions
propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
);

// Delete the first action
Expand All @@ -113,7 +113,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {
// Assert the code for the remaining actions
propPane.ValidateJSFieldValue(
"onClick",
`{{navigateTo('https://google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
`{{navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
);
});

Expand All @@ -132,13 +132,13 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {
agHelper.GetNClick(propPane._navigateToType("URL"));
agHelper.TypeText(
propPane._actionSelectorFieldByLabel("Enter URL"),
"https://google.com",
"https://www.appsmith.com",
);
agHelper.GetNClick(propPane._actionSelectorPopupClose);

propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
);

// Add third action
Expand All @@ -165,7 +165,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {

propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
);

// Delete the third action
Expand Down Expand Up @@ -197,7 +197,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {

propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
);
});

Expand All @@ -216,13 +216,13 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {
agHelper.GetNClick(propPane._navigateToType("URL"));
agHelper.TypeText(
propPane._actionSelectorFieldByLabel("Enter URL"),
"https://google.com",
"https://www.appsmith.com",
);
agHelper.GetNClick(propPane._actionSelectorPopupClose);

propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');}}`,
);

// Add third action
Expand All @@ -249,7 +249,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {

propPane.ValidateJSFieldValue(
"onClick",
`{{showAlert('Hello!', '');navigateTo('https://google.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
`{{showAlert('Hello!', '');navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');storeValue('secret-key', 'secret-value');copyToClipboard('text to copy');}}`,
);

// Delete the third action
Expand Down Expand Up @@ -286,7 +286,7 @@ describe("UI to Code", { tags: ["@tag.JS"] }, () => {

propPane.ValidateJSFieldValue(
"onClick",
`{{navigateTo('https://google.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
`{{navigateTo('https://www.appsmith.com', {}, 'SAME_WINDOW');copyToClipboard('text to copy');}}`,
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe("Validate basic Promises", { tags: ["@tag.Binding"] }, () => {
deployMode.NavigateBacktoEditor();
agHelper.AddDsl("promisesBtnImgDsl", locators._buttonByText("Submit"));
apiPage.CreateAndFillApi(
"https://picsum.photos/200/300",
"http://host.docker.internal:4200/453-200x300.jpg",
"RandomImy",
30000,
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ describe(
},
function () {
it("Check if autocommit progress bar is visible and network requests are properly called", function () {
featureFlagIntercept({
release_git_autocommit_feature_enabled: true,
});
agHelper.GenerateUUID();
cy.get("@guid").then((uid) => {
wsName = "GitAC-" + uid;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,16 @@ describe("Canvas context Property Pane", { tags: ["@tag.IDE"] }, function () {
propertySectionState = {
basic: false,
general: true,
validation: false,
formsettings: true,
};

if (!Cypress.env("AIRGAPPED")) {
propertySectionState = {
...propertySectionState,
validation: false,
formsettings: true,
};
}

verifyPropertyPaneContext(
() => {
setPropertyPaneSectionState(propertySectionState);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ describe("1. CommandClickNavigation", { tags: ["@tag.IDE"] }, function () {
//Assert working on url field
cy.updateCodeInput(
".t--dataSourceField",
"https://www.test.com/{{ SQL_Query.data }}",
"http://host.docker.internal:5001/{{ SQL_Query.data }}",
);
agHelper.Sleep();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ describe(
propPane.MoveToTab("Content");

[1, 2, 3, 4, 5].forEach(() => {
apiPage.CreateAndFillApi("http://www.example.com");
apiPage.CreateAndFillApi("https://www.appsmith.com/");
});

EditorNavigation.SelectEntityByName("Table1", EntityType.Widget);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ const setterMethodsToTest = [
property: "url",
widget: WIDGET.AUDIO,
actionBinding:
"{{Audio1.setURL('https://www.youtube.com/watch?v=JGwWNGJdvx8')}}",
"{{Audio1.setURL('http://host.docker.internal:4200/bird.mp4')}}",
valueBinding: "{{Audio1.url}}",
expectedValue: "https://www.youtube.com/watch?v=JGwWNGJdvx8",
expectedValue: "http://host.docker.internal:4200/bird.mp4",
},
{
name: "setPlaying",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const ppt =
const pngImage =
"https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRb8umIiCU_K6ac-xS-ni4y6SP7XAd8C7Ms3Q&usqp=CAU";
const jpgImage =
"https://img.frentityExplorerpik.com/frentityExplorer-photo/beautiful-scenery-summit-mount-everest-covered-with-snow-white-clouds_181624-21317.jpg?w=1380&t=st=1691154236~exp=1691154836~hmac=35ce7f92dd16711c69509a0edbb23cedb34e49f960f560c77174994b6d5705a0";
"https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg?itok=yG4bpfFs";
const pdf =
"https://www.learningcontainer.com/wp-content/uploads/2019/09/sample-pdf-file.pdf";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@ describe(
{ tags: ["@tag.Widget", "@tag.Image"] },
function () {
const image = (src: string) => 'img[src="' + src + '"]';
const jpgImg = "https://jpeg.org/images/jpegsystems-home.jpg";
const jpgImg =
"https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg?itok=yG4bpfFs";
const gifImg =
"https://mir-s3-cdn-cf.behance.net/project_modules/max_1200/5eeea355389655.59822ff824b72.gif";
const svgImg = "https://assets.codepen.io/3/kiwi.svg";
const webpImg = "https://www.gstatic.com/webp/gallery/4.sm.webp";
const pngImg = "https://assets.appsmith.com/widgets/default.png";
"https://www.appsmith.com/_next/image?url=https%3A%2F%2Fimages.ctfassets.net%2Flpvian6u6i39%2F5dIHs6B4O8JrcziD01Tzpr%2F080ac2887506afab72a160b897364607%2Fimage-11.gif&w=1080&q=75";
const svgImg = "https://community.appsmith.com/appsmith-community-logo.svg";
const webpImg =
"https://www.appsmith.com/assets/images/animations/widgets/img_0.webp";
const pngImg =
"https://community.appsmith.com/sites/default/files/styles/16_9_card/public/septembercoding-min%20%281%29.png?itok=unYUZ0zm";

before(() => {
entityExplorer.DragDropWidgetNVerify(draggableWidgets.IMAGE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ describe(
"Image widget - Rotation & Download",
{ tags: ["@tag.Widget", "@tag.Image"] },
function () {
const jpgImg = "https://jpeg.org/images/jpegsystems-home.jpg";
const jpgImg =
"https://community.appsmith.com/sites/default/files/styles/small_thumbnail/public/2024-03/aws-logo.jpg?itok=yG4bpfFs";
before(() => {
entityExplorer.DragDropWidgetNVerify(draggableWidgets.IMAGE);
propPane.UpdatePropertyFieldValue("Image", jpgImg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe(
.invoke("attr", "src")
.should(
"contain",
"https://res.cloudinary.com/drako999/image/upload/v1589196259/default.png",
"http://host.docker.internal:4200/clouddefaultImage.png",
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ const data = [
{
id: "001",
name: "Blue",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
same: "1",
},
{
id: "002",
name: "Green",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
same: "01",
},
{
id: "003",
name: "Red",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
same: 1,
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ const simpleListData1 = [
{
id: "001",
name: "Blue",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
},
{
id: "002",
name: "Green",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
},
{
id: "003",
name: "Red",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ describe(
`{{[{
id: "001",
name: "Blue",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
},
{
id: "002",
name: "Green",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
},
{
id: "003",
name: "Red",
img: "https://assets.appsmith.com/widgets/default.png",
img: "http://host.docker.internal:4200/clouddefaultImage.png",
}]}}`,
);

Expand Down
Loading
Loading