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

Merge branch 'release' of github.com:appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Arpit Mohan 2020-07-22 13:12:14 +05:30
commit 52d5c4bdcd
11 changed files with 70 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/client.yml vendored
View File

@ -153,6 +153,10 @@ jobs:
CYPRESS_URL: ${{ secrets.CYPRESS_URL }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
CYPRESS_TESTPASSWORD1: ${{ secrets.CYPRESS_TESTPASSWORD1 }}
CYPRESS_TESTUSERNAME2: ${{ secrets.CYPRESS_TESTUSERNAME2 }}
CYPRESS_TESTPASSWORD2: ${{ secrets.CYPRESS_TESTPASSWORD1 }}
run: |
./cypress/setup-test.sh
@ -164,6 +168,10 @@ jobs:
CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }}
CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }}
CYPRESS_TESTPASSWORD1: ${{ secrets.CYPRESS_TESTPASSWORD1 }}
CYPRESS_TESTUSERNAME2: ${{ secrets.CYPRESS_TESTUSERNAME2 }}
CYPRESS_TESTPASSWORD2: ${{ secrets.CYPRESS_TESTPASSWORD1 }}
with:
browser: chrome
headless: true

2
app/client/cypress/fixtures/testdata.json
View File

@ -3,7 +3,7 @@
"methods": "users",
"headerKey": "Content-Type",
"headerValue": "application/json",
"headerValueBlank": " ",
"headerValueBlank": "",
"queryKey": "page",
"queryValue": "2",
"queryAndValue": "users?page=2",

8
app/client/cypress/integration/Smoke_TestSuite/ApiPaneTests/API_All_Verb_spec.js
View File

@ -112,8 +112,8 @@ describe("API Panel Test Functionality", function() {
cy.EnterSourceDetailsWithHeader(
testdata.baseUrl,
testdata.methods,
testdata.headerKey,
testdata.headerValue,
testdata.headerValueBlank,
testdata.headerValueBlank,
);
cy.RunAPI();
cy.ResponseStatusCheck(testdata.successStatusCode);
@ -142,8 +142,8 @@ describe("API Panel Test Functionality", function() {
cy.EnterSourceDetailsWithQueryParam(
testdata.baseUrl,
testdata.methods,
testdata.headerKey,
testdata.headerValue,
testdata.headerValueBlank,
testdata.headerValueBlank,
testdata.queryKey,
testdata.queryValue,
);

74
app/client/cypress/integration/Smoke_TestSuite/ApiPaneTests/Api_Marketplace_spec.js
View File

@ -1,35 +1,39 @@
/// <reference types="Cypress" />
const testdata = require("../../../fixtures/testdata.json");
const apiwidget = require("../../../locators/apiWidgetslocator.json");
describe("API Panel Test Functionality ", function() {
it("Test Market place API by adding to a page", function() {
cy.log("Login Successful");
cy.NavigateToAPI_Panel();
cy.wait("@getCategories");
cy.wait("@getTemplateCollections");
cy.wait("@get3PProviders");
cy.log("Navigation to API Panel screen successful");
cy.get(apiwidget.marketPlaceapi)
.first()
.click();
cy.wait("@get3PProviderTemplates");
cy.get(".apiName")
.first()
.invoke("text")
.then(ApiName => {
cy.get(apiwidget.addPageButton)
.first()
.click();
const searchApiName = ApiName.replace(/\s/g, "");
cy.log(searchApiName);
cy.wait("@getActions");
cy.SearchAPIandClick(searchApiName);
cy.get(apiwidget.apidocumentaionLink)
.invoke("text")
.then(apidocumentation => {
cy.log(apidocumentation);
expect(apidocumentation).to.eq("API documentation");
});
});
});
});
/*
* Commenting because CE does not have marketplace anymore
*
* */
// /// <reference types="Cypress" />
// const testdata = require("../../../fixtures/testdata.json");
// const apiwidget = require("../../../locators/apiWidgetslocator.json");
// describe("API Panel Test Functionality ", function() {
// it("Test Market place API by adding to a page", function() {
// cy.log("Login Successful");
// cy.NavigateToAPI_Panel();
// cy.wait("@getCategories");
// cy.wait("@getTemplateCollections");
// cy.wait("@get3PProviders");
// cy.log("Navigation to API Panel screen successful");
// cy.get(apiwidget.marketPlaceapi)
// .first()
// .click();
// cy.wait("@get3PProviderTemplates");
// cy.get(".apiName")
// .first()
// .invoke("text")
// .then(ApiName => {
// cy.get(apiwidget.addPageButton)
// .first()
// .click();
// const searchApiName = ApiName.replace(/\s/g, "");
// cy.log(searchApiName);
// cy.wait("@getActions");
// cy.SearchAPIandClick(searchApiName);
// cy.get(apiwidget.apidocumentaionLink)
// .invoke("text")
// .then(apidocumentation => {
// cy.log(apidocumentation);
// expect(apidocumentation).to.eq("API documentation");
// });
// });
// });
// });

2
app/client/cypress/locators/ApiEditor.json
View File

@ -20,4 +20,4 @@
"apiPaginationNextTest": ".t--apiFormPaginationNextTest",
"apiPaginationTab": ".t--apiFormPaginationType",
"apiTab": ".react-tabs__tab-list li"
}
}

2
app/client/cypress/support/commands.js
View File

@ -1307,10 +1307,8 @@ Cypress.Commands.add("startServerAndRoutes", () => {
cy.route("POST", "/api/v1/applications/publish/*").as("publishApp");
cy.route("PUT", "/api/v1/layouts/*/pages/*").as("updateLayout");
cy.route("PUT", "/api/v1/actions/*").as("putActions");
cy.route("POST", "/track/*").as("postTrack");
cy.route("POST", "/api/v1/actions/execute").as("postExecute");
cy.route("POST", "/api/v1/actions").as("postaction");
cy.route("POST", "/api/v1/actions").as("createNewApi");
cy.route("POST", "/api/v1/import?type=CURL&pageId=*&name=*").as("curlImport");

13
app/client/src/actions/actionActions.ts
View File

@ -4,7 +4,7 @@ import {
ReduxAction,
ReduxActionErrorTypes,
} from "constants/ReduxActionConstants";
import { Action, RestAction } from "entities/Action";
import { Action } from "entities/Action";
import { batchAction } from "actions/batchActions";
export const createActionRequest = (payload: Partial<Action>) => {
@ -50,7 +50,7 @@ export const fetchActionsForPage = (pageId: string) => {
};
};
export const fetchActionsForPageSuccess = (actions: RestAction[]) => {
export const fetchActionsForPageSuccess = (actions: Action[]) => {
return {
type: ReduxActionTypes.FETCH_ACTIONS_FOR_PAGE_SUCCESS,
payload: actions,
@ -74,7 +74,7 @@ export const updateAction = (payload: { id: string }) => {
};
};
export const updateActionSuccess = (payload: { data: RestAction }) => {
export const updateActionSuccess = (payload: { data: Action }) => {
return {
type: ReduxActionTypes.UPDATE_ACTION_SUCCESS,
payload,
@ -107,7 +107,7 @@ export const moveActionRequest = (payload: {
};
};
export const moveActionSuccess = (payload: RestAction) => {
export const moveActionSuccess = (payload: Action) => {
return {
type: ReduxActionTypes.MOVE_ACTION_SUCCESS,
payload,
@ -135,10 +135,7 @@ export const copyActionRequest = (payload: {
};
};
export const copyActionSuccess = (payload: {
id: string;
destinationPageId: string;
}) => {
export const copyActionSuccess = (payload: Action) => {
return {
type: ReduxActionTypes.COPY_ACTION_SUCCESS,
payload,

36
app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
View File

@ -46,35 +46,17 @@ type Props = EditorProps &
class EmbeddedDatasourcePathComponent extends React.Component<Props> {
handleDatasourceUrlUpdate = (datasourceUrl: string) => {
const { datasource, pluginId, orgId, datasourceList } = this.props;
const { datasource, pluginId, orgId } = this.props;
const urlHasUpdated =
datasourceUrl !== datasource.datasourceConfiguration?.url;
if (urlHasUpdated) {
if ("id" in datasource && datasource.id) {
this.props.updateDatasource({
...DEFAULT_DATASOURCE(pluginId, orgId),
datasourceConfiguration: {
...datasource.datasourceConfiguration,
url: datasourceUrl,
},
});
} else {
const matchesExistingDatasource = _.find(
datasourceList,
d => d.datasourceConfiguration?.url === datasourceUrl,
);
if (matchesExistingDatasource) {
this.props.updateDatasource(matchesExistingDatasource);
} else {
this.props.updateDatasource({
...DEFAULT_DATASOURCE(pluginId, orgId),
datasourceConfiguration: {
...datasource.datasourceConfiguration,
url: datasourceUrl,
},
});
}
}
this.props.updateDatasource({
...DEFAULT_DATASOURCE(pluginId, orgId),
datasourceConfiguration: {
...datasource.datasourceConfiguration,
url: datasourceUrl,
},
});
}
};
@ -113,7 +95,7 @@ class EmbeddedDatasourcePathComponent extends React.Component<Props> {
const matches = value.match(urlGroupsRegexExp);
if (matches && matches.length) {
datasourceUrl = matches[1];
path = `${matches[2]}${matches[3]}`;
path = `${matches[2] || ""}${matches[3] || ""}`;
}
} else {
datasourceUrl = value;

1
app/client/src/reducers/entityReducers/actionsReducer.tsx
View File

@ -249,6 +249,7 @@ const actionsReducer = createReducer(initialState, {
...a,
config: {
...a.config,
id: "TEMP_COPY_ID",
name: action.payload.name,
pageId: action.payload.destinationPageId,
},

2
app/client/src/sagas/ActionSagas.ts
View File

@ -384,7 +384,7 @@ export function* refactorActionName(
}
function* saveApiNameSaga(action: ReduxAction<{ id: string; name: string }>) {
// Takes from drafts, checks if the name isValid, saves
// Takes from state, checks if the name isValid, saves
const apiId = action.payload.id;
const api = yield select(state =>
state.entities.actions.find(

2
deploy/aws/base-install.sh
View File

@ -49,7 +49,7 @@ cd $boot_script_path
sudo curl -O https://raw.githubusercontent.com/appsmithorg/appsmith/release/deploy/configure-ssl.sh
sudo chown ubuntu:ubuntu $boot_script_path/$config_ssl_file_name && sudo chmod +x $boot_script_path/$config_ssl_file_name
sudo curl -O https://raw.githubusercontent.com/appsmithorg/appsmith/feature/deploy-script/deploy/aws/boot.sh
sudo curl -O https://raw.githubusercontent.com/appsmithorg/appsmith/release/deploy/aws/boot.sh
sudo chown ubuntu:ubuntu $boot_script_path/$boot_file_name && sudo chmod +x $boot_script_path/$boot_file_name
USER="ubuntu"