Skip to content

Commit 3848461

Browse files
committed
Using latest version of vue-statusicon to simplify types
1 parent 2d31602 commit 3848461

File tree

3 files changed

+28
-29
lines changed

3 files changed

+28
-29
lines changed

packages/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dependencies": {},
2222
"devDependencies": {
2323
"@cypress-design/vue-icon": "^0.12.1",
24-
"@cypress-design/vue-statusicon": "0.1.4",
24+
"@cypress-design/vue-statusicon": "0.2.0",
2525
"@graphql-typed-document-node/core": "^3.1.0",
2626
"@headlessui/vue": "1.4.0",
2727
"@iconify/iconify": "2.1.2",

packages/app/src/debug/DebugPageHeader.vue

+12-13
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55
>
66
<div
77
data-cy="debug-header"
8-
class="flex grid items-center w-full overflow-hidden py-24px px-24px gap-y-2"
8+
class="flex w-full grid py-24px px-24px gap-y-2 items-center overflow-hidden"
99
>
1010
<ul
1111
data-cy="header-top"
12-
class="flex flex-row items-center self-stretch gap-x-2 whitespace-nowrap"
12+
class="flex flex-row gap-x-2 items-center self-stretch whitespace-nowrap"
1313
>
1414
<li
1515
v-if="debug?.commitInfo?.summary"
16-
class="text-lg font-medium text-gray-900"
16+
class="font-medium text-lg text-gray-900"
1717
data-cy="debug-test-summary"
1818
>
1919
{{ debug.commitInfo.summary }}
2020
</li>
2121
<li
2222
v-if="props.commitsAhead"
23-
class="flex items-center h-6 text-sm border border-gray-100 rounded"
23+
class="border rounded flex border-gray-100 h-6 text-sm items-center"
2424
>
2525
<span
2626
v-if="props.commitsAhead"
27-
class="items-center px-2 mx-px font-normal text-orange-500"
27+
class="font-normal mx-px px-2 text-orange-500 items-center"
2828
data-cy="debug-commitsAhead"
2929
>
3030
{{ t('debugPage.header.commitsAhead', props.commitsAhead) }}
3131
</span>
3232
</li>
33-
<li class="text-lg text-gray-400 -mt-8px">
33+
<li class="-mt-8px text-lg text-gray-400">
3434
.
3535
</li>
36-
<li class="text-sm font-normal text-indigo-500">
36+
<li class="font-normal text-sm text-indigo-500">
3737
<ExternalLink
3838
data-cy="debug-header-dashboard-link"
3939
:href="debug.url || '#'"
@@ -45,14 +45,14 @@
4545
</ul>
4646
<ul
4747
data-cy="metadata"
48-
class="flex flex-wrap items-center text-sm font-normal text-gray-700 gap-x-2 whitespace-nowrap children:flex children:items-center"
48+
class="flex flex-wrap font-normal text-sm text-gray-700 gap-x-2 items-center whitespace-nowrap children:flex children:items-center"
4949
>
5050
<li
51-
class="flex flex-row items-center justify-center text-sm gap-x-2"
51+
class="flex flex-row text-sm gap-x-2 items-center justify-center"
5252
>
5353
<div
5454
v-if="(debug.runNumber && debug.status)"
55-
class="flex flex-row items-center justify-center h-6 px-2 font-semibold border border-gray-200 rounded bg-gray-50 gap-x-1"
55+
class="border rounded flex flex-row font-semibold bg-gray-50 border-gray-200 h-6 px-2 gap-x-1 items-center justify-center"
5656
:data-cy="`debug-runNumber-${debug.status}`"
5757
>
5858
<SolidStatusIcon
@@ -116,8 +116,7 @@ import DebugResults from './DebugResults.vue'
116116
import ExternalLink from '@cy/gql-components/ExternalLink.vue'
117117
import type { DebugPageFragment, CloudRunStatus } from '../generated/graphql'
118118
import { IconTimeStopwatch } from '@cypress-design/vue-icon'
119-
import { SolidStatusIcon } from '@cypress-design/vue-statusicon'
120-
import type { statusTypes } from '@cypress-design/vue-statusicon/dist/StatusIcon/constants'
119+
import { SolidStatusIcon, StatusType } from '@cypress-design/vue-statusicon'
121120
import CommitIcon from '~icons/cy/commit_x14'
122121
import { gql } from '@urql/core'
123122
import { dayjs } from '../runs/utils/day.js'
@@ -153,7 +152,7 @@ const props = defineProps<{
153152
154153
const debug = computed(() => props.gql)
155154
156-
const ICON_MAP: Record<CloudRunStatus, { textColor: string, type: statusTypes }> = {
155+
const ICON_MAP: Record<CloudRunStatus, { textColor: string, type: StatusType }> = {
157156
PASSED: { textColor: 'text-jade-400', type: 'passed' },
158157
FAILED: { textColor: 'text-red-400', type: 'failed' },
159158
CANCELLED: { textColor: 'text-gray-500', type: 'cancelled' },

yarn.lock

+15-15
Original file line numberDiff line numberDiff line change
@@ -2331,10 +2331,10 @@
23312331
resolved "https://registry.yarnpkg.com/@cypress-design/icon-registry/-/icon-registry-0.14.0.tgz#c30cbb013b7a86700941677da661229d81493399"
23322332
integrity sha512-wIXr00J7azl8Jl+3DLhSK8WkWXRUvfqDKUnLrEyxQjrzbwNIQIPL0bqgY30CZbx8xoPXCIewJDYXvhgbWZQOhQ==
23332333

2334-
"@cypress-design/icon-registry@^0.15.0":
2335-
version "0.15.0"
2336-
resolved "https://registry.yarnpkg.com/@cypress-design/icon-registry/-/icon-registry-0.15.0.tgz#0fee4fd0e0565b169b1d352e04ee4e80035efb74"
2337-
integrity sha512-hpecktncQW+9oCNT43/fabBtEEmlB07Dvhv6an48596suuPdTdqGISLyfZeX1UkDDKLAoWZbyni/J33PlPgN2Q==
2334+
"@cypress-design/icon-registry@^0.16.0":
2335+
version "0.16.0"
2336+
resolved "https://registry.yarnpkg.com/@cypress-design/icon-registry/-/icon-registry-0.16.0.tgz#5b3ae12373e568ebbe028ad87c8bcecc9bf941a8"
2337+
integrity sha512-9cYntpV2EDg8G+IN4P4FFXiQRAwZTbvMuyjf/Y3UxXevuvibfqN4riDowcUQIYncFUQ95ofb5hC0Ti8R1leLlg==
23382338

23392339
"@cypress-design/vue-icon@^0.12.1":
23402340
version "0.12.1"
@@ -2343,20 +2343,20 @@
23432343
dependencies:
23442344
"@cypress-design/icon-registry" "^0.14.0"
23452345

2346-
"@cypress-design/vue-icon@^0.13.0":
2347-
version "0.13.0"
2348-
resolved "https://registry.yarnpkg.com/@cypress-design/vue-icon/-/vue-icon-0.13.0.tgz#837bde8fe3d052cde9a2e2bcf52567523826749a"
2349-
integrity sha512-S0+RZFy1hK1tKOAeYAjeIF3nF1MC7uB7dNqO2Sp3ZIEktcDRnWhodDUxNJ9TpMB2dIqJL6ATUhYTVJFEiPdPfg==
2346+
"@cypress-design/vue-icon@^0.14.0":
2347+
version "0.14.0"
2348+
resolved "https://registry.yarnpkg.com/@cypress-design/vue-icon/-/vue-icon-0.14.0.tgz#25cfb39af69e9d2328732f3a13d2837f287795fe"
2349+
integrity sha512-dw3qrhzwe9s9ARA5UhmMNHM26QMZjmiIVcXNPGAZToG8vUIXUvCxBiuVXsWXjqJ7bfwM/F91X4RT0Ly3Y8Ncew==
23502350
dependencies:
2351-
"@cypress-design/icon-registry" "^0.15.0"
2351+
"@cypress-design/icon-registry" "^0.16.0"
23522352

2353-
"@cypress-design/vue-statusicon@0.1.4":
2354-
version "0.1.4"
2355-
resolved "https://registry.yarnpkg.com/@cypress-design/vue-statusicon/-/vue-statusicon-0.1.4.tgz#651947180b6fb0d17c85ff2659f27414ecd22b69"
2356-
integrity sha512-L7bl44XgZMkXFFQqr8ZQIzOoAgfkDXeGtm5/dyn8DWPdXAej4kw+nacPFW/qbxnfDQMWZ3KDoAihV5MZqXhv2g==
2353+
"@cypress-design/vue-statusicon@0.2.0":
2354+
version "0.2.0"
2355+
resolved "https://registry.yarnpkg.com/@cypress-design/vue-statusicon/-/vue-statusicon-0.2.0.tgz#77212db72d05c30e60e4de96374e8c77bcdb3478"
2356+
integrity sha512-azGf5JF94GepvE90fupAlMD4MHPKE18m3XkdziRxg6FTG3YiJKS5qsEO8FcXlI4Z9tOv95kpjSTSVVzG2TLLPQ==
23572357
dependencies:
2358-
"@cypress-design/icon-registry" "^0.15.0"
2359-
"@cypress-design/vue-icon" "^0.13.0"
2358+
"@cypress-design/icon-registry" "^0.16.0"
2359+
"@cypress-design/vue-icon" "^0.14.0"
23602360

23612361
"@cypress/commit-info@2.2.0":
23622362
version "2.2.0"

0 commit comments

Comments
 (0)