Merge pull request #276 from l3vels/fix/fine-tuning

fix: group navigation
l3vels · Oct 31, 2023 · c5aec70 · c5aec70
2 parents b5f366d + efec970
commit c5aec70
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/apps/ui/src/Route.tsx b/apps/ui/src/Route.tsx
@@ -284,10 +284,7 @@ const Route = () => {
                 element={<EditContactForm />}
                 key={document.location.href}
               />
-            </Router>
 
-            <Router path={'groups'} element={<MainRouteLayout />} key={document.location.href}>
-              <Router index element={<Group />} key={document.location.href} />
               <Router
                 path={'create-group'}
                 element={<CreateGroupForm />}
@@ -300,6 +297,10 @@ const Route = () => {
               />
             </Router>
 
+            {/* <Router path={'groups'} element={<MainRouteLayout />} key={document.location.href}>
+              <Router index element={<Group />} key={document.location.href} />
+            </Router> */}
+
             <Router path={'developers'} element={<DevelopersRouteLayout />}>
               <Router index element={<ApiKeys />} key={document.location.href} />
               <Router path={'logs'} element={<Log />} key={document.location.href} />

diff --git a/apps/ui/src/plugins/contact/pages/Group/Groups.tsx b/apps/ui/src/plugins/contact/pages/Group/Groups.tsx
@@ -63,7 +63,7 @@ const Groups = () => {
               />
 
               <IconButton
-                onClick={() => navigate(`/groups/${cell.value}/edit-group`)}
+                onClick={() => navigate(`/contacts/${cell.value}/edit-group`)}
                 icon={() => <StyledEditIcon />}
                 size={IconButton.sizes.SMALL}
                 kind={IconButton.kinds.TERTIARY}
@@ -87,7 +87,7 @@ const Groups = () => {
           </StyledSectionDescription> */}
         </div>
         <div>
-          <ButtonPrimary onClick={() => navigate('/groups/create-group')} size={'small'}>
+          <ButtonPrimary onClick={() => navigate('/contacts/create-group')} size={'small'}>
             {t('add-group')}
           </ButtonPrimary>
         </div>

diff --git a/apps/ui/src/plugins/contact/pages/Group/useCreateGroup.ts b/apps/ui/src/plugins/contact/pages/Group/useCreateGroup.ts
@@ -46,7 +46,7 @@ export const useCreateGroup = () => {
         type: 'positive',
         open: true,
       })
-      navigate('/groups')
+      navigate('/contacts')
     } catch (e) {
       setToast({
         message: 'Failed To Add Group!',

diff --git a/apps/ui/src/plugins/contact/pages/Group/useEditGroup.ts b/apps/ui/src/plugins/contact/pages/Group/useEditGroup.ts
@@ -45,7 +45,7 @@ export const useEditGroup = () => {
         type: 'positive',
         open: true,
       })
-      navigate('/groups')
+      navigate('/contacts')
     } catch (e) {
       setToast({
         message: 'Failed To Update Group!',