diff --git a/ui/bun.lock b/ui/bun.lock
index 40a3feb..d80212c 100644
--- a/ui/bun.lock
+++ b/ui/bun.lock
@@ -15,7 +15,7 @@
"@uppy/progress-bar": "^4.2.1",
"@uppy/tus": "^4.2.2",
"@uppy/vue": "^2.2.0",
- "@vueuse/core": "^13.4.0",
+ "@vueuse/core": "^14.1.0",
"caniuse-lite": "^1.0.30001723",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
@@ -26,6 +26,7 @@
"lucide-vue-next": "^0.475.0",
"pinia": "^3.0.3",
"radix-vue": "^1.9.17",
+ "reka-ui": "^2.7.0",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
"v-calendar": "^3.1.2",
@@ -589,11 +590,11 @@
"@vue/tsconfig": ["@vue/tsconfig@0.7.0", "", { "peerDependencies": { "typescript": "5.x", "vue": "^3.4.0" }, "optionalPeers": ["typescript", "vue"] }, "sha512-ku2uNz5MaZ9IerPPUyOHzyjhXoX2kVJaVf7hL315DC17vS6IiZRmmCPfggNbU16QTvM80+uYYy3eYJB59WCtvg=="],
- "@vueuse/core": ["@vueuse/core@13.4.0", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "13.4.0", "@vueuse/shared": "13.4.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-OnK7zW3bTq/QclEk17+vDFN3tuAm8ONb9zQUIHrYQkkFesu3WeGUx/3YzpEp+ly53IfDAT9rsYXgGW6piNZC5w=="],
+ "@vueuse/core": ["@vueuse/core@14.1.0", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.1.0", "@vueuse/shared": "14.1.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-rgBinKs07hAYyPF834mDTigH7BtPqvZ3Pryuzt1SD/lg5wEcWqvwzXXYGEDb2/cP0Sj5zSvHl3WkmMELr5kfWw=="],
- "@vueuse/metadata": ["@vueuse/metadata@13.4.0", "", {}, "sha512-CPDQ/IgOeWbqItg1c/pS+Ulum63MNbpJ4eecjFJqgD/JUCJ822zLfpw6M9HzSvL6wbzMieOtIAW/H8deQASKHg=="],
+ "@vueuse/metadata": ["@vueuse/metadata@14.1.0", "", {}, "sha512-7hK4g015rWn2PhKcZ99NyT+ZD9sbwm7SGvp7k+k+rKGWnLjS/oQozoIZzWfCewSUeBmnJkIb+CNr7Zc/EyRnnA=="],
- "@vueuse/shared": ["@vueuse/shared@13.4.0", "", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-+AxuKbw8R1gYy5T21V5yhadeNM7rJqb4cPaRI9DdGnnNl3uqXh+unvQ3uCaA2DjYLbNr1+l7ht/B4qEsRegX6A=="],
+ "@vueuse/shared": ["@vueuse/shared@14.1.0", "", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-EcKxtYvn6gx1F8z9J5/rsg3+lTQnvOruQd8fUecW99DCK04BkWD7z5KQ/wTAx+DazyoEE9dJt/zV8OIEQbM6kw=="],
"acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
@@ -1231,6 +1232,8 @@
"object-hash": ["object-hash@3.0.0", "", {}, "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="],
+ "ohash": ["ohash@2.0.11", "", {}, "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ=="],
+
"once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="],
"onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="],
@@ -1355,6 +1358,8 @@
"reflect-metadata": ["reflect-metadata@0.2.2", "", {}, "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="],
+ "reka-ui": ["reka-ui@2.7.0", "", { "dependencies": { "@floating-ui/dom": "^1.6.13", "@floating-ui/vue": "^1.1.6", "@internationalized/date": "^3.5.0", "@internationalized/number": "^3.5.0", "@tanstack/vue-virtual": "^3.12.0", "@vueuse/core": "^12.5.0", "@vueuse/shared": "^12.5.0", "aria-hidden": "^1.2.4", "defu": "^6.1.4", "ohash": "^2.0.11" }, "peerDependencies": { "vue": ">= 3.2.0" } }, "sha512-m+XmxQN2xtFzBP3OAdIafKq7C8OETo2fqfxcIIxYmNN2Ch3r5oAf6yEYCIJg5tL/yJU2mHqF70dCCekUkrAnXA=="],
+
"remove-accents": ["remove-accents@0.5.0", "", {}, "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A=="],
"require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="],
@@ -1695,6 +1700,10 @@
"readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
+ "reka-ui/@vueuse/core": ["@vueuse/core@12.8.2", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "12.8.2", "@vueuse/shared": "12.8.2", "vue": "^3.5.13" } }, "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ=="],
+
+ "reka-ui/@vueuse/shared": ["@vueuse/shared@12.8.2", "", { "dependencies": { "vue": "^3.5.13" } }, "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w=="],
+
"rimraf/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
"sucrase/commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="],
@@ -1761,6 +1770,8 @@
"radix-vue/@vueuse/core/@vueuse/metadata": ["@vueuse/metadata@10.11.1", "", {}, "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw=="],
+ "reka-ui/@vueuse/core/@vueuse/metadata": ["@vueuse/metadata@12.8.2", "", {}, "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A=="],
+
"sucrase/glob/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="],
"sucrase/glob/minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="],
diff --git a/ui/components.json b/ui/components.json
index 9c826ef..aae2058 100644
--- a/ui/components.json
+++ b/ui/components.json
@@ -8,9 +8,8 @@
"baseColor": "slate",
"cssVariables": true
},
- "framework": "vite",
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
-}
\ No newline at end of file
+}
diff --git a/ui/package.json b/ui/package.json
index 89866dd..20e02d1 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -29,7 +29,7 @@
"@uppy/progress-bar": "^4.2.1",
"@uppy/tus": "^4.2.2",
"@uppy/vue": "^2.2.0",
- "@vueuse/core": "^13.4.0",
+ "@vueuse/core": "^14.1.0",
"caniuse-lite": "^1.0.30001723",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
@@ -40,6 +40,7 @@
"lucide-vue-next": "^0.475.0",
"pinia": "^3.0.3",
"radix-vue": "^1.9.17",
+ "reka-ui": "^2.7.0",
"tailwind-merge": "^2.6.0",
"tailwindcss-animate": "^1.0.7",
"v-calendar": "^3.1.2",
diff --git a/ui/src/components/ticket/TicketDisplay.vue b/ui/src/components/ticket/TicketDisplay.vue
index 3bac490..2a6017d 100644
--- a/ui/src/components/ticket/TicketDisplay.vue
+++ b/ui/src/components/ticket/TicketDisplay.vue
@@ -8,17 +8,21 @@ import StatusIcon from '@/components/ticket/StatusIcon.vue'
import TicketActionBar from '@/components/ticket/TicketActionBar.vue'
import TicketCloseBar from '@/components/ticket/TicketCloseBar.vue'
import TicketHeader from '@/components/ticket/TicketHeader.vue'
-import TicketTab from '@/components/ticket/TicketTab.vue'
import TicketComments from '@/components/ticket/comment/TicketComments.vue'
import TicketFiles from '@/components/ticket/file/TicketFiles.vue'
import TicketLinks from '@/components/ticket/link/TicketLinks.vue'
import TicketTasks from '@/components/ticket/task/TicketTasks.vue'
import TicketTimeline from '@/components/ticket/timeline/TicketTimeline.vue'
+import {
+ Accordion,
+ AccordionContent,
+ AccordionItem,
+ AccordionTrigger
+} from '@/components/ui/accordion'
import { Badge } from '@/components/ui/badge'
import { Button } from '@/components/ui/button'
import { Card } from '@/components/ui/card'
import { Separator } from '@/components/ui/separator'
-import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
import { useToast } from '@/components/ui/toast/use-toast'
import { Edit } from 'lucide-vue-next'
@@ -166,51 +170,64 @@ const updateDescription = (value: string | undefined) => (message.value = value
class="min-h-14"
/>
-
-
-
-
- Timeline
-
- {{ timeline.length }}
-
-
-
- Tasks
-
- {{ tasks.length }}
-
-
-
-
- Comments
-
- {{ comments.length }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Tasks
+
+ {{ tasks.length }}
+
+
+
+
+
+
+
+
+
+
+
+ Comments
+
+ {{ comments.length }}
+
+
+
+
+
+
+
+
+
+
+ Timeline
+
+ {{ timeline.length }}
+
+
+
+
+
+
+
+
diff --git a/ui/src/components/ui/accordion/Accordion.vue b/ui/src/components/ui/accordion/Accordion.vue
new file mode 100644
index 0000000..21502b8
--- /dev/null
+++ b/ui/src/components/ui/accordion/Accordion.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/ui/src/components/ui/accordion/AccordionContent.vue b/ui/src/components/ui/accordion/AccordionContent.vue
new file mode 100644
index 0000000..7d03d33
--- /dev/null
+++ b/ui/src/components/ui/accordion/AccordionContent.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/components/ui/accordion/AccordionItem.vue b/ui/src/components/ui/accordion/AccordionItem.vue
new file mode 100644
index 0000000..1ee1be8
--- /dev/null
+++ b/ui/src/components/ui/accordion/AccordionItem.vue
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
diff --git a/ui/src/components/ui/accordion/AccordionTrigger.vue b/ui/src/components/ui/accordion/AccordionTrigger.vue
new file mode 100644
index 0000000..83aa74f
--- /dev/null
+++ b/ui/src/components/ui/accordion/AccordionTrigger.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ui/src/components/ui/accordion/index.ts b/ui/src/components/ui/accordion/index.ts
new file mode 100644
index 0000000..9340ac0
--- /dev/null
+++ b/ui/src/components/ui/accordion/index.ts
@@ -0,0 +1,4 @@
+export { default as Accordion } from './Accordion.vue'
+export { default as AccordionContent } from './AccordionContent.vue'
+export { default as AccordionItem } from './AccordionItem.vue'
+export { default as AccordionTrigger } from './AccordionTrigger.vue'
diff --git a/ui/tailwind.config.js b/ui/tailwind.config.js
index f859622..8e15805 100644
--- a/ui/tailwind.config.js
+++ b/ui/tailwind.config.js
@@ -4,7 +4,7 @@ const typography = require('@tailwindcss/typography')
/** @type {import('tailwindcss').Config} */
module.exports = {
- darkMode: ['media'],
+ darkMode: ['media', 'class'],
safelist: ['dark', 'size-5', 'size-12'],
prefix: '',
@@ -16,90 +16,106 @@ module.exports = {
],
theme: {
- container: {
- center: true,
- padding: '2rem',
- screens: {
- '2xl': '1400px'
- }
- },
- extend: {
- colors: {
- border: 'hsl(var(--border))',
- input: 'hsl(var(--input))',
- ring: 'hsl(var(--ring))',
- background: 'hsl(var(--background))',
- foreground: 'hsl(var(--foreground))',
- primary: {
- DEFAULT: 'hsl(var(--primary))',
- foreground: 'hsl(var(--primary-foreground))'
- },
- secondary: {
- DEFAULT: 'hsl(var(--secondary))',
- foreground: 'hsl(var(--secondary-foreground))'
- },
- destructive: {
- DEFAULT: 'hsl(var(--destructive))',
- foreground: 'hsl(var(--destructive-foreground))'
- },
- muted: {
- DEFAULT: 'hsl(var(--muted))',
- foreground: 'hsl(var(--muted-foreground))'
- },
- accent: {
- DEFAULT: 'hsl(var(--accent))',
- foreground: 'hsl(var(--accent-foreground))'
- },
- popover: {
- DEFAULT: 'hsl(var(--popover))',
- foreground: 'hsl(var(--popover-foreground))'
- },
- card: {
- DEFAULT: 'hsl(var(--card))',
- foreground: 'hsl(var(--card-foreground))'
- },
- sidebar: {
- DEFAULT: 'hsl(var(--sidebar-background))',
- foreground: 'hsl(var(--sidebar-foreground))',
- primary: 'hsl(var(--sidebar-primary))',
- 'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
- accent: 'hsl(var(--sidebar-accent))',
- 'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
- border: 'hsl(var(--sidebar-border))',
- ring: 'hsl(var(--sidebar-ring))'
- }
- },
- borderRadius: {
- xl: 'calc(var(--radius) + 4px)',
- lg: 'var(--radius)',
- md: 'calc(var(--radius) - 2px)',
- sm: 'calc(var(--radius) - 4px)'
- },
- keyframes: {
- 'accordion-down': {
- from: { height: 0 },
- to: { height: 'var(--radix-accordion-content-height)' }
- },
- 'accordion-up': {
- from: { height: 'var(--radix-accordion-content-height)' },
- to: { height: 0 }
- },
- 'collapsible-down': {
- from: { height: 0 },
- to: { height: 'var(--radix-collapsible-content-height)' }
- },
- 'collapsible-up': {
- from: { height: 'var(--radix-collapsible-content-height)' },
- to: { height: 0 }
- }
- },
- animation: {
- 'accordion-down': 'accordion-down 0.2s ease-out',
- 'accordion-up': 'accordion-up 0.2s ease-out',
- 'collapsible-down': 'collapsible-down 0.2s ease-in-out',
- 'collapsible-up': 'collapsible-up 0.2s ease-in-out'
- }
- }
+ container: {
+ center: true,
+ padding: '2rem',
+ screens: {
+ '2xl': '1400px'
+ }
+ },
+ extend: {
+ colors: {
+ border: 'hsl(var(--border))',
+ input: 'hsl(var(--input))',
+ ring: 'hsl(var(--ring))',
+ background: 'hsl(var(--background))',
+ foreground: 'hsl(var(--foreground))',
+ primary: {
+ DEFAULT: 'hsl(var(--primary))',
+ foreground: 'hsl(var(--primary-foreground))'
+ },
+ secondary: {
+ DEFAULT: 'hsl(var(--secondary))',
+ foreground: 'hsl(var(--secondary-foreground))'
+ },
+ destructive: {
+ DEFAULT: 'hsl(var(--destructive))',
+ foreground: 'hsl(var(--destructive-foreground))'
+ },
+ muted: {
+ DEFAULT: 'hsl(var(--muted))',
+ foreground: 'hsl(var(--muted-foreground))'
+ },
+ accent: {
+ DEFAULT: 'hsl(var(--accent))',
+ foreground: 'hsl(var(--accent-foreground))'
+ },
+ popover: {
+ DEFAULT: 'hsl(var(--popover))',
+ foreground: 'hsl(var(--popover-foreground))'
+ },
+ card: {
+ DEFAULT: 'hsl(var(--card))',
+ foreground: 'hsl(var(--card-foreground))'
+ },
+ sidebar: {
+ DEFAULT: 'hsl(var(--sidebar-background))',
+ foreground: 'hsl(var(--sidebar-foreground))',
+ primary: 'hsl(var(--sidebar-primary))',
+ 'primary-foreground': 'hsl(var(--sidebar-primary-foreground))',
+ accent: 'hsl(var(--sidebar-accent))',
+ 'accent-foreground': 'hsl(var(--sidebar-accent-foreground))',
+ border: 'hsl(var(--sidebar-border))',
+ ring: 'hsl(var(--sidebar-ring))'
+ }
+ },
+ borderRadius: {
+ xl: 'calc(var(--radius) + 4px)',
+ lg: 'var(--radius)',
+ md: 'calc(var(--radius) - 2px)',
+ sm: 'calc(var(--radius) - 4px)'
+ },
+ keyframes: {
+ 'accordion-down': {
+ from: {
+ height: '0'
+ },
+ to: {
+ height: 'var(--reka-accordion-content-height)'
+ }
+ },
+ 'accordion-up': {
+ from: {
+ height: 'var(--reka-accordion-content-height)'
+ },
+ to: {
+ height: '0'
+ }
+ },
+ 'collapsible-down': {
+ from: {
+ height: 0
+ },
+ to: {
+ height: 'var(--radix-collapsible-content-height)'
+ }
+ },
+ 'collapsible-up': {
+ from: {
+ height: 'var(--radix-collapsible-content-height)'
+ },
+ to: {
+ height: 0
+ }
+ }
+ },
+ animation: {
+ 'accordion-down': 'accordion-down 0.2s ease-out',
+ 'accordion-up': 'accordion-up 0.2s ease-out',
+ 'collapsible-down': 'collapsible-down 0.2s ease-in-out',
+ 'collapsible-up': 'collapsible-up 0.2s ease-in-out'
+ }
+ }
},
plugins: [animate, typography]
}
diff --git a/ui/tests/e2e/comments.spec.ts b/ui/tests/e2e/comments.spec.ts
index 12aad49..a325ea7 100644
--- a/ui/tests/e2e/comments.spec.ts
+++ b/ui/tests/e2e/comments.spec.ts
@@ -15,10 +15,9 @@ test.describe('update a comment', () => {
{
field: 'message',
update: async (page) => {
- await page.getByRole('tab', { name: 'Comments' }).click()
await page.getByRole('button', { name: 'More' }).click()
await page.getByRole('menuitem', { name: 'Edit' }).click()
- await page.locator('textarea').nth(1).fill('Updated Comment')
+ await page.locator('.CodeMirror textarea').first().fill('Updated Comment')
await page.getByRole('button', { name: 'Save' }).click()
},
assert: async (page) => {
@@ -46,7 +45,6 @@ test('can delete a comment', async ({ page }) => {
await createTicket(page, ticketName)
const message = `comment-${randomUUID()}`
await createComment(page, message)
- await page.getByRole('tab', { name: 'Comments' }).click()
await page.getByRole('button', { name: 'More' }).click()
await page.getByRole('menuitem', { name: 'Delete' }).click()
await page.getByRole('dialog').getByRole('button', { name: 'Delete' }).click()
diff --git a/ui/tests/e2e/tasks.spec.ts b/ui/tests/e2e/tasks.spec.ts
index 92c2391..616a6df 100644
--- a/ui/tests/e2e/tasks.spec.ts
+++ b/ui/tests/e2e/tasks.spec.ts
@@ -17,9 +17,8 @@ test.describe('update a task', () => {
update: async (page, taskName: string) => {
await page.getByText("Toggle Sidebar").click()
- await page.getByRole('tab', { name: 'Tasks' }).click()
await page.getByText(taskName).click()
- await page.getByRole('tabpanel', { name: 'Tasks' }).getByRole('textbox').fill('Updated Task')
+ await page.locator('input[autofocus]').fill('Updated Task')
await page.keyboard.press('Enter')
},
assert: async (page) => {
@@ -29,7 +28,6 @@ test.describe('update a task', () => {
{
field: 'status',
update: async (page) => {
- await page.getByRole('tab', { name: 'Tasks' }).click()
const cb = page.getByRole('checkbox').first()
await cb.click()
},
@@ -59,7 +57,6 @@ test('can delete a task', async ({ page }) => {
await createTicket(page, ticketName)
const taskName = `task-${randomUUID()}`
await createTask(page, taskName, false)
- await page.getByRole('tab', { name: 'Tasks' }).click()
await page.locator('button', { hasText: 'Delete Task' }).click()
await page.getByRole('dialog').getByRole('button', { name: 'Delete' }).click()
await expect(page.getByText(taskName)).toHaveCount(0)
diff --git a/ui/tests/e2e/timeline.spec.ts b/ui/tests/e2e/timeline.spec.ts
index 166684a..b5b8717 100644
--- a/ui/tests/e2e/timeline.spec.ts
+++ b/ui/tests/e2e/timeline.spec.ts
@@ -17,10 +17,9 @@ test.describe('update a timeline item', () => {
await createTicket(page, ticketName)
const msg = `timeline-${randomUUID()}`
await createTimeline(page, msg)
- await page.getByRole('tab', { name: 'Timeline' }).click()
await page.getByRole('button', { name: 'More' }).click()
await page.getByRole('menuitem', { name: 'Edit' }).click()
- await page.locator('textarea').nth(1).fill('Updated Timeline')
+ await page.locator('.CodeMirror textarea').first().fill('Updated Timeline')
await page.getByRole('button', { name: 'Save' }).click()
await expect(page.getByText('Updated Timeline')).toBeVisible()
})
@@ -32,7 +31,6 @@ test('can delete a timeline item', async ({ page }) => {
await createTicket(page, ticketName)
const msg = `timeline-${randomUUID()}`
await createTimeline(page, msg)
- await page.getByRole('tab', { name: 'Timeline' }).click()
await page.getByRole('button', { name: 'More' }).click()
await page.getByRole('menuitem', { name: 'Delete' }).click()
await page.getByRole('dialog').getByRole('button', { name: 'Delete' }).click()
diff --git a/ui/tests/e2e/util.ts b/ui/tests/e2e/util.ts
index 4047968..136d9d4 100644
--- a/ui/tests/e2e/util.ts
+++ b/ui/tests/e2e/util.ts
@@ -39,23 +39,26 @@ export const createTicket = async (page, name: string) => {
}
export const createTimeline = async (page, message: string) => {
- await page.getByRole('tab', { name: 'Timeline' }).click()
await page.getByRole('button', { name: 'Add Timeline Item' }).click()
- await page.getByRole('tabpanel', { name: 'Timeline' }).getByRole('textbox').fill(message)
+ const editor = page.locator('.EasyMDEContainer .CodeMirror').last()
+ await expect(editor).toBeVisible()
+ await editor.click()
+ await page.keyboard.type(message)
await page.getByRole('button', { name: 'Save' }).click()
await expect(page.getByText(message)).toBeVisible()
}
export const createComment = async (page, message: string) => {
- await page.getByRole('tab', { name: 'Comments' }).click()
await page.getByRole('button', { name: 'Add Comment' }).click()
- await page.getByRole('tabpanel', { name: 'Comments' }).getByRole('textbox').fill(message)
+ const editor = page.locator('.EasyMDEContainer .CodeMirror').last()
+ await expect(editor).toBeVisible()
+ await editor.click()
+ await page.keyboard.type(message)
await page.getByRole('button', { name: 'Save' }).click()
await expect(page.getByText(message)).toBeVisible()
}
export const createTask = async (page, name: string, done: boolean) => {
- await page.getByRole('tab', { name: 'Tasks' }).click()
await page.getByRole('button', { name: 'Add Task' }).click()
await page.getByPlaceholder('Add a task...').fill(name)
await page.getByRole('button', { name: 'Save' }).click()