release update v3.6.1-beta

ConvoyPanel · Feb 10, 2023 · 161a587 · 161a587
1 parent 1f83a0f
commit 161a587
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v3.6.1-beta
+
+### Fixed
+
+- IP Addresses being clipped if too long in the UI
+- Awkward delete address modal
+
 ## v3.6.0-beta
 
 ### Fixed

diff --git a/resources/scripts/components/admin/nodes/addresses/DeleteAddressModal.tsx b/resources/scripts/components/admin/nodes/addresses/DeleteAddressModal.tsx
@@ -20,7 +20,7 @@ const DeleteAddressModal = ({ open, onClose, address }: Props) => {
     const { clearFlashes, clearAndAddHttpError } = useFlash()
     const nodeId = NodeContext.useStoreState(state => state.node.data!.id)
     const [page] = usePagination()
-    const { mutate } = useAddressesSWR(nodeId, {page, includes: ['server'] })
+    const { mutate } = useAddressesSWR(nodeId, { page, includes: ['server'] })
 
     const form = useFormik({
         initialValues: {
@@ -51,12 +51,16 @@ const DeleteAddressModal = ({ open, onClose, address }: Props) => {
     return (
         <Modal open={open} onClose={onClose}>
             <Modal.Header>
-                <Modal.Title>{address ? 'Edit' : 'New'} Address</Modal.Title>
+                <Modal.Title>Delete Address</Modal.Title>
             </Modal.Header>
             <FormikProvider value={form}>
                 <form onSubmit={form.handleSubmit}>
                     <Modal.Body>
                         <FlashMessageRender className='mb-5' byKey={'admin:node:addresses.delete'} />
+
+                        <Modal.Description>
+                            Are you sure you want to delete this address? This action cannot be undone.
+                        </Modal.Description>
                     </Modal.Body>
                     <Modal.Actions>
                         <Modal.Action type='button' onClick={onClose}>

diff --git a/resources/scripts/components/elements/displays/DisplayRow.tsx b/resources/scripts/components/elements/displays/DisplayRow.tsx
@@ -2,14 +2,14 @@ import styled from '@emotion/styled'
 import tw from 'twin.macro'
 
 const Row = styled.div`
-  ${tw`grid p-4 items-stretch justify-center bg-background border border-accent-200 rounded`}
+  ${tw`flex flex-col md:flex-row p-4 gap-4 bg-background border border-accent-200 rounded`}
 
   & > div {
-    ${tw`pt-4 md:pt-0 mt-4 md:mt-0 border-t md:border-t-0 border-accent-200`}
+    ${tw`border-t pt-4 md:pt-0 md:border-t-0 border-accent-200`}
   }
 
   & > div:is(:first-of-type) {
-    ${tw`border-t-0 pt-0 mt-0`}
+    ${tw`border-t-0 pt-0`}
   }
 `
 

diff --git a/resources/scripts/components/servers/backups/BackupRow.tsx b/resources/scripts/components/servers/backups/BackupRow.tsx
@@ -159,7 +159,7 @@ const Dropdown = ({ className, backup, swr: { mutate } }: DropdownProps) => {
 const BackupRow = ({ backup, swr: { mutate } }: Props) => {
     return (
         <Display.Row key={backup.uuid} className='grid-cols-1 md:grid-cols-8 text-sm'>
-            <div className='flex justify-between items-center md:col-span-5'>
+            <div className='flex justify-between items-center grow'>
                 <div className='flex items-center space-x-3'>
                     <p className='overflow-hidden text-ellipsis font-semibold text-foreground'>{backup.name}</p>
                     {!backup.completedAt ? (

diff --git a/resources/scripts/components/servers/overview/ServerNetworkBlock.tsx b/resources/scripts/components/servers/overview/ServerNetworkBlock.tsx
@@ -24,9 +24,9 @@ const ServerNetworkBlock = () => {
                         <Display.Group className='mt-3'>
                             {addresses.map(ip => (
                                 <Display.Row key={ip.id} className='grid-cols-1 md:grid-cols-3 text-sm'>
-                                    <div>
+                                    <div className='overflow-hidden'>
                                         <p className='description-small !text-xs'>Address</p>
-                                        <p className='font-semibold text-foreground'>
+                                        <p className='font-semibold truncate text-foreground overflow-hidden overflow-ellipsis'>
                                             {ip.address}/{ip.cidr}
                                         </p>
                                     </div>