Merge pull request #2007 from appsmithorg/release

Release v1.2.21
appsmithorg · Dec 3, 2020 · 680e964 · 680e964
2 parents 3e31884 + 91127ed
commit 680e964
Show file tree

Hide file tree

Showing 156 changed files with 4,341 additions and 1,975 deletions.
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
@@ -1,4 +1,4 @@
-name: Appsmith Github Release Workflow 
+name: Appsmith Github Release Workflow
 
 on:
   push:
@@ -14,56 +14,56 @@ jobs:
         working-directory: app/client
 
     steps:
-    # Checkout the code
-    - uses: actions/checkout@v2
-
-    - name: Use Node.js 10.16.3
-      uses: actions/setup-node@v1
-      with:
-        node-version: '10.16.3'
-        
-    # Retrieve npm dependencies from cache. After a successful run, these dependencies are cached again
-    - name: Cache npm dependencies
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-yarn-dependencies
-      with:
-        # npm dependencies are stored in `~/.m2` on Linux/macOS
-        path: ~/.npm
-        key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
+      # Checkout the code
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 10.16.3
+        uses: actions/setup-node@v1
+        with:
+          node-version: "10.16.3"
+
+      # Retrieve npm dependencies from cache. After a successful run, these dependencies are cached again
+      - name: Cache npm dependencies
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-yarn-dependencies
+        with:
+          # npm dependencies are stored in `~/.m2` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.OS }}-node-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
             ${{ runner.OS }}-node-
             ${{ runner.OS }}-
-  
-      # Install all the dependencies
-    - name: Install dependencies
-      run: yarn install
-
-    - name: Set the build environment based on the branch
-      id: vars
-      run: |
-        REACT_APP_ENVIRONMENT="PRODUCTION"
-        echo ::set-output name=REACT_APP_ENVIRONMENT::${REACT_APP_ENVIRONMENT}
-    
-    - name: Create the bundle
-      run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} REACT_APP_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} yarn build
-      
-    - name: Get the version
-      id: get_version
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-      
-    # Build Docker image and push to Docker Hub
-    - 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
+
+        # Install all the dependencies
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Set the build environment based on the branch
+        id: vars
+        run: |
+          REACT_APP_ENVIRONMENT="PRODUCTION"
+          echo ::set-output name=REACT_APP_ENVIRONMENT::${REACT_APP_ENVIRONMENT}
+
+      - name: Create the bundle
+        run: REACT_APP_ENVIRONMENT=${{steps.vars.outputs.REACT_APP_ENVIRONMENT}} REACT_APP_FUSIONCHARTS_LICENSE_KEY=${{ secrets.APPSMITH_FUSIONCHARTS_LICENSE_KEY }} REACT_APP_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} yarn build
+
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
+
+      # Build Docker image and push to Docker Hub
+      - 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
 
   build-server:
     runs-on: ubuntu-latest
@@ -72,78 +72,77 @@ jobs:
         working-directory: app/server
 
     steps:
-    # Checkout the code
-    - uses: actions/checkout@v2
-    
-    # Setup Java
-    - name: Set up JDK 1.11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.11
-    
-    # Retrieve maven dependencies from cache. After a successful run, these dependencies are cached again
-    - name: Cache maven dependencies
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-maven-dependencies
-      with:
-        # maven dependencies are stored in `~/.m2` on Linux/macOS
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-    
-    # Build the code
-    - name: Build without running any tests
-      run: mvn -B package -DskipTests
-    
-    - name: Get the version
-      id: get_version
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-    
-    # Build Docker image and push to Docker Hub
-    - name: Push image to Docker Hub
-      run: |
-        docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -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 --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -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
+      # Checkout the code
+      - uses: actions/checkout@v2
+
+      # Setup Java
+      - name: Set up JDK 1.11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.11
+
+      # Retrieve maven dependencies from cache. After a successful run, these dependencies are cached again
+      - name: Cache maven dependencies
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-maven-dependencies
+        with:
+          # maven dependencies are stored in `~/.m2` on Linux/macOS
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      # Build the code
+      - name: Build without running any tests
+        run: mvn -B package -DskipTests
+
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
+
+      # Build Docker image and push to Docker Hub
+      - name: Push image to Docker Hub
+        run: |
+          docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -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 --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -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
 
   create-release:
-    needs: 
+    needs:
       - build-server
       - build-client
     runs-on: ubuntu-latest
 
     steps:
-    # Creating the release on Github
-    - name: Get the version
-      id: get_version
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
-
-    # If the tag has the string "beta", then mark the Github release as a pre-release
-    - name: Get the version
-      id: get_prerelease
-      run: |
-        STATUS=false
-        if [[ ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then 
-          STATUS=true
-        fi
-
-        echo ::set-output name=status::${STATUS}
-
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: ${{steps.get_prerelease.outputs.status}}
-
+      # Creating the release on Github
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/}
+
+      # If the tag has the string "beta", then mark the Github release as a pre-release
+      - name: Get the version
+        id: get_prerelease
+        run: |
+          STATUS=false
+          if [[ ${{steps.get_version.outputs.tag}} == *"beta"* ]]; then 
+            STATUS=true
+          fi
+
+          echo ::set-output name=status::${STATUS}
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: ${{steps.get_prerelease.outputs.status}}
diff --git a/README.md b/README.md
@@ -1,12 +1,17 @@
 <p align="center">
     <img src="https://github.com/appsmithOrg/appsmith/blob/release/static/appsmith_logo_primary.png" alt="Appsmith.com logo" width="400"/>
+    <br>
+    <i>Appsmith is a JavaScript-based visual development platform to build internal tools.</i>
+  <br>
+</p>
+
+<p align="center">
+    <a href="https://app.appsmith.com/signup"><strong>Try Online Sandbox</strong></a>
 </p>
 
 <p align="center">
   <a href="https://docs.appsmith.com/">Documentation</a>
   ·
-  <a href="https://github.com/appsmithorg/appsmith/releases/latest">Latest Release</a>
-  ·
   <a href="https://discord.gg/rBTTVJp">Discord</a>
   <br>
   <br>
@@ -16,8 +21,9 @@
 <div>    
 Appsmith is a JavaScript-based visual development platform to build and launch internal tools quickly. Drag-and-drop pre-built widgets, and connect them using JavaScript to create interactive pages. Connect UI to your APIs and Databases to build complex workflows in minutes.<br/><br/>
 
+**UI Components**: Table, Chart, Form, Map, Image, Video, and many more.<br/>
 **API Support**: REST APIs<br/>
-**Database Support**: PostgreSQL, MongoDB, MySQL, Redshift, Elastic Search, DynamoDB, Redis, & MSFT SQL Server<br/>
+**Database Support**: PostgreSQL, MongoDB, MySQL, Redshift, Elastic Search, DynamoDB, Redis, and MSFT SQL Server<br/>
 **Hosting**: Cloud-hosted & On-premise
 
 Already familiar with Appsmith? [Quickly start building on your own](#%EF%B8%8F-quickstart).
@@ -33,7 +39,7 @@ Already familiar with Appsmith? [Quickly start building on your own](#%EF%B8%8F-
 ## 🏭 Features
 
 * **5-minute setup**: Deploy Appsmith on your server, or use our cloud version to start building in 5 minutes. [Quick Start](#%EF%B8%8F-quickstart)
-* **Frontend as a service**: Drag-and-drop to build sophisticated **dashboards** and **workflows, without writing HTML/CSS**. Write JavaScript anywhere to transform data, and dynamically control widget-properties.
+* **Frontend as a service**: Drag-and-drop from pre-built UI widgets like table, form, and image, to build sophisticated **dashboards** and **workflows, without writing HTML/CSS**. Write JavaScript anywhere to transform data, and dynamically control widget-properties.
 * **Database CRUD**: Query & update your database directly by connecting it to the UI. Connect to **PostgreSQL, MongoDB, MySQL & more!**
 * **Trigger APIs**: Connect to REST APIs to build custom apps.
 * **Security**: DB Credentials are AES 256 encrypted and no data is stored by appsmith. Deploy behind your private VPC for additional security!

diff --git a/app.json b/app.json
@@ -17,6 +17,9 @@
     "logo": "https://raw.githubusercontent.com/appsmithorg/appsmith/release/static/logo.png",
     "success_url": "/",
     "stack": "container",
+    "scripts": {
+        "postdeploy" : "/analytics.sh"
+    },
     "env": {
       "APPSMITH_MONGODB_URI": {
         "description": "Your Mongo Database URI",

diff --git a/app/client/.gitignore b/app/client/.gitignore
@@ -33,9 +33,12 @@ cypress/screenshots
 /cypress.env.json
 results/
 
+
 /docker/*.pem
 /docker/nginx.conf
 /docker/nginx-root.conf
 
 storybook-static/*
 build-storybook.log
+
+.eslintcache
diff --git a/app/client/Dockerfile b/app/client/Dockerfile
@@ -5,7 +5,7 @@ COPY ./build /var/www/appsmith
 EXPOSE 80
 # This is the default nginx template file inside the container. 
 # This is replaced by the install.sh script during a deployment
-COPY ./docker/templates/nginx-linux.conf.template /nginx.conf.template
+COPY ./docker/templates/nginx-app.conf.template /nginx.conf.template
 COPY ./docker/templates/nginx-root.conf.template /nginx-root.conf.template
 # This is the script that is used to start Nginx when the Docker container starts
 COPY ./docker/start-nginx.sh /start-nginx.sh

diff --git a/app/client/cypress/fixtures/formWidgetdsl.json b/app/client/cypress/fixtures/formWidgetdsl.json
@@ -46,6 +46,22 @@
                 "parentId": "sidaue1kdu",
                 "widgetId": "ac6cc8wmlu"
               },
+              {
+                "isVisible": true,
+                "label": "Label",
+                "defaultCheckedState": true,
+                "widgetName": "Checkbox1",
+                "type": "CHECKBOX_WIDGET",
+                "isLoading": false,
+                "parentColumnSpace": 71.75,
+                "parentRowSpace": 38,
+                "leftColumn": 10,
+                "rightColumn": 13,
+                "topRow": 4,
+                "bottomRow": 5,
+                "parentId": "e3tq9qwta6",
+                "widgetId": "szjhneuog5"
+              },
               {
                 "isVisible": true,
                 "widgetName": "FormButton1",