From ea593221b30a360bb26e3e283f2d88b153313a31 Mon Sep 17 00:00:00 2001
From: Akshay Gupta <gravity.akshay@gmail.com>
Date: Tue, 4 Jun 2024 15:52:52 +0530
Subject: [PATCH] Add new changes from token-studio-develop merge

---
 .gimlet/penpot-pr.yaml                           |  2 +-
 .gimlet/penpot-prod.yaml                         |  1 -
 .github/workflows/pr.yaml                        | 16 +++++++++-------
 .github/workflows/publish.yml                    |  5 +++--
 .../main/ui/workspace/tokens/context_menu.scss   | 15 +++++++++++++--
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index e53344369..f8cdaaf58 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -14,7 +14,7 @@ values:
   image:
     pullPolicy: IfNotPresent
     repository: ghcr.io/tokens-studio/tokens-studio-for-penpot
-    tag: 'frontend-{{ .SHA }}'
+    tag: 'frontend-pr-{{ .SHA }}'
   ingress:     
     hosts:
       - host: "{{ .BRANCH | sanitizeDNSName }}.penpot.staging.tokens.studio"
diff --git a/.gimlet/penpot-prod.yaml b/.gimlet/penpot-prod.yaml
index f3f84e2ae..bf6ca80cb 100644
--- a/.gimlet/penpot-prod.yaml
+++ b/.gimlet/penpot-prod.yaml
@@ -116,7 +116,6 @@ manifests: |
           enabled: true
           annotations:
             cert-manager.io/cluster-issuer: letsencrypt-prod
-            networking.gke.io/v1beta1.FrontendConfig: default-frontend-config
           hosts:
             - host: penpot.tokens.studio
           tls:
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index fdbaa0c15..23f9290ec 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -12,7 +12,8 @@ jobs:
       matrix:
         include:
           - dockerfile: Dockerfile.frontend
-            type: frontend
+            type: pr-frontend
+            name: frontend
     permissions:
       contents: read
       packages: write
@@ -30,7 +31,7 @@ jobs:
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GHCR_TOKEN  }}
+        password: ${{ secrets.PAT_TOKEN  }}
 
     - name: Docker meta
       id: meta
@@ -42,9 +43,9 @@ jobs:
           ghcr.io/tokens-studio/tokens-studio-for-penpot
     - name: prebuild
       run: |
-        echo "Building ${{ matrix.type }} image"
-        ./manage.sh build-${{matrix.type}}-bundle
-        mv ./bundles/${{matrix.type}} ./docker/images/bundle-${{matrix.type}}/
+        echo "Building ${{ matrix.name }} image"
+        ./manage.sh build-${{matrix.name}}-bundle
+        mv ./bundles/${{matrix.name}} ./docker/images/bundle-${{matrix.name}}/
 
     - name: Publish Docker images
       uses: docker/build-push-action@v5
@@ -65,5 +66,6 @@ jobs:
       - name: 🍍 Deploy with Gimlet
         uses: gimlet-io/gimlet-artifact-shipper-action@v0.8.3
         env:
-            GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
-            GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
\ No newline at end of file
+          GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
+          GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
+          DEPLOY: 'true'
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ce86277dc..b278fef22 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -31,7 +31,8 @@ jobs:
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GHCR_TOKEN  }}
+        password: ${{ secrets.PAT_TOKEN  }}
+        
 
     - name: Docker meta
       id: meta
@@ -71,7 +72,7 @@ jobs:
         with:
           ENV: "prod"
           APP: "penpot"
-          DEPLOY: "true"
+          WAIT: "true"
   smoke:
     runs-on: ubuntu-latest
     needs:
diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.scss b/frontend/src/app/main/ui/workspace/tokens/context_menu.scss
index 49fe69662..25505f4e9 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.scss
@@ -24,8 +24,19 @@
   background-color: var(--menu-background-color);
   max-height: 100vh;
   overflow-y: auto;
+
+  // TODO: Fixes missing styles from parent context menu
+  li {
+    @include bodySmallTypography;
+    color: var(--menu-foreground-color);
+  }
 }
 
-.token-context-submenu {
-  position: absolute;
+// TODO: Allow selected items wihtout an icon for the context menu
+.empty-icon {
+  width: 0;
+  height: 0;
+}
+.hidden-icon {
+  width: 11px;
 }