From adde45d996185008d2378140efdb576cd9ab5a26 Mon Sep 17 00:00:00 2001
From: Ilya Bogdanov <fumlead@gmail.com>
Date: Tue, 17 Mar 2026 17:28:46 +0400
Subject: [PATCH 1/5] Show real tags on versions & allow selecting tag for
 execution

---
 app/common/src/services/Backend.ts            |  6 ++
 app/common/src/services/LocalBackend.ts       |  8 +++
 app/common/src/services/RemoteBackend.ts      | 14 +++++
 app/common/src/text/english.json              |  1 +
 app/gui/integration-test/mock/cloudApi.ts     |  4 +-
 .../dashboard/layouts/AssetContextMenu.tsx    |  1 +
 .../AssetPanel/components/AssetVersion.tsx    |  2 +-
 .../AssetPanel/components/AssetVersions.tsx   | 14 +----
 .../layouts/NewProjectExecutionModal.tsx      | 61 +++++++++++++++----
 9 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/app/common/src/services/Backend.ts b/app/common/src/services/Backend.ts
index 4b36732112c2..53ce212daa34 100644
--- a/app/common/src/services/Backend.ts
+++ b/app/common/src/services/Backend.ts
@@ -422,6 +422,7 @@ export interface ProjectExecutionInfo {
   readonly timeZone: dateTime.IanaTimeZone
   readonly maxDurationMinutes: number
   readonly parallelMode: ProjectParallelMode
+  readonly tag: string | undefined
 }
 
 /** A specific execution schedule of a project. */
@@ -636,6 +637,7 @@ export interface ListSecretsResponseBody {
 /** HTTP response body for the "list tag" endpoint. */
 export interface ListTagsResponseBody {
   readonly tags: readonly Label[]
+  readonly assetVersionTags: readonly string[]
 }
 
 /**
@@ -1075,6 +1077,8 @@ export interface S3ObjectVersion {
   /** An archive containing the all the project files object in the S3 bucket. */
   readonly key: string
   readonly user?: OtherUser
+  readonly tags?: string[] | undefined
+  readonly comment?: string | undefined
 }
 
 /** A user other than the current user */
@@ -1995,6 +1999,8 @@ export abstract class Backend {
   abstract createTag(body: CreateTagRequestBody): Promise<Label>
   /** Return all labels accessible by the user. */
   abstract listTags(): Promise<readonly Label[]>
+  /** Return all tags attached to asset versions in the organization. */
+  abstract listAssetVersionTags(): Promise<readonly string[]>
   /** Set the full list of labels for a specific asset. */
   abstract associateTag(
     assetId: AssetId,
diff --git a/app/common/src/services/LocalBackend.ts b/app/common/src/services/LocalBackend.ts
index 83c1b08ade9f..b4ecda3ce155 100644
--- a/app/common/src/services/LocalBackend.ts
+++ b/app/common/src/services/LocalBackend.ts
@@ -1050,6 +1050,14 @@ export class LocalBackend extends backend.Backend {
     return Promise.resolve([])
   }
 
+  /**
+   * Return an empty array. This function is required to be implemented as it is unconditionally
+   * called, but its result should never need to be used.
+   */
+  override listAssetVersionTags(): Promise<readonly string[]> {
+    return Promise.resolve([])
+  }
+
   /** Do nothing. This function should never need to be called. */
   override associateTag() {
     return Promise.resolve()
diff --git a/app/common/src/services/RemoteBackend.ts b/app/common/src/services/RemoteBackend.ts
index 8915abc502c9..d595f68b27f4 100644
--- a/app/common/src/services/RemoteBackend.ts
+++ b/app/common/src/services/RemoteBackend.ts
@@ -1184,6 +1184,20 @@ export class RemoteBackend extends backend.Backend {
     }
   }
 
+  /**
+   * Return all tags attached to asset versions in the organization.
+   * @throws An error if a non-successful status code (not 200-299) was received.
+   */
+  override async listAssetVersionTags(): Promise<readonly string[]> {
+    const path = remoteBackendPaths.LIST_TAGS_PATH
+    const response = await this.get<backend.ListTagsResponseBody>(path)
+    if (!response.ok) {
+      return await this.throw(response, 'listLabelsBackendError')
+    } else {
+      return (await response.json()).assetVersionTags
+    }
+  }
+
   /**
    * Set the full list of labels for a specific asset.
    * @throws An error if a non-successful status code (not 200-299) was received.
diff --git a/app/common/src/text/english.json b/app/common/src/text/english.json
index 68c89a2f11c2..618b5deaa14d 100644
--- a/app/common/src/text/english.json
+++ b/app/common/src/text/english.json
@@ -747,6 +747,7 @@
   "billingPeriodOneMonth": "Monthly",
   "billingPeriodOneYear": "Annually",
   "newProjectExecution": "New Schedule",
+  "tagLabel": "With tag",
   "repeatIntervalLabel": "Repeat",
   "monthlyRepeatTypeLabel": "Monthly repeat type",
   "firstOccurrenceLabel": "First occurrence",
diff --git a/app/gui/integration-test/mock/cloudApi.ts b/app/gui/integration-test/mock/cloudApi.ts
index 02cd2611a6aa..f6b91925deea 100644
--- a/app/gui/integration-test/mock/cloudApi.ts
+++ b/app/gui/integration-test/mock/cloudApi.ts
@@ -764,7 +764,7 @@ export async function mockCloudApi(page: Page) {
     })
     await get(paths.LIST_TAGS_PATH, () => {
       called('listTags', {})
-      return { tags: labels } satisfies backend.ListTagsResponseBody
+      return { tags: labels, assetVersionTags: [] } satisfies backend.ListTagsResponseBody
     })
     await get(paths.LIST_USERS_PATH, async (route) => {
       called('listUsers', {})
@@ -799,7 +799,7 @@ export async function mockCloudApi(page: Page) {
         throw new Error(`Cannot get details for a project that does not exist. Project ID: ${projectId} \n
         Please make sure that you've created the project before opening it.
         ------------------------------------------------------------------------------------------------
-        
+
         Existing projects: ${Array.from(assetMap.values())
           .filter((asset) => asset.type === backend.AssetType.project)
           .map((asset) => asset.id)
diff --git a/app/gui/src/dashboard/layouts/AssetContextMenu.tsx b/app/gui/src/dashboard/layouts/AssetContextMenu.tsx
index ee291e1b0ccf..afdee71976eb 100644
--- a/app/gui/src/dashboard/layouts/AssetContextMenu.tsx
+++ b/app/gui/src/dashboard/layouts/AssetContextMenu.tsx
@@ -273,6 +273,7 @@ export const AssetContextMenu = React.forwardRef(function AssetContextMenu(
                   repeat: { type: 'none' },
                   projectId: asset.id,
                   timeZone,
+                  tag: undefined,
                 },
                 asset.title,
               ])
diff --git a/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersion.tsx b/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersion.tsx
index cf6e75168938..d70538cbdee0 100644
--- a/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersion.tsx
+++ b/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersion.tsx
@@ -27,7 +27,7 @@ const MAX_TAG_WIDTH_CH = 32
 export interface Version extends backendService.S3ObjectVersion {
   readonly number: number
   readonly title: string
-  readonly tags: readonly string[]
+  readonly tags: string[]
 }
 
 /** Options for duplicating an asset. */
diff --git a/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersions.tsx b/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersions.tsx
index 52e4b1d957fa..82a5544ae3f0 100644
--- a/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersions.tsx
+++ b/app/gui/src/dashboard/layouts/AssetPanel/components/AssetVersions.tsx
@@ -30,14 +30,6 @@ interface AddNewVersionVariables {
   readonly placeholderId: S3ObjectVersionId
 }
 
-const MOCK_VERSION_TAGS = [
-  '1.24v',
-  '3+',
-  'Experimental Build Candidate',
-  'Feature-Flag-Rollout-Tag-Longer-Than-32-Chars',
-  'Customer Validation Snapshot 2026.03',
-] as const
-
 /** Display a list of previous versions of an asset. */
 export function AssetVersions() {
   const { remoteBackend } = useBackends()
@@ -91,13 +83,9 @@ function AssetVersionsInternal(props: AssetVersionsInternalProps) {
       data.versions.map((version, index) => {
         const number = data.versions.length - index
         const title = getText('versionX', number)
-        // TODO[ib]: provide actual tags from the backend
-        // elsint-disable-next-line @typescript-eslint/no-unused-vars
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const _mockTags = MOCK_VERSION_TAGS
         const tags = [
           ...(version.isLatest ? [getText('latestIndicator')] : []),
-          //...mockTags,
+          ...(version.tags ?? []),
         ]
 
         return { ...version, number, title, tags }
diff --git a/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx b/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx
index f014c8278dbc..3474557f3434 100644
--- a/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx
+++ b/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx
@@ -9,7 +9,7 @@ import { Input } from '#/components/Inputs/Input'
 import { MultiSelector } from '#/components/Inputs/MultiSelector'
 import { Selector } from '#/components/Inputs/Selector'
 import { Text } from '#/components/Text'
-import { backendMutationOptions } from '#/hooks/backendHooks'
+import { backendMutationOptions, backendQueryOptions } from '#/hooks/backendHooks'
 import { useEventCallback } from '#/hooks/eventCallbackHooks'
 import { useLocalStorageState } from '#/hooks/localStoreState'
 import { useGetOrdinal } from '#/hooks/ordinalHooks'
@@ -17,7 +17,9 @@ import { useSyncRef } from '#/hooks/syncRefHooks'
 import { useMutationCallback } from '#/utilities/tanstackQuery'
 import { useText } from '$/providers/react'
 import { useFeatureFlag } from '$/providers/react/featureFlags'
-import { endOfMonth, getLocalTimeZone, now, toZoned, ZonedDateTime } from '@internationalized/date'
+import type { CalendarDate, CalendarDateTime, ZonedDateTime } from '@internationalized/date'
+import { endOfMonth, getLocalTimeZone, now, toZoned } from '@internationalized/date'
+import { useQuery } from '@tanstack/react-query'
 import type {
   Backend,
   ProjectExecutionInfo,
@@ -64,6 +66,31 @@ const MAX_DURATION_MINIMUM_MINUTES = 1
 const MAX_DURATION_MAXIMUM_MINUTES = 180
 const REPEAT_TIMES_COUNT = 3
 
+/** A date value accepted from the project execution date picker. */
+type StartDateValue = CalendarDate | CalendarDateTime | ZonedDateTime
+
+/** Return whether a value looks like an internationalized date object. */
+function isDateValueLike(value: unknown): value is StartDateValue {
+  if (typeof value !== 'object' || value == null) {
+    return false
+  }
+
+  const calendar: unknown = Reflect.get(value, 'calendar')
+
+  return (
+    typeof calendar === 'object' &&
+    calendar != null &&
+    typeof Reflect.get(calendar, 'identifier') === 'string' &&
+    typeof Reflect.get(value, 'year') === 'number' &&
+    typeof Reflect.get(value, 'month') === 'number' &&
+    typeof Reflect.get(value, 'day') === 'number'
+  )
+}
+
+const START_DATE_SCHEMA = z.custom<StartDateValue | null>(
+  (value): value is StartDateValue | null => value == null || isDateValueLike(value),
+)
+
 /** The form schema for this page. */
 const UPSERT_EXECUTION_SCHEMA = z
   .object({
@@ -87,7 +114,7 @@ const UPSERT_EXECUTION_SCHEMA = z
       .min(1)
       .transform((arr) => arr.sort((a, b) => a - b))
       .readonly(),
-    startDate: z.instanceof(ZonedDateTime).or(z.null()).optional(),
+    startDate: START_DATE_SCHEMA,
     timeZone: z.string(),
     maxDurationMinutes: z
       .number()
@@ -95,6 +122,7 @@ const UPSERT_EXECUTION_SCHEMA = z
       .min(MAX_DURATION_MINIMUM_MINUTES)
       .max(MAX_DURATION_MAXIMUM_MINUTES),
     parallelMode: z.enum(PROJECT_PARALLEL_MODES),
+    tag: z.string().optional(),
   })
   .transform(
     ({
@@ -106,10 +134,11 @@ const UPSERT_EXECUTION_SCHEMA = z
       days,
       months,
       timeZone: description,
+      tag,
     }): ProjectExecutionInfo => {
       const timeZone = getTimeZoneFromDescription(description)
-      startDate ??= now(timeZone)
-      const startDateTime = toRfc3339(new Date(startDate.toAbsoluteString()))
+      const zonedStartDate = startDate == null ? now(timeZone) : toZoned(startDate, timeZone)
+      const startDateTime = toRfc3339(new Date(zonedStartDate.toAbsoluteString()))
       const repeat = ((): ProjectExecutionRepeatInfo => {
         switch (repeatType) {
           case 'none': {
@@ -131,22 +160,22 @@ const UPSERT_EXECUTION_SCHEMA = z
           case 'monthlyDate': {
             return {
               type: repeatType,
-              date: startDate.day,
+              date: zonedStartDate.day,
               months,
             }
           }
           case 'monthlyWeekday': {
             return {
               type: repeatType,
-              dayOfWeek: getDay(startDate),
-              weekNumber: getWeekOfMonth(startDate.day),
+              dayOfWeek: getDay(zonedStartDate),
+              weekNumber: getWeekOfMonth(zonedStartDate.day),
               months,
             }
           }
           case 'monthlyLastWeekday': {
             return {
               type: repeatType,
-              dayOfWeek: getDay(startDate),
+              dayOfWeek: getDay(zonedStartDate),
               months,
             }
           }
@@ -160,6 +189,7 @@ const UPSERT_EXECUTION_SCHEMA = z
         parallelMode,
         startDate: startDateTime,
         endDate: null,
+        tag,
       }
     },
   )
@@ -221,6 +251,7 @@ export function NewProjectExecutionForm(props: NewProjectExecutionFormProps) {
       days: DAYS,
       months: MONTHS,
       timeZone: timeZoneDescription,
+      tag: undefined,
     },
     onSubmit: async (values) => {
       await createProjectExecution([values, item.title])
@@ -228,11 +259,12 @@ export function NewProjectExecutionForm(props: NewProjectExecutionFormProps) {
   })
   const repeatType = form.watch('repeatType', 'daily')
   const parallelMode = form.watch('parallelMode', 'restart')
-  const date = form.watch('startDate', defaultStartDate) ?? defaultStartDate
+  const startDateValue = form.watch('startDate', defaultStartDate) ?? defaultStartDate
   // `timeZone` may be `null`.
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   const formTimeZoneDescription = form.watch('timeZone', timeZoneDescription) ?? timeZoneDescription
   const formTimeZone = getTimeZoneFromDescription(formTimeZoneDescription)
+  const date = toZoned(startDateValue, formTimeZone)
   // Reactively watch for `days` and `months` so that repeat dates are kept up to date.
   form.watch('days')
   form.watch('months')
@@ -242,10 +274,10 @@ export function NewProjectExecutionForm(props: NewProjectExecutionFormProps) {
       PROJECT_EXECUTION_REPEAT_TYPES.filter((type) => type !== 'monthlyLastWeekday')
     : PROJECT_EXECUTION_REPEAT_TYPES
 
-  const changeTimezoneDeps = useSyncRef({ date, form })
+  const changeTimezoneDeps = useSyncRef({ form, startDateValue })
   useEffect(() => {
     const deps = changeTimezoneDeps.current
-    deps.form.setValue('startDate', toZoned(deps.date, formTimeZone))
+    deps.form.setValue('startDate', toZoned(deps.startDateValue, formTimeZone))
   }, [formTimeZone, changeTimezoneDeps])
 
   useEffect(() => {
@@ -262,6 +294,8 @@ export function NewProjectExecutionForm(props: NewProjectExecutionFormProps) {
     }
   })
 
+  const { data: tags } = useQuery(backendQueryOptions(backend, 'listAssetVersionTags', []))
+
   const createProjectExecution = useMutationCallback(
     backendMutationOptions(backend, 'createProjectExecution'),
   )
@@ -310,6 +344,9 @@ export function NewProjectExecutionForm(props: NewProjectExecutionFormProps) {
 
   return (
     <Form form={form} className="w-full">
+      <ComboBox form={form} name="tag" label={getText('tagLabel')} items={tags ?? []}>
+        {(tag) => tag}
+      </ComboBox>
       <ComboBox
         form={form}
         isRequired

From 7e72dfd1f5d07bf2faf04fea769937bae01cf020 Mon Sep 17 00:00:00 2001
From: Ilya Bogdanov <fumlead@gmail.com>
Date: Tue, 17 Mar 2026 17:58:13 +0400
Subject: [PATCH 2/5] Fix DialogStackProvider

- matching item is removed from any position instead of popping the last
  item at all times
- update both stack and dialogsStack on cleanup
---
 .../components/Dialog/DialogStackProvider.tsx | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx b/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx
index 335026e28772..1a3866916bdf 100644
--- a/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx
+++ b/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx
@@ -7,6 +7,11 @@ import invariant from 'tiny-invariant'
 import type { StoreApi } from '#/utilities/zustand'
 import { createStore, useStore } from '#/utilities/zustand'
 
+/** Returns only dialog items from the full overlay stack. */
+function getDialogsStack(stack: DialogStackItem[]) {
+  return stack.filter((stackItem) => ['dialog-fullscreen', 'dialog'].includes(stackItem.type))
+}
+
 /** DialogStackItem represents an item in the dialog stack. */
 export interface DialogStackItem {
   readonly id: string
@@ -37,27 +42,34 @@ export function DialogStackProvider(props: React.PropsWithChildren) {
 
           return {
             stack: nextStack,
-            dialogsStack: nextStack.filter((stackItem) =>
-              ['dialog-fullscreen', 'dialog'].includes(stackItem.type),
-            ),
+            dialogsStack: getDialogsStack(nextStack),
           }
         })
       },
       slice: (currentId) => {
         set((state) => {
-          const lastItem = state.stack.at(-1)
-          if (lastItem?.id === currentId) {
-            return { stack: state.stack.slice(0, -1) }
-          } else {
+          const reversedIndex = [...state.stack]
+            .reverse()
+            .findIndex((item) => item.id === currentId)
+          const index = reversedIndex === -1 ? -1 : state.stack.length - reversedIndex - 1
+
+          if (index === -1) {
             // eslint-disable-next-line no-restricted-properties
             console.warn(`
-              DialogStackProvider: sliceFromStack: currentId ${currentId} does not match the last item in the stack. \
+              DialogStackProvider: sliceFromStack: currentId ${currentId} is not present in the stack. \
               This is no-op but it might be a sign of a bug in the application. \
               Usually, this means that the underlaying component was closed manually or the stack was not \
               updated properly.
           `)
 
-            return { stack: state.stack }
+            return state
+          }
+
+          const nextStack = [...state.stack.slice(0, index), ...state.stack.slice(index + 1)]
+
+          return {
+            stack: nextStack,
+            dialogsStack: getDialogsStack(nextStack),
           }
         })
       },

From 31003342255266443a874cc181da0500de00713b Mon Sep 17 00:00:00 2001
From: Ilya Bogdanov <fumlead@gmail.com>
Date: Tue, 17 Mar 2026 18:24:25 +0400
Subject: [PATCH 3/5] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caa07aee198e..8c4bb38f4b03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [Fixed <kbd>Ctrl</kbd>-clicking enso:// links][14820]
 - [Geo Map Visualization may display GeoSpatial data][14859]
 - [Component height can be resized][14849]
+- [Execution can be scheduled for the specific version tag][14883]
 
 [14590]: https://github.com/enso-org/enso/pull/14590
 [14678]: https://github.com/enso-org/enso/pull/14678
@@ -20,6 +21,7 @@
 [14820]: https://github.com/enso-org/enso/pull/14820
 [14859]: https://github.com/enso-org/enso/pull/14859
 [14849]: https://github.com/enso-org/enso/pull/14849
+[14883]: https://github.com/enso-org/enso/pull/14883
 
 #### Enso Standard Library
 

From 543ef76cd0d3f2a11fce27a1e53e989c950d3db0 Mon Sep 17 00:00:00 2001
From: Ilya Bogdanov <fumlead@gmail.com>
Date: Wed, 18 Mar 2026 14:41:07 +0400
Subject: [PATCH 4/5] Remove unnecessary datetime validation

---
 .../layouts/NewProjectExecutionModal.tsx      | 30 ++-----------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx b/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx
index 3474557f3434..cbbc9517fbef 100644
--- a/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx
+++ b/app/gui/src/dashboard/layouts/NewProjectExecutionModal.tsx
@@ -17,8 +17,7 @@ import { useSyncRef } from '#/hooks/syncRefHooks'
 import { useMutationCallback } from '#/utilities/tanstackQuery'
 import { useText } from '$/providers/react'
 import { useFeatureFlag } from '$/providers/react/featureFlags'
-import type { CalendarDate, CalendarDateTime, ZonedDateTime } from '@internationalized/date'
-import { endOfMonth, getLocalTimeZone, now, toZoned } from '@internationalized/date'
+import { endOfMonth, getLocalTimeZone, now, toZoned, ZonedDateTime } from '@internationalized/date'
 import { useQuery } from '@tanstack/react-query'
 import type {
   Backend,
@@ -66,31 +65,6 @@ const MAX_DURATION_MINIMUM_MINUTES = 1
 const MAX_DURATION_MAXIMUM_MINUTES = 180
 const REPEAT_TIMES_COUNT = 3
 
-/** A date value accepted from the project execution date picker. */
-type StartDateValue = CalendarDate | CalendarDateTime | ZonedDateTime
-
-/** Return whether a value looks like an internationalized date object. */
-function isDateValueLike(value: unknown): value is StartDateValue {
-  if (typeof value !== 'object' || value == null) {
-    return false
-  }
-
-  const calendar: unknown = Reflect.get(value, 'calendar')
-
-  return (
-    typeof calendar === 'object' &&
-    calendar != null &&
-    typeof Reflect.get(calendar, 'identifier') === 'string' &&
-    typeof Reflect.get(value, 'year') === 'number' &&
-    typeof Reflect.get(value, 'month') === 'number' &&
-    typeof Reflect.get(value, 'day') === 'number'
-  )
-}
-
-const START_DATE_SCHEMA = z.custom<StartDateValue | null>(
-  (value): value is StartDateValue | null => value == null || isDateValueLike(value),
-)
-
 /** The form schema for this page. */
 const UPSERT_EXECUTION_SCHEMA = z
   .object({
@@ -114,7 +88,7 @@ const UPSERT_EXECUTION_SCHEMA = z
       .min(1)
       .transform((arr) => arr.sort((a, b) => a - b))
       .readonly(),
-    startDate: START_DATE_SCHEMA,
+    startDate: z.instanceof(ZonedDateTime).nullable().optional(),
     timeZone: z.string(),
     maxDurationMinutes: z
       .number()

From a66244682832bbd06d5fe9e8e53bc1a0690afd9b Mon Sep 17 00:00:00 2001
From: Ilya Bogdanov <fumlead@gmail.com>
Date: Wed, 18 Mar 2026 14:48:23 +0400
Subject: [PATCH 5/5] Simplify last index calculation

---
 .../dashboard/components/Dialog/DialogStackProvider.tsx  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx b/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx
index 1a3866916bdf..ef1ce4d6fae3 100644
--- a/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx
+++ b/app/gui/src/dashboard/components/Dialog/DialogStackProvider.tsx
@@ -6,6 +6,7 @@ import invariant from 'tiny-invariant'
 
 import type { StoreApi } from '#/utilities/zustand'
 import { createStore, useStore } from '#/utilities/zustand'
+import { findLastIndex } from '@/util/data/array'
 
 /** Returns only dialog items from the full overlay stack. */
 function getDialogsStack(stack: DialogStackItem[]) {
@@ -48,12 +49,8 @@ export function DialogStackProvider(props: React.PropsWithChildren) {
       },
       slice: (currentId) => {
         set((state) => {
-          const reversedIndex = [...state.stack]
-            .reverse()
-            .findIndex((item) => item.id === currentId)
-          const index = reversedIndex === -1 ? -1 : state.stack.length - reversedIndex - 1
-
-          if (index === -1) {
+          const index = findLastIndex(state.stack, (item) => item.id === currentId)
+          if (index == null) {
             // eslint-disable-next-line no-restricted-properties
             console.warn(`
               DialogStackProvider: sliceFromStack: currentId ${currentId} is not present in the stack. \