WI-5739 Add PR deployment workflow

.github/workflows/build.yml

@@ -4,8 +4,11 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    types: [opened, reopened, synchronize]
+  workflow_call:
+    outputs:
+      tag_hash:
+        description: "The commit hash used to tag the Docker image"
+        value: ${{ jobs.build-image.outputs.tag_hash }}
 
 env:
   AWS_REGION: eu-west-1
@@ -14,6 +17,9 @@ jobs:
   build-image:
     name: Build, Tag and Upload
     runs-on: ubuntu-latest
+    env:
+      SUPERSET_REPOSITORY_URI: "289222877357.dkr.ecr.eu-west-1.amazonaws.com/webgains/superset"
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -22,14 +28,14 @@ jobs:
         run: mkdir dist
 
       - name: Compute labels
+        id: compute_labels
         run: |
           TAG_HASH="$(echo $GITHUB_SHA | head -c 8)"
           TAG_NAME="$(echo $GITHUB_REF | sed -E -e 's:refs/pull/([0-9]+)/merge:pr.\1:' -e 's:refs/heads/::' -e 's:tag/v?([.0-9]+):v\1:' -e 's:/:.:')"
-          SUPERSET_REPOSITORY_URI="289222877357.dkr.ecr.eu-west-1.amazonaws.com/webgains/superset"
           echo "TAG_HASH=$TAG_HASH" >> $GITHUB_ENV
           echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
-          echo "SUPERSET_REPOSITORY_URI=$SUPERSET_REPOSITORY_URI" >> $GITHUB_ENV
           if [ $TAG_NAME = "main" ]; then echo "LATEST_TAG=$SUPERSET_REPOSITORY_URI:latest" >> $GITHUB_ENV; fi
+          echo "tag_hash=$TAG_HASH" >> $GITHUB_OUTPUT
 
       - name: Configure AWS Credentials
         uses: aws-actions/[email protected]
@@ -56,3 +62,5 @@ jobs:
             ${{ env.SUPERSET_REPOSITORY_URI }}:${{ env.TAG_HASH }}
             ${{ env.SUPERSET_REPOSITORY_URI }}:${{ env.TAG_NAME }}
             ${{ env.LATEST_TAG }}
+    outputs:
+      tag_hash: ${{ steps.compute_labels.outputs.tag_hash }}

.github/workflows/license-check.yml

@@ -1,8 +1,9 @@
 name: License Template Check
 
 on:
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+  workflow_dispatch:
+#  pull_request:
+#    types: [synchronize, opened, reopened, ready_for_review]
 
 # cancel previous workflow jobs for PRs
 concurrency:

.github/workflows/pr-closed.yml

@@ -0,0 +1,18 @@
+name: PR Cleanup
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  destroy:
+    name: Destroy Stack
+    uses: webgains/github-workflows/.github/workflows/destroy-stack.yml@main
+    secrets: inherit
+    with:
+      environment: feature
+      stack: superset-pr-${{ github.event.pull_request.number }}SupersetService
+    permissions:
+      contents: read
+      deployments: write
+      id-token: write

.github/workflows/pr-deployment.yml

@@ -0,0 +1,50 @@
+name: PR Deployment
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    name: Build
+    secrets: inherit
+    permissions:
+      checks: write
+      actions: write
+      contents: write
+      packages: read
+      issues: read
+      pull-requests: write
+
+  labels:
+    runs-on: ubuntu-latest
+    name: Add Labels
+    steps:
+      - name: Add labels
+        id: add_labels
+        run: |
+          echo "feature_name=superset-pr-${{ github.event.pull_request.number }}" | sed 's:\.:-:g' >> $GITHUB_OUTPUT
+    outputs:
+      feature_name: ${{ steps.add_labels.outputs.feature_name }}
+
+  deploy:
+    name: Deploy to Feature Environment
+    needs: [labels, build]
+    uses: webgains/github-workflows/.github/workflows/deploy-service-to-environment.yml@WI-5868-allow-service-deploy-workflow-to-use-any-repositor
+    secrets: inherit
+    with:
+      environment: feature
+      name: ${{ needs.labels.outputs.feature_name }}
+      stack: ${{ needs.labels.outputs.feature_name }}
+      service: superset
+      component: service
+      override: |
+        {
+          "namespace": "${{ needs.labels.outputs.feature_name }}",
+          "supersetImageTag": "${{ needs.build.outputs.tag_hash }}"
+        }
+    permissions:
+      contents: read
+      deployments: write
+      id-token: write

.github/workflows/pr-lint.yml

@@ -1,12 +1,13 @@
 name: PR Lint
 
 on:
-  pull_request:
+  workflow_dispatch:
+#  pull_request:
     # By default, a workflow only runs when a pull_request's activity type is opened, synchronize, or reopened. We
     # explicity override here so that PR titles are re-linted when the PR text content is edited.
     #
     # Possible values: https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request
-    types: [opened, edited, reopened, synchronize]
+#    types: [opened, edited, reopened, synchronize]
 
 jobs:
   lint-check:

.github/workflows/superset-e2e.yml

@@ -1,12 +1,12 @@
 name: E2E
 
 on:
-  push:
-    branches:
-      - "master"
-      - "[0-9].[0-9]*"
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+#  push:
+#    branches:
+#      - "master"
+#      - "[0-9].[0-9]*"
+#  pull_request:
+#    types: [synchronize, opened, reopened, ready_for_review]
   workflow_dispatch:
     inputs:
       use_dashboard:

.github/workflows/superset-frontend.yml

@@ -1,12 +1,13 @@
 name: Frontend
 
 on:
-  push:
-    branches:
-      - "master"
-      - "[0-9].[0-9]*"
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - "master"
+#      - "[0-9].[0-9]*"
+#  pull_request:
+#    types: [synchronize, opened, reopened, ready_for_review]
 
 # cancel previous workflow jobs for PRs
 concurrency:

superset-frontend/plugins/plugin-chart-table/src/DataTable/DataTable.tsx

@@ -379,7 +379,11 @@ export default typedMemo(function DataTable<D extends object>({
               ) : null}
             </div>
             {searchInput ? (
-              <div className={renderTimeComparisonDropdown ? 'col-sm-10' : 'col-sm-11'}>
+              <div
+                className={
+                  renderTimeComparisonDropdown ? 'col-sm-10' : 'col-sm-11'
+                }
+              >
                 <GlobalFilter<D>
                   searchInput={
                     typeof searchInput === 'boolean' ? undefined : searchInput

superset/config.py

@@ -400,7 +400,7 @@ def _try_json_readsha(filepath: str, length: int) -> str | None:
     "it": {"flag": "it", "name": "Italian"},
     "fr": {"flag": "fr", "name": "French"},
     "de": {"flag": "de", "name": "German"},
-    "nl": {"flag": "nl", "name": "Dutch"}
+    "nl": {"flag": "nl", "name": "Dutch"},
 }
 
 

superset/jinja_context.py

@@ -355,30 +355,27 @@ def get_filters(self, column: str, remove_filter: bool = False) -> list[Filter]:
             op: str = flt["operator"].upper() if flt.get("operator") else None
             # fltOpName: str = flt.get("filterOptionName")
             if (
-                (flt.get("expressionType") == "SIMPLE"
+                flt.get("expressionType") == "SIMPLE"
                 and flt.get("clause") == "WHERE"
-                and flt.get("subject") == column
-                and val)
-                or 
-                (isinstance(flt.get("subject"), dict)
-                and flt.get("expressionType") == "SIMPLE"
-                and flt.get("clause") == "WHERE"
-                and flt.get("subject").get("label") == column
-                and val)
+                and val
             ):
-                if remove_filter:
-                    if column not in self.removed_filters:
-                        self.removed_filters.append(column)
-                if column not in self.applied_filters:
-                    self.applied_filters.append(column)
-
-                if op in (
-                    FilterOperator.IN.value,
-                    FilterOperator.NOT_IN.value,
-                ) and not isinstance(val, list):
-                    val = [val]
-
-                filters.append({"op": op, "col": column, "val": val})
+                if (flt.get("subject") == column) or (
+                    isinstance(flt.get("subject"), dict)
+                    and flt.get("subject").get("label") == column
+                ):
+                    if remove_filter:
+                        if column not in self.removed_filters:
+                            self.removed_filters.append(column)
+                    if column not in self.applied_filters:
+                        self.applied_filters.append(column)
+
+                    if op in (
+                        FilterOperator.IN.value,
+                        FilterOperator.NOT_IN.value,
+                    ) and not isinstance(val, list):
+                        val = [val]
+
+                    filters.append({"op": op, "col": column, "val": val})
 
         return filters
 

superset/security/manager.py

@@ -2662,7 +2662,9 @@ def has_guest_access(self, dashboard: "Dashboard") -> bool:
             return False
 
         dashboards = [
-            r for r in user.resources if r["type"] == GuestTokenResourceType.DASHBOARD.value
+            r
+            for r in user.resources
+            if r["type"] == GuestTokenResourceType.DASHBOARD.value
         ]
 
         # TODO (embedded): remove this check once uuids are rolled out

superset/views/base.py

@@ -31,9 +31,9 @@
     g,
     get_flashed_messages,
     redirect,
+    request,
     Response,
     session,
-    request
 )
 from flask_appbuilder import BaseView, expose, Model, ModelView
 from flask_appbuilder.actions import action
@@ -350,8 +350,8 @@ def cached_common_bootstrap_data(  # pylint: disable=unused-argument
 
 def common_bootstrap_payload() -> dict[str, Any]:
     locale = get_locale()
-    if request.args.get('lang'):
-        locale = Locale.parse(request.args.get('lang'))
+    if request.args.get("lang"):
+        locale = Locale.parse(request.args.get("lang"))
     return {
         **cached_common_bootstrap_data(utils.get_user_id(), locale),
         "flash_messages": get_flashed_messages(with_categories=True),