From 990e76330def794ec4bc68b546b1028ada5bb190 Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Mon, 22 Jan 2024 12:27:42 +0000 Subject: [PATCH 1/2] Improve disabled radio state --- libs/api-mocks/msw/handlers.ts | 5 ++++- libs/ui/lib/radio/Radio.tsx | 18 +++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libs/api-mocks/msw/handlers.ts b/libs/api-mocks/msw/handlers.ts index b5037d4e7c..f73632d941 100644 --- a/libs/api-mocks/msw/handlers.ts +++ b/libs/api-mocks/msw/handlers.ts @@ -286,7 +286,7 @@ export const handlers = makeHandlers({ const instances = db.instances.filter((i) => i.project_id === project.id) return paginated(query, instances) }, - instanceCreate({ body, query }) { + async instanceCreate({ body, query }) { const project = lookup.project(query) errIfExists(db.instances, { name: body.name, project_id: project.id }, 'instance') @@ -406,6 +406,9 @@ export const handlers = makeHandlers({ time_run_state_updated: new Date().toISOString(), } db.instances.push(newInstance) + + await new Promise((resolve) => setTimeout(resolve, 5000)) + return json(newInstance, { status: 201 }) }, instanceView: ({ path, query }) => lookup.instance({ ...path, ...query }), diff --git a/libs/ui/lib/radio/Radio.tsx b/libs/ui/lib/radio/Radio.tsx index 6e6e626353..777b6c21f7 100644 --- a/libs/ui/lib/radio/Radio.tsx +++ b/libs/ui/lib/radio/Radio.tsx @@ -40,15 +40,19 @@ export const Radio = ({ children, className, ...inputProps }: RadioProps) => ( const cardLabelStyles = ` py-2 px-4 text-sans-md border rounded border-default bg-default hover:border-hover - peer-focus:ring-2 peer-focus:ring-accent-secondary - peer-checked:bg-accent-secondary peer-checked:hover:border-accent - peer-checked:border-accent-secondary peer-checked:text-accent peer-checked:[&>*_.text-secondary]:text-accent-secondary - peer-disabled:bg-disabled w-44 + peer-focus:ring-2 peer-focus:ring-accent-secondary w-44 children:py-3 children:px-3 children:-mx-4 children:border-secondary - first:children:-mt-2 last:children:-mb-2 - peer-checked:children:border-accent peer-checked:children:border-accent-secondary - cursor-pointer peer-disabled:cursor-default + first:children:-mt-2 last:children:-mb-2 cursor-pointer + + peer-checked:bg-accent-secondary + peer-checked:border-accent-secondary peer-checked:hover:border-accent peer-checked:children:border-accent peer-checked:children:border-accent-secondary + peer-checked:text-accent peer-checked:[&>*_.text-secondary]:text-accent-secondary + + peer-disabled:cursor-not-allowed + peer-disabled:bg-disabled peer-disabled:peer-checked:bg-accent-secondary + peer-checked:peer-disabled:hover:border-accent-secondary peer-disabled:hover:border-default + peer-disabled:[&>*_.text-secondary]:text-disabled peer-disabled:text-disabled peer-disabled:peer-checked:text-accent-disabled peer-disabled:peer-checked:[&>*_.text-secondary]:text-accent-disabled ` export function RadioCard({ children, className, ...inputProps }: RadioProps) { From dc04f925521fea02ba5b84580578236a9b762f18 Mon Sep 17 00:00:00 2001 From: Benjamin Leonard Date: Mon, 22 Jan 2024 15:21:26 +0000 Subject: [PATCH 2/2] Undo extra time --- libs/api-mocks/msw/handlers.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/api-mocks/msw/handlers.ts b/libs/api-mocks/msw/handlers.ts index f73632d941..b5037d4e7c 100644 --- a/libs/api-mocks/msw/handlers.ts +++ b/libs/api-mocks/msw/handlers.ts @@ -286,7 +286,7 @@ export const handlers = makeHandlers({ const instances = db.instances.filter((i) => i.project_id === project.id) return paginated(query, instances) }, - async instanceCreate({ body, query }) { + instanceCreate({ body, query }) { const project = lookup.project(query) errIfExists(db.instances, { name: body.name, project_id: project.id }, 'instance') @@ -406,9 +406,6 @@ export const handlers = makeHandlers({ time_run_state_updated: new Date().toISOString(), } db.instances.push(newInstance) - - await new Promise((resolve) => setTimeout(resolve, 5000)) - return json(newInstance, { status: 201 }) }, instanceView: ({ path, query }) => lookup.instance({ ...path, ...query }),