Fix graphql Queries (#142)

front/src/components/editable-cell/EditableChip.tsx

@@ -25,7 +25,7 @@ const StyledInplaceInput = styled.input`
   }
 `;
 
-const StyledInplaceShow = styled.input`
+const StyledInplaceShow = styled.div`
   width: 100%;
   border: none;
   outline: none;

front/src/components/form/Checkbox.tsx

@@ -56,7 +56,7 @@ function Checkbox({ name, id, checked, onChange, indeterminate }: OwnProps) {
         name={name}
         checked={checked}
         onChange={onChange}
-      ></input>
+      />
     </StyledContainer>
   );
 }

front/src/components/table/table-header/__stories__/SortDropdownButton.stories.tsx

@@ -33,14 +33,14 @@ const availableSorts = [
     label: 'People',
     icon: <TbUser size={16} />,
     _type: 'custom_sort',
-    orderByTemplate: () => ({ email: Order_By.Asc }),
+    orderByTemplates: [() => ({ email: Order_By.Asc })],
   },
   {
     key: 'company_name',
     label: 'Company',
     icon: <TbBuilding size={16} />,
     _type: 'custom_sort',
-    orderByTemplate: () => ({ email: Order_By.Asc }),
+    orderByTemplates: [() => ({ email: Order_By.Asc })],
   },
   {
     key: 'email',

front/src/components/table/table-header/helpers.ts

@@ -33,9 +33,13 @@ export const reduceSortsToOrderBy = <OrderByTemplate>(
   sorts: Array<SelectedSortType<OrderByTemplate>>,
 ): OrderByTemplate[] => {
   const mappedSorts = sorts.map((sort) => {
-    if (sort._type === 'custom_sort')
-      return sort.orderByTemplate(mapOrderToOrder_By(sort.order));
+    if (sort._type === 'custom_sort') {
+      return sort.orderByTemplates.map((orderByTemplate) =>
+        orderByTemplate(mapOrderToOrder_By(sort.order)),
+      );
+    }
+
     return defaultOrderByTemplateFactory(sort.key as string)(sort.order);
   });
-  return mappedSorts as OrderByTemplate[];
+  return mappedSorts.flat() as OrderByTemplate[];
 };

front/src/interfaces/sorts/interface.ts

@@ -13,7 +13,7 @@ export type SortType<OrderByTemplate> =
       label: string;
       key: string;
       icon?: ReactNode;
-      orderByTemplate: (order: Order_By) => OrderByTemplate;
+      orderByTemplates: Array<(order: Order_By) => OrderByTemplate>;
     };
 
 export type SelectedSortType<OrderByTemplate> = SortType<OrderByTemplate> & {

front/src/pages/people/people-sorts.tsx

@@ -18,17 +18,21 @@ export const availableSorts = [
     label: 'People',
     icon: <TbUser size={16} />,
     _type: 'custom_sort',
-    orderByTemplate: (order: Order_By) => ({
-      firstname: order,
-      lastname: order,
-    }),
+    orderByTemplates: [
+      (order: Order_By) => ({
+        firstname: order,
+      }),
+      (order: Order_By) => ({
+        lastname: order,
+      }),
+    ],
   },
   {
     key: 'company_name',
     label: 'Company',
     icon: <TbBuilding size={16} />,
     _type: 'custom_sort',
-    orderByTemplate: (order: Order_By) => ({ company: { name: order } }),
+    orderByTemplates: [(order: Order_By) => ({ company: { name: order } })],
   },
   {
     key: 'email',

front/src/services/api/users/index.tsx

@@ -2,7 +2,7 @@ import { QueryResult, gql, useQuery } from '@apollo/client';
 import { GraphqlQueryUser } from '../../../interfaces/entities/user.interface';
 
 export const GET_CURRENT_USER = gql`
-  query getUser($uuid: String) {
+  query getCurrentUser($uuid: String) {
     users(where: { id: { equals: $uuid } }) {
       id
       email

front/src/services/auth/AuthService.ts

@@ -13,7 +13,7 @@ export const getUserIdFromToken: () => string | null = () => {
   }
 
   try {
-    return jwt<{ sub: string }>(accessToken).sub;
+    return jwt<{ userId: string }>(accessToken).userId;
   } catch (error) {
     return null;
   }