Skip to content

Commit

Permalink
Merge pull request appsmithorg#3739 from appsmithorg/release
Browse files Browse the repository at this point in the history
Release 1.4.5
  • Loading branch information
hetunandu authored Mar 29, 2021
2 parents da2fb11 + f99d3a6 commit 6c79e6b
Show file tree
Hide file tree
Showing 190 changed files with 6,155 additions and 1,218 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/client-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,13 @@ jobs:
echo ::set-output name=version::$next_version-SNAPSHOT
- name: Run the jest tests
run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} yarn run test:unit
if: github.event_name == 'pull_request'
uses: hetunandu/Jest-Coverage-Diff@fix/new-delete-file
with:
fullCoverageDiff: false
runCommand: cd app/client && REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} yarn run test:unit
# percentage of drop in coverage accepted
delta: 2

# We burn React environment & the Segment analytics key into the build itself.
# This is to ensure that we don't need to configure it in each installation
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/client-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@ jobs:
if: github.ref == 'refs/heads/release' || github.event.pull_request.base.ref == 'release'
shell: bash
run: |
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
--env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
--env APPSMITH_REDIS_URL=redis://localhost:6379 \
Expand All @@ -213,8 +211,6 @@ jobs:
if: github.ref == 'refs/heads/master' || github.event.pull_request.base.ref == 'master'
shell: bash
run: |
echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
docker run -d --net=host --name appsmith-internal-server -p 8080:8080 \
--env APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith \
--env APPSMITH_REDIS_URL=redis://localhost:6379 \
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/remove-old-artifacts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Remove old artifacts

on:
# Run on manual trigger
workflow_dispatch:

schedule:
# Every day at 1am
- cron: "0 1 * * *"

jobs:
remove-old-artifacts:
runs-on: ubuntu-latest
timeout-minutes: 20

steps:
- name: Remove old artifacts
uses: c-hive/gha-remove-artifacts@v1
with:
age: "1 day"
# Optional inputs
# skip-tags: true
# skip-recent: 5
2 changes: 1 addition & 1 deletion .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
strategy:
fail-fast: false
matrix:
job: [0, 1, 2, 3, 4, 5, 6]
job: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]

steps:
# Checkout the code
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
.idea
*.iml
.env

# test coverage
coverage-summary.json
1 change: 1 addition & 0 deletions app/client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# testing
/coverage


# production
/build

Expand Down
63 changes: 63 additions & 0 deletions app/client/cypress/fixtures/datepicker_switchDsl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"dsl": {
"widgetName": "MainContainer",
"backgroundColor": "none",
"rightColumn": 1118,
"snapColumns": 16,
"detachFromLayout": true,
"widgetId": "0",
"topRow": 0,
"bottomRow": 1280,
"containerStyle": "none",
"snapRows": 33,
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"version": 15,
"minHeight": 1292,
"parentColumnSpace": 1,
"dynamicBindingPathList": [],
"leftColumn": 0,
"children": [
{
"isVisible": true,
"isDisabled": false,
"datePickerType": "DATE_PICKER",
"label": "",
"dateFormat": "DD/MM/YYYY HH:mm",
"widgetName": "DatePicker1",
"defaultDate": "2021-03-15T10:43:21.285Z",
"version": 2,
"type": "DATE_PICKER_WIDGET2",
"isLoading": false,
"parentColumnSpace": 67.375,
"parentRowSpace": 40,
"leftColumn": 5,
"rightColumn": 10,
"topRow": 0,
"bottomRow": 1,
"parentId": "0",
"widgetId": "pmyus6irev"
},
{
"isVisible": true,
"label": "Label",
"defaultSwitchState": true,
"widgetName": "Switch1",
"alignWidget": "LEFT",
"version": 1,
"type": "SWITCH_WIDGET",
"isLoading": false,
"parentColumnSpace": 67.375,
"parentRowSpace": 40,
"leftColumn": 6,
"rightColumn": 8,
"topRow": 2,
"bottomRow": 3,
"parentId": "0",
"widgetId": "53dyd9egae"
}
],
"dynamicTriggerPathList": []
}
}
60 changes: 60 additions & 0 deletions app/client/cypress/fixtures/example.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,5 +195,65 @@
"productName": "Tuna Salad",
"orderAmount": 9.99
}
],
"ChartCustomConfig": {"type": "area2d",
"dataSource": {
"chart": {
"caption": "Countries With Most Oil Reserves [2017-18]",
"subCaption": "In MMbbl = One Million barrels",
"xAxisName": "Country",
"yAxisName": "Reserves (MMbbl)",
"numberSuffix": "K"
},
"data": [
{
"label": "Venezuela",
"value": "290"
},
{
"label": "Saudi",
"value": "260"
},
{
"label": "Canada",
"value": "180"
},
{
"label": "Iran",
"value": "140"
},
{
"label": "Russia",
"value": "115"
},
{
"label": "UAE",
"value": "100"
},
{
"label": "US",
"value": "30"
},
{
"label": "China",
"value": "30"
}
]
}},
"TableInputWithNull": [
{
"id": 2381224,
"email": "[email protected]",
"userName": "Michael Lawson",
"productName": "Chicken Sandwich",
"orderAmount": null
},
{
"id": 2736212,
"email": "[email protected]",
"userName": "Lindsay Ferguson",
"productName": "Tuna Salad",
"orderAmount": 9.99
}
]
}
133 changes: 133 additions & 0 deletions app/client/cypress/fixtures/formSwitchDsl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"dsl": {
"widgetName": "MainContainer",
"backgroundColor": "none",
"rightColumn": 1118,
"snapColumns": 16,
"detachFromLayout": true,
"widgetId": "0",
"topRow": 0,
"bottomRow": 1280,
"containerStyle": "none",
"snapRows": 33,
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"version": 14,
"minHeight": 1292,
"parentColumnSpace": 1,
"dynamicBindingPathList": [],
"leftColumn": 0,
"children": [
{
"isVisible": true,
"widgetName": "Form1",
"backgroundColor": "white",
"children": [
{
"isVisible": true,
"widgetName": "Canvas1",
"version": 1,
"containerStyle": "none",
"canExtend": false,
"detachFromLayout": true,
"children": [
{
"isVisible": true,
"text": "Form",
"textStyle": "HEADING",
"textAlign": "LEFT",
"widgetName": "Text1",
"version": 1,
"type": "TEXT_WIDGET",
"isLoading": false,
"leftColumn": 0,
"rightColumn": 12,
"topRow": 0,
"bottomRow": 1,
"parentId": "xht61hwrwp",
"widgetId": "xbcdejxqqi"
},
{
"isVisible": true,
"widgetName": "FormButton1",
"text": "Submit",
"isDefaultClickDisabled": true,
"version": 1,
"buttonStyle": "PRIMARY_BUTTON",
"disabledWhenInvalid": true,
"resetFormOnClick": true,
"type": "FORM_BUTTON_WIDGET",
"isLoading": false,
"leftColumn": 12,
"rightColumn": 16,
"topRow": 11,
"bottomRow": 12,
"parentId": "xht61hwrwp",
"widgetId": "v5ivupuzl0"
},
{
"isVisible": true,
"widgetName": "FormButton2",
"text": "Reset",
"isDefaultClickDisabled": true,
"version": 1,
"buttonStyle": "SECONDARY_BUTTON",
"disabledWhenInvalid": false,
"resetFormOnClick": true,
"type": "FORM_BUTTON_WIDGET",
"isLoading": false,
"leftColumn": 8,
"rightColumn": 12,
"topRow": 11,
"bottomRow": 12,
"parentId": "xht61hwrwp",
"widgetId": "u3hmsi7blk"
},
{
"isVisible": true,
"label": "Label",
"defaultSwitchState": true,
"widgetName": "Switch1",
"alignWidget": "LEFT",
"version": 1,
"type": "SWITCH_WIDGET",
"isLoading": false,
"parentColumnSpace": 26.9765625,
"parentRowSpace": 40,
"leftColumn": 4,
"rightColumn": 6,
"topRow": 4,
"bottomRow": 5,
"parentId": "xht61hwrwp",
"widgetId": "xq23pko1ff"
}
],
"minHeight": 520,
"type": "CANVAS_WIDGET",
"isLoading": false,
"parentColumnSpace": 1,
"parentRowSpace": 1,
"leftColumn": 0,
"rightColumn": 471.625,
"topRow": 0,
"bottomRow": 520,
"parentId": "c99gng6mgt",
"widgetId": "xht61hwrwp"
}
],
"type": "FORM_WIDGET",
"isLoading": false,
"parentColumnSpace": 67.375,
"parentRowSpace": 40,
"leftColumn": 2,
"rightColumn": 9,
"topRow": 13,
"bottomRow": 26,
"parentId": "0",
"widgetId": "c99gng6mgt"
}
],
"dynamicTriggerPathList": []
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,14 @@ describe("API Panel Test Functionality", function() {
cy.NavigateToAPI_Panel();
cy.CreateAPI("CrashTestAPI");
cy.SelectAction(testdata.postAction);
cy.xpath(apiwidget.postDefaultContentTypeHeaderKey)
cy.xpath(apiwidget.headerKey)
.first()
.focus({ force: true })
.type("{uparrow}", { force: true })
.type("{ctrl}{shift}{downarrow}", { force: true })
.type("{backspace}", { force: true });
// assert so that this fails
cy.xpath(apiwidget.postDefaultContentTypeHeaderKey).should("be.visible");
cy.xpath(apiwidget.postDefaultContentTypeHeaderKey).should(
"have.value",
"",
);
cy.xpath(apiwidget.headerKey).should("be.visible");
cy.xpath(apiwidget.headerKey).should("have.value", "");
});
});
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable cypress/no-unnecessary-waiting */
const commonlocators = require("../../../../locators/commonlocators.json");
const viewWidgetsPage = require("../../../../locators/ViewWidgets.json");
const publish = require("../../../../locators/publishWidgetspage.json");
Expand Down
Loading

0 comments on commit 6c79e6b

Please sign in to comment.