From baf11cfa497713ca2effc2ef33270be80be58f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Vasconcellos?= Date: Fri, 21 Apr 2023 13:13:03 +0000 Subject: [PATCH] Misc UI fixes (#725) * Misc UI fixes - Solve React dev warning due to not using ref in a fowardRef - Show title in alertDialog * Partial revert "Misc UI fixes" * Remove console.log from 'OptionsPanel.tsx' - Replace invalidateQuery with refresh for `locations.list` in `AddLocationDialog` * Format `Select.tsx` - Update turbo to fix https://github.com/vercel/turbo/issues/3598 --- .../app/$libraryId/Explorer/OptionsPanel.tsx | 2 -- .../library/locations/AddLocationDialog.tsx | 10 ++++------ interface/components/AlertDialog.tsx | 1 + package.json | 2 +- packages/ui/src/Select.tsx | 2 +- pnpm-lock.yaml | Bin 825577 -> 825577 bytes 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/interface/app/$libraryId/Explorer/OptionsPanel.tsx b/interface/app/$libraryId/Explorer/OptionsPanel.tsx index ab9dbe005..8f440d499 100644 --- a/interface/app/$libraryId/Explorer/OptionsPanel.tsx +++ b/interface/app/$libraryId/Explorer/OptionsPanel.tsx @@ -40,7 +40,6 @@ export default () => { { getExplorerStore().gridItemSize = value[0] || 100; - console.log({ value: value, gridItemSize: explorerStore.gridItemSize }); }} defaultValue={[explorerStore.gridItemSize]} max={200} @@ -87,7 +86,6 @@ export default () => { label="Show Object size" name="showBytesInGridView" onCheckedChange={(value) => { - console.log(value); if (typeof value === 'boolean') { getExplorerStore().showBytesInGridView = value; } diff --git a/interface/app/$libraryId/settings/library/locations/AddLocationDialog.tsx b/interface/app/$libraryId/settings/library/locations/AddLocationDialog.tsx index 57011f5c7..a400cce5a 100644 --- a/interface/app/$libraryId/settings/library/locations/AddLocationDialog.tsx +++ b/interface/app/$libraryId/settings/library/locations/AddLocationDialog.tsx @@ -1,6 +1,5 @@ import { ErrorMessage } from '@hookform/error-message'; import { RSPCError } from '@rspc/client'; -import { useQueryClient } from '@tanstack/react-query'; import { useEffect, useMemo, useState } from 'react'; import { Controller } from 'react-hook-form'; import { useLibraryMutation, useLibraryQuery } from '@sd/client'; @@ -44,7 +43,7 @@ export const openDirectoryPickerDialog = async (platform: Platform): Promise { const dialog = useDialog(dialogProps); const platform = usePlatform(); - const queryClient = useQueryClient(); + const listLocations = useLibraryQuery(['locations.list']); const createLocation = useLibraryMutation('locations.create'); const relinkLocation = useLibraryMutation('locations.relink'); const listIndexerRules = useLibraryQuery(['locations.indexer_rules.list']); @@ -146,10 +145,9 @@ export const AddLocationDialog = ({ path, ...dialogProps }: Props) => { : '' } onSubmit={(event) => - onLocationSubmit(event).then( - () => queryClient.invalidateQueries(['library.list']), - onLocationSubmitError - ) + onLocationSubmit(event).then(async () => { + await listLocations.refetch(); + }, onLocationSubmitError) } ctaLabel="Add" > diff --git a/interface/components/AlertDialog.tsx b/interface/components/AlertDialog.tsx index 76aecc80c..6ad919c5b 100644 --- a/interface/components/AlertDialog.tsx +++ b/interface/components/AlertDialog.tsx @@ -16,6 +16,7 @@ const AlertDialog = (props: Props) => { // maybe a copy-to-clipboard button would be beneficial too return ( {})} dialog={dialog} diff --git a/package.json b/package.json index cca0201fa..924019cf7 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "prettier": "^2.8.7", "prettier-plugin-tailwindcss": "^0.2.6", "rimraf": "^4.3", - "turbo": "^1.5.5", + "turbo": "^1.9.3", "turbo-ignore": "^0.3.0", "typescript": "^4.9.4" }, diff --git a/packages/ui/src/Select.tsx b/packages/ui/src/Select.tsx index 58b8b7fc1..7c7da1d04 100644 --- a/packages/ui/src/Select.tsx +++ b/packages/ui/src/Select.tsx @@ -7,7 +7,7 @@ import { PropsWithChildren } from 'react'; export const selectStyles = cva( [ - 'rounded-md border text-sm flex pl-3 pr-[10px] items-center justify-between', + 'flex items-center justify-between rounded-md border pl-3 pr-[10px] text-sm', 'shadow-sm outline-none transition-all focus:ring-2', 'radix-placeholder:text-ink-faint' ], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed8de25439c9e1f4e0cab838f9e487e9b89a2fc4..e11b29995e7130ea41e78a7d7a93dc286ea6ba3a 100644 GIT binary patch delta 1284 zcmYjR-K*PV9Hy)5*;(cg9CEfDbyL_8%GP|fO@!&1G)onD+v*^PHz2!da@Gr^m4<@^uq>74q)13!N63(xO)o|oV81Nis> z{N)#gB7Ot;`hMZ7P4S^tyrUHhYn)o+q<(IV(}!BI^l*6!gYuVemtHH>@>{n{jRKTE ze*WBr!+W<&-|rN#{Nayh_CzvbvO%EhP&?3wBvMuaj`4yG>MkjzZijOtuIXr0;Vv~KG-*P|d7pL0V0@Q+VR-+or8eRB1^Ytk6j$7ExF zNxFEa93DSIrt9I~X+TzT`VD$uGFPEt0byLiCaa9GRacHk;C#a|Bg zg8*ra*$#(6UXtC}L$=m9v&QxsXAk!ffW2S9^Zrg@PXeu$37fLwVeoW7p<1~g35;V< zEovreP6+uiqcF0us+NU_Uj|r91wBgYG1I7;*j%?uSye8e4_pMX$%?@^Gp#qR+WDV9 z0gDp~e*2A)sTyv?6AgH!Qcz$_Dv=aW(>bG~!jxqVKCC-I+DYjSXb39@EjNNucZ_2; z#XC_O@~0!2NGnQ%8n>!x&9YaZ%Xf4A5%6mM*1M;vT=*F%<@_(eH~&ad#FP+Pym66=5qbt$PHfkb1y5-@!XoGsO;u9-SdQ!@hshjcJU!j34$&`MiO z6}j2vNY=pmH*e;8t#~QF1s9te&U?QCrEPug*U$=d~Hg{lE&d`1=28K|-smIuqCCWe%Ojk(|a5&2fl~R-0)v^8AVGR}NCq7*Udm z#Vfx<#t^(nZ4uV?tF$$@*r7TJxe3Kqgz?xO^6ftTuj03x#nFh4gZDslX>b{-(F1gFLcG?yn}6^K;Gg}|cC+p;eVrEtj;=V;bXImiDNRiR5^;PW zkZcn-sdPy7thNvi+iB>VZPKIIgwuU7wglec$zi)3}%%31z zJ2^Pq+RgJL;Kh@zk>5Q6E}Ywh`{tE(y6et&N5I9+)$tLqdv)D8du4NybZ&&#|4ZfB z`)iMZS5Ags0WTfC^BDN(`qQO?ix!zttqE8OM_9E3O&G#PTcDfp89PrCI%I}@g>>pE z8o~)=&FQiU>UhfwqAaT^A~&4$JHm`52Cj%%=s+PrJW3XN{_wA@OZnXZ*g5?C{JHkW Fe*+zSqv`+v delta 1199 zcmYk6%a7Ys6vmZ?$#m*bg+zr~TA&4~v#_Ri{D>2zLX$Wd$4Ts)v7LuO0z2^|9zWtZ zj_qg`MIcq(Af&2z!wRW;N*A+42#FPJ5DOln(@L=D0?|K!1)ga~aHUVWI`>My^L^*) zKDm!QxsQGMMJ`WXBOlz$eU-~o*U*pT{4F`3%XBK!(f)-@YX@?^@J)P*!qZpx3vc9z z^u~Unn*O;eoIAL?U-Onscf?S3 z8M0TZw0JA;HQ8b+rr zV=mG}h$+UfFz9nJQwi(6TU+>grqh`=GMzct!Xfrv=IZe$`K`Vw>{LTd(8;z}W=oVa z^R3yU(hNXJ18&jnj%}*d2OjH_6DBZ*xZ>6UQUkUYvm}bCTpKP^G@Y0|lSMi}V2ACw zFzTg${|qgkBcxiV!w<+osV~QSB#g?uMOOKuZ*@^XPJ@GwJlZoDU7B!Sq zO$PW8O!oQ}YGho$o+_pME9ng^PaiWs`wc2=D08PoAjNCX;v81lMvPfQc*T=?Z^6!Z zd|nDoQBf_z6RMt=&`^|SAH}_iG|Qz z&DbbI-@lmu;Fx+gnz|D&3by}`)gp@mV2OpXzeMMF(KOtef;UJ%l0r&L`n!Pa7L6Jr zvO`^9CZR-C3^ks$>q*>_mzdr`I1IrhssZ>O5ahU4^=zwp;`kjp|7QC1V*bjrsDJt$ zdhsOc&dTDY)lwVmEkzo&K$)&}N7Jf1(j4c=ogYsGCybhFA2htP%NqbG;Zr7KzG%;n>?2