Merge branch 'release'

This commit is contained in:
Arpit Mohan 2020-07-28 17:33:24 +05:30
commit c849f988d3
8 changed files with 27 additions and 8 deletions

View File

@ -229,6 +229,6 @@ jobs:
if: success() && github.ref == 'refs/heads/master'
run: |
docker build -t appsmith/appsmith-editor:${GITHUB_SHA} .
docker build -t appsmith/appsmith-editor:latest .
docker build -t appsmith/appsmith-editor:nightly .
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker push appsmith/appsmith-editor

View File

@ -56,6 +56,12 @@ jobs:
- name: Push production image to Docker Hub with commit tag
run: |
docker build -t appsmith/appsmith-editor:${{steps.get_version.outputs.tag}} .
# Only build & tag with latest if the tag doesn't contain beta
if [[ ! ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then
docker build -t appsmith/appsmith-editor:latest .
fi
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker push appsmith/appsmith-editor
@ -98,6 +104,12 @@ jobs:
- name: Push image to Docker Hub
run: |
docker build -t appsmith/appsmith-server:${{steps.get_version.outputs.tag}} .
# Only build & tag with latest if the tag doesn't contain beta
if [[ ! ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then
docker build -t appsmith/appsmith-server:latest .
fi
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker push appsmith/appsmith-server

View File

@ -79,6 +79,6 @@ jobs:
if: success() && github.ref == 'refs/heads/master'
run: |
docker build -t appsmith/appsmith-server:${GITHUB_SHA} .
docker build -t appsmith/appsmith-server:latest .
docker build -t appsmith/appsmith-server:nightly .
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker push appsmith/appsmith-server

View File

@ -110,6 +110,7 @@ describe("API Panel Test Functionality", function() {
cy.CreateAPI(apiname);
cy.log("Creation of API Action successful");
cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods);
cy.WaitAutoSave();
cy.RunAPI();
cy.ResponseStatusCheck(testdata.successStatusCode);
cy.log("Response code check successful");
@ -135,6 +136,7 @@ describe("API Panel Test Functionality", function() {
cy.CreateAPI("ThirdAPI");
cy.log("Creation of API Action successful");
cy.enterDatasourceAndPath(testdata.baseUrl, testdata.queryAndValue);
cy.WaitAutoSave();
cy.RunAPI();
cy.ResponseStatusCheck("200 OK");
cy.log("Response code check successful");
@ -153,6 +155,7 @@ describe("API Panel Test Functionality", function() {
testdata.queryKey,
testdata.queryValue,
);
cy.WaitAutoSave();
cy.RunAPI();
cy.ResponseStatusCheck("5000");
cy.log("Response code check successful");

View File

@ -9,7 +9,8 @@ describe("API Panel Test Functionality", function() {
cy.CreateAPI("FirstAPI");
cy.log("Creation of FirstAPI Action successful");
cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods);
cy.SaveAndRunAPI();
cy.WaitAutoSave();
cy.RunAPI();
cy.ResponseStatusCheck(testdata.successStatusCode);
cy.get(apiwidget.createApiOnSideBar)
.first()

View File

@ -68,10 +68,10 @@ export const runAction = (id: string, paginationField?: PaginationField) => {
};
export const updateAction = (payload: { id: string }) => {
return {
return batchAction({
type: ReduxActionTypes.UPDATE_ACTION_INIT,
payload,
};
});
};
export const updateActionSuccess = (payload: { data: Action }) => {

View File

@ -10,7 +10,6 @@ import {
select,
takeEvery,
takeLatest,
debounce,
} from "redux-saga/effects";
import ActionAPI, { ActionCreateUpdateResponse, Property } from "api/ActionAPI";
import _ from "lodash";
@ -481,7 +480,7 @@ export function* watchActionSagas() {
fetchActionsForViewModeSaga,
),
takeEvery(ReduxActionTypes.CREATE_ACTION_INIT, createActionSaga),
debounce(500, ReduxActionTypes.UPDATE_ACTION_INIT, updateActionSaga),
takeLatest(ReduxActionTypes.UPDATE_ACTION_INIT, updateActionSaga),
takeLatest(ReduxActionTypes.DELETE_ACTION_INIT, deleteActionSaga),
takeLatest(ReduxActionTypes.SAVE_API_NAME, saveApiNameSaga),
takeLatest(ReduxActionTypes.MOVE_ACTION_INIT, moveActionSaga),

View File

@ -25,9 +25,13 @@ const BATCH_PRIORITY = {
needsSaga: true,
},
[ReduxActionTypes.UPDATE_ACTION_PROPERTY]: {
priority: 1,
priority: 0,
needsSaga: false,
},
[ReduxActionTypes.UPDATE_ACTION_INIT]: {
priority: 1,
needsSaga: true,
},
};
const batches: ReduxAction<any>[][] = [];