Merge branch 'develop' into wip/radeusgd/datalinks-as-symlinks

enso-org · Dec 30, 2024 · 953ff1d · 953ff1d
2 parents 96e7dda + 7403870
commit 953ff1d
Show file tree

Hide file tree

Showing 40 changed files with 1,405 additions and 395 deletions.
diff --git a/.github/workflows/gui-changed-files.yml b/.github/workflows/gui-changed-files.yml
@@ -37,7 +37,6 @@ jobs:
             .prettierignore
             vitest.workspace.ts
             .github/workflows/gui*
-            .github/workflows/ide*
             .github/workflows/storybook.yml
           files_ignore: |
             app/ide-desktop/**

diff --git a/.github/workflows/ide-changed-files.yml b/.github/workflows/ide-changed-files.yml
@@ -0,0 +1,44 @@
+# This file is not auto-generated. Feel free to edit it.
+
+name: IDE Changed Files
+
+on:
+  workflow_call:
+    outputs:
+      all_changed_files:
+        description: "Returns all changed files"
+        value: ${{ jobs.ide-changed-files.outputs.all_changed_files }}
+      any_changed:
+        description: "Returns `true` when any of the filenames have changed"
+        value: ${{ jobs.ide-changed-files.outputs.any_changed }}
+
+jobs:
+  ide-changed-files:
+    runs-on: ubuntu-latest
+    name: Changed Files
+    outputs:
+      all_changed_files: ${{ steps.ide-changed-files.outputs.all_changed_files }}
+      any_changed: ${{ steps.ide-changed-files.outputs.any_changed }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      - name: Get changed files
+        id: ide-changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: |
+            app/ide-desktop/**
+            package.json
+            pnpm-lock.yaml
+            .github/workflows/ide*
+      - name: List all changed files
+        env:
+          ALL_CHANGED_FILES: ${{ steps.ide-changed-files.outputs.all_changed_files }}
+        run: |
+          if [[ "${{ steps.ide-changed-files.outputs.any_changed }}" == "true" ]]; then
+            echo "Files changed:"
+          fi
+          for file in ${ALL_CHANGED_FILES}; do
+            echo "$file"
+          done
diff --git a/.github/workflows/ide-pull-request.yml b/.github/workflows/ide-pull-request.yml
@@ -18,6 +18,11 @@ jobs:
     uses: ./.github/workflows/gui-changed-files.yml
     secrets: inherit
 
+  ide-changed-files:
+    name: 🔍 IDE Files Changed
+    uses: ./.github/workflows/ide-changed-files.yml
+    secrets: inherit
+
   engine-changed-files:
     name: 🔍 Engine Files Changed
     uses: ./.github/workflows/engine-changed-files.yml
@@ -26,15 +31,15 @@ jobs:
   ide-packaging:
     name: 📦 Package
     uses: ./.github/workflows/ide-packaging.yml
-    needs: [gui-changed-files, engine-changed-files]
-    if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    needs: [gui-changed-files, ide-changed-files, engine-changed-files]
+    if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.ide-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
     secrets: inherit
 
   ide-packaging-optional:
     name: 📦 Package (Optional)
     uses: ./.github/workflows/ide-packaging-optional.yml
-    needs: [gui-changed-files, engine-changed-files]
-    if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
+    needs: [gui-changed-files, ide-changed-files, engine-changed-files]
+    if: needs.gui-changed-files.outputs.any_changed == 'true' || needs.ide-changed-files.outputs.any_changed == 'true' || needs.engine-changed-files.outputs.any_changed == 'true' || github.ref == 'refs/heads/develop'
     secrets: inherit
 
   required-checks:

diff --git a/app/common/src/services/Backend.ts b/app/common/src/services/Backend.ts
@@ -73,6 +73,7 @@ export const S3ObjectVersionId = newtype.newtypeConstructor<S3ObjectVersionId>()
 
 /** Unique identifier for an arbitrary asset. */
 export type AssetId = IdType[keyof IdType]
+export const AssetId = newtype.newtypeConstructor<AssetId>()
 
 /** Unique identifier for a payment checkout session. */
 export type CheckoutSessionId = newtype.Newtype<string, 'CheckoutSessionId'>

diff --git a/app/gui/integration-test/dashboard/actions/DrivePageActions.ts b/app/gui/integration-test/dashboard/actions/DrivePageActions.ts
@@ -212,6 +212,7 @@ export default class DrivePageActions<Context> extends PageActions<Context> {
       dragRowToRow(from: number, to: number) {
         return self.step(`Drag drive table row #${from} to row #${to}`, async (page) => {
           const rows = locateAssetRows(page)
+          rows.nth(from).click()
           await rows.nth(from).dragTo(rows.nth(to), {
             sourcePosition: ASSET_ROW_SAFE_POSITION,
             targetPosition: ASSET_ROW_SAFE_POSITION,

diff --git a/app/gui/src/dashboard/components/AriaComponents/Dialog/Dialog.tsx b/app/gui/src/dashboard/components/AriaComponents/Dialog/Dialog.tsx
@@ -28,7 +28,7 @@ import { DIALOG_BACKGROUND } from './variants'
 const MotionDialog = motion(aria.Dialog)
 
 const OVERLAY_STYLES = tv({
-  base: 'fixed inset-0 isolate flex items-center justify-center bg-primary/20 z-tooltip',
+  base: 'fixed inset-0 isolate flex items-center justify-center bg-primary/20',
   variants: {
     isEntering: { true: 'animate-in fade-in duration-200 ease-out' },
     isExiting: { true: 'animate-out fade-out duration-200 ease-in' },

diff --git a/app/gui/src/dashboard/components/AriaComponents/Dialog/Popover.tsx b/app/gui/src/dashboard/components/AriaComponents/Dialog/Popover.tsx
@@ -29,7 +29,7 @@ export interface PopoverProps
 }
 
 export const POPOVER_STYLES = twv.tv({
-  base: 'shadow-xl w-full overflow-clip z-tooltip',
+  base: 'shadow-xl w-full overflow-clip',
   variants: {
     isEntering: {
       true: 'animate-in fade-in placement-bottom:slide-in-from-top-1 placement-top:slide-in-from-bottom-1 placement-left:slide-in-from-right-1 placement-right:slide-in-from-left-1 ease-out duration-200',

diff --git a/app/gui/src/dashboard/components/AriaComponents/Tooltip/Tooltip.tsx b/app/gui/src/dashboard/components/AriaComponents/Tooltip/Tooltip.tsx
@@ -12,7 +12,7 @@ import * as text from '../Text'
 // =================
 
 export const TOOLTIP_STYLES = twv.tv({
-  base: 'group flex justify-center items-center text-center text-balance [overflow-wrap:anywhere] z-tooltip',
+  base: 'group flex justify-center items-center text-center text-balance [overflow-wrap:anywhere]',
   variants: {
     variant: {
       custom: '',

diff --git a/app/gui/src/dashboard/components/Badge/Badge.tsx b/app/gui/src/dashboard/components/Badge/Badge.tsx
@@ -15,7 +15,7 @@ export interface BadgeProps extends VariantProps<typeof BADGE_STYLES> {
 }
 
 export const BADGE_STYLES = tv({
-  base: 'flex items-center justify-center px-[5px] border-[0.5px]',
+  base: 'flex items-center justify-center px-[5px] border-[0.5px] min-w-6',
   variants: {
     variant: {
       solid: 'border-transparent bg-[var(--badge-bg-color)] text-[var(--badge-text-color)]',