fix(client): app bar navigation for non admin, delete hover button re…

…st props

packages/client/src/elements/AppBar/index.tsx

@@ -106,7 +106,7 @@ const AppBar = ({ tabs = defaultTabs }: AppBarProps) => {
 
   const handleChange = (event: MouseEvent, newValue: number) => {
     setActiveTab(newValue);
-    const selectedTab = tabs.find(
+    const selectedTab = sortedItems.find(
       (tab) => newValue === (isMobile ? tab.indexMobile ?? tab.index : tab.index),
     );
     if (selectedTab) {

packages/client/src/elements/buttons/CloseButton/index.tsx

@@ -11,10 +11,10 @@ const CloseButton = ({
 }: CloseButtonProps) => (
   <StyledButton
     data-testid="closeButton"
+    {...rest}
     color={color}
     hoverColor={hoverColor}
     size={size}
-    {...rest}
   >
     <LeftRight />
     <RightLeft />

packages/client/src/elements/buttons/DeleteHoverButton/DeleteHoverButton.stories.tsx

@@ -2,12 +2,13 @@ import { Meta, Story } from '@storybook/react/types-6-0';
 import React from 'react';
 
 import DeleteHoverButton from '.';
+import { DeleteHoverButtonProps } from './DeleteHoverButton.types';
 
 export default {
   title: 'Elements/buttons/Delete Hover Button',
   component: DeleteHoverButton,
 } as Meta;
 
-const Template: Story = (args) => <DeleteHoverButton {...args} />;
+const Template: Story<DeleteHoverButtonProps> = (args) => <DeleteHoverButton {...args} />;
 
 export const Default = Template.bind({});

packages/client/src/elements/buttons/DeleteHoverButton/DeleteHoverButton.types.d.ts

@@ -0,0 +1,5 @@
+import { ButtonHTMLAttributes } from 'react';
+
+interface DeleteHoverButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
+  disabled?: boolean;
+}

packages/client/src/elements/buttons/DeleteHoverButton/index.tsx

@@ -1,18 +1,19 @@
-import { ButtonHTMLAttributes } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { TrashIcon } from '../../../icons';
 import { StyledButton } from './DeleteHoverButton.styled';
+import { DeleteHoverButtonProps } from './DeleteHoverButton.types';
 
-interface DeleteHoverButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
-  disabled?: boolean;
-}
-
-const DeleteHoverButton = ({ disabled }: DeleteHoverButtonProps) => {
+const DeleteHoverButton = ({ disabled, ...rest }: DeleteHoverButtonProps) => {
   const { t } = useTranslation();
 
   return (
-    <StyledButton data-testid="delete-hover-button" colorVariant="red" disabled={disabled}>
+    <StyledButton
+      data-testid="delete-hover-button"
+      {...rest}
+      colorVariant="red"
+      disabled={disabled}
+    >
       <p>{t('actions.delete')}</p>
       <TrashIcon />
     </StyledButton>

packages/client/src/elements/layouts/TabbedLayout/Tab/index.tsx

@@ -34,6 +34,7 @@ const Tab = ({
       tabRef.current?.scrollIntoView({ behavior: 'smooth', inline: 'nearest', block: 'nearest' });
     }
   };
+
   const isActive = value === index;
 
   let width = variant === 'fullWidth' ? '100%' : `${tabWidth}px`;

packages/client/src/pages/authorized/History/index.tsx

@@ -39,9 +39,9 @@ const History = () => {
                 return `${firstName} ${lastName}`;
               }}
             />
-            <DateField label="routes.history.date" source="createdAt" showTime />
+            <DateField label="history.date" source="createdAt" showTime />
             <FunctionField<ApiHistoryRecord>
-              label="routes.history.event"
+              label="history.event"
               render={({ event }) => mapHistoryEventToLabel(event)}
             />
           </DetailedList>