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

Merge branch 'master' into release

Browse Source
This commit is contained in:
hetunandu 2021-03-05 12:06:14 +05:30
commit 8574b86926
16 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/Chart_Data_point_spec.js
View File

@ -13,6 +13,7 @@ describe("Chart Widget Functionality", function() {
it("Input widget test with default value from chart datapoint", function() {
cy.SearchEntityandOpen("Input1");
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);
cy.get(widgetsPage.defaultInput).type(testdata.bindChardData);
cy.get(commonlocators.editPropCrossButton).click();
@ -27,6 +28,7 @@ describe("Chart Widget Functionality", function() {
cy.SearchEntityandOpen("Chart1");
cy.addAction(testdata.bindingDataPoint);
cy.closePropertyPane();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(500);
cy.xpath("(//*[local-name()='rect'])[13]")
.first()
@ -37,6 +39,7 @@ describe("Chart Widget Functionality", function() {
.then(($value) => {
const text = $value;
cy.log(text);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(3000);
cy.get(".t--toast-action span")
.first()

1
app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_Default_spec.js
View File

@ -34,6 +34,7 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
});
it("Datepicker default date validation with js binding", function() {
cy.PublishtheApp();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(10000);
});
});

1
app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/FormWidgets/DatePicker_2_spec.js
View File

@ -74,6 +74,7 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
it("Datepicker default date validation with js binding", function() {
cy.PublishtheApp();
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(10000);
});
});

1
app/client/cypress/integration/Smoke_TestSuite/ServerSideTests/ApiPaneTests/API_Mustache_spec.js
View File

@ -17,6 +17,7 @@ describe("Moustache test Functionality", function() {
cy.CreateAPI("TestAPINew");
cy.log("Creation of API Action successful");
cy.enterDatasourceAndPath(testdata.baseUrl, testdata.moustacheMethod);
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(300);
cy.RunAPI();
cy.ResponseStatusCheck(testdata.successStatusCode);

BIN
app/client/src/assets/gifs/deploy_orange.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/client/src/assets/gifs/handwave.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
app/client/src/assets/gifs/input_drag.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/client/src/assets/gifs/onsubmit.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 110 KiB

BIN
app/client/src/assets/gifs/super_hero.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 818 KiB

After

Width:  |  Height:  |  Size: 870 KiB

BIN
app/client/src/assets/gifs/table_drag.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 29 KiB

2
app/client/src/assets/icons/ads/book.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="14" fill="none" viewBox="0 0 16 14"><path fill="#4B4848" d="M4.83105 12.4443C6.06152 12.4443 6.86816 12.9092 7.2373 13.1621C7.36719 13.2305 7.74316 13.4561 7.8252 13.4629V2.34082C7.35352 1.43848 5.93848 0.727539 4.48242 0.727539C2.65039 0.727539 1.08496 1.78027 0.743164 2.49805V12.8818C0.743164 13.3672 1.02344 13.5586 1.37207 13.5586C1.65234 13.5586 1.83008 13.4629 2.00781 13.3125C2.45898 12.9297 3.4707 12.4443 4.83105 12.4443ZM11.6943 12.4443C13.0547 12.4443 14.0596 12.9297 14.5107 13.3125C14.6885 13.4561 14.8662 13.5586 15.1465 13.5586C15.4883 13.5586 15.7754 13.3672 15.7754 12.8818V2.49805C15.4336 1.78027 13.875 0.727539 12.043 0.727539C10.5869 0.727539 9.17188 1.43848 8.7002 2.34082V13.4766C8.78223 13.4697 9.1582 13.2373 9.29492 13.1621C9.65723 12.9092 10.4639 12.4443 11.6943 12.4443Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="14" fill="none" viewBox="0 0 16 14"><path fill="#4B4848" d="M4.83105 12.4443C6.06152 12.4443 6.86816 12.9092 7.2373 13.1621C7.36719 13.2305 7.74316 13.4561 7.8252 13.4629V2.34082C7.35352 1.43848 5.93848 0.727539 4.48242 0.727539C2.65039 0.727539 1.08496 1.78027 0.743164 2.49805V12.8818C0.743164 13.3672 1.02344 13.5586 1.37207 13.5586C1.65234 13.5586 1.83008 13.4629 2.00781 13.3125C2.45898 12.9297 3.4707 12.4443 4.83105 12.4443ZM11.6943 12.4443C13.0547 12.4443 14.0596 12.9297 14.5107 13.3125C14.6885 13.4561 14.8662 13.5586 15.1465 13.5586C15.4883 13.5586 15.7754 13.3672 15.7754 12.8818V2.49805C15.4336 1.78027 13.875 0.727539 12.043 0.727539C10.5869 0.727539 9.17188 1.43848 8.7002 2.34082V13.4766C8.78223 13.4697 9.1582 13.2373 9.29492 13.1621C9.65723 12.9092 10.4639 12.4443 11.6943 12.4443Z"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 867 B

After

Width:  |  Height:  |  Size: 868 B

2
app/client/src/assets/icons/ads/shine.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><path fill="#4B4848" d="M7.05273 13.7158C7.30566 13.7158 7.51074 13.5312 7.55176 13.2578C8.13965 8.70508 8.78223 8.05566 13.2324 7.56348C13.5127 7.53613 13.7109 7.33105 13.7109 7.06445C13.7109 6.79785 13.5127 6.59277 13.2324 6.55859C8.78223 6.07324 8.13965 5.42383 7.55176 0.864258C7.51074 0.59082 7.30566 0.413086 7.05273 0.413086C6.7998 0.413086 6.59473 0.59082 6.55371 0.864258C5.96582 5.42383 5.32324 6.07324 0.873047 6.55859C0.592773 6.59277 0.394531 6.79785 0.394531 7.06445C0.394531 7.33105 0.592773 7.53613 0.873047 7.56348C5.32324 8.15137 5.9248 8.71191 6.55371 13.2578C6.59473 13.5312 6.7998 13.7158 7.05273 13.7158Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 14 14"><path fill="#4B4848" d="M7.05273 13.7158C7.30566 13.7158 7.51074 13.5312 7.55176 13.2578C8.13965 8.70508 8.78223 8.05566 13.2324 7.56348C13.5127 7.53613 13.7109 7.33105 13.7109 7.06445C13.7109 6.79785 13.5127 6.59277 13.2324 6.55859C8.78223 6.07324 8.13965 5.42383 7.55176 0.864258C7.51074 0.59082 7.30566 0.413086 7.05273 0.413086C6.7998 0.413086 6.59473 0.59082 6.55371 0.864258C5.96582 5.42383 5.32324 6.07324 0.873047 6.55859C0.592773 6.59277 0.394531 6.79785 0.394531 7.06445C0.394531 7.33105 0.592773 7.53613 0.873047 7.56348C5.32324 8.15137 5.9248 8.71191 6.55371 13.2578C6.59473 13.5312 6.7998 13.7158 7.05273 13.7158Z"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 731 B

BIN
app/client/src/assets/images/preview.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 100 KiB

2
app/client/src/assets/images/tick.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" fill="none" viewBox="0 0 11 11"><path fill="#fff" d="M4.31445 10.9434C4.56641 10.9434 4.76562 10.832 4.90625 10.6152L10.4434 1.89648C10.5488 1.72656 10.5898 1.59766 10.5898 1.46289C10.5898 1.14062 10.3789 0.929688 10.0566 0.929688C9.82227 0.929688 9.69336 1.00586 9.55273 1.22852L4.29102 9.61328L1.56055 6.03906C1.41406 5.83398 1.26758 5.75195 1.05664 5.75195C0.722656 5.75195 0.494141 5.98047 0.494141 6.30273C0.494141 6.4375 0.552734 6.58984 0.664062 6.73047L3.70508 10.6035C3.88086 10.832 4.0625 10.9434 4.31445 10.9434Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" fill="none" viewBox="0 0 11 11"><path fill="#fff" d="M4.31445 10.9434C4.56641 10.9434 4.76562 10.832 4.90625 10.6152L10.4434 1.89648C10.5488 1.72656 10.5898 1.59766 10.5898 1.46289C10.5898 1.14062 10.3789 0.929688 10.0566 0.929688C9.82227 0.929688 9.69336 1.00586 9.55273 1.22852L4.29102 9.61328L1.56055 6.03906C1.41406 5.83398 1.26758 5.75195 1.05664 5.75195C0.722656 5.75195 0.494141 5.98047 0.494141 6.30273C0.494141 6.4375 0.552734 6.58984 0.664062 6.73047L3.70508 10.6035C3.88086 10.832 4.0625 10.9434 4.31445 10.9434Z"/></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 596 B

22
app/server/appsmith-plugins/redshiftPlugin/src/test/java/com/external/plugins/RedshiftPluginTest.java vendored
View File

@ -17,30 +17,30 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import org.mockito.Mockito;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import java.sql.Connection;
import java.sql.Date;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Time;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.Date;
import java.sql.Time;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* Unit tests for the RedshiftPlugin

2
contributions/docs/UploadingAssets.md
View File

@ -8,6 +8,8 @@ Images are gifs can be embedded into a page using the following syntax
```
![Click to expand](/.gitbook/assets/asset-name.png)
```
The images should be focused on the content and not include unnecessary parts of the UI ex. header / empty canvas etc.
Gifs can be recorded using the a screen recorder like loom and converted to a gif using gifski. Gifs should be of 26 - 30 fps and be of high quality. If you do not have access to a good gif converter, please upload the video as is and raise a PR. We will be happy to help with Gif creation!
## Embedding Videos
Videos must be uploaded to the appsmith youtube channel. Contact nikhil@appsmith.com to have your video uploaded.