refactor: api to server components

Signed-off-by: Jeroen Branje <[email protected]>

apps/envited.ascs.digital/app/api/utils.ts

@@ -2,7 +2,6 @@ import { equals, pathOr, prop } from 'ramda'
 
 import { Role, Session, User } from '../../common/types/types'
 
-
 export const extractIdFromCredential = pathOr('', ['credentialSubject', 'id'])
 
 export const extractIssuerIdFromCredential = pathOr('', ['issuer', 'id'])

apps/envited.ascs.digital/app/dashboard/users/page.tsx

@@ -1,4 +1,5 @@
 import { getUsersByIssuerId } from 'apps/envited.ascs.digital/common/server'
+
 import { Users } from '../../../modules/Users'
 
 export default async function Index() {

apps/envited.ascs.digital/common/i18n/useI18n.ts

@@ -8,7 +8,11 @@ import { Locale, TranslationsMap } from './types'
 const getTranslationsForLanguage = (namespace: string) => (locale: Locale) => pathOr({}, [locale, namespace])
 
 const mergeTranslations = reduce(mergeDeepRight, { [Locale.en_GB]: {}, [Locale.de_DE]: {} })
-const translationObject = mergeTranslations([HeaderTranslation, HeroHeaderTranslation, UsersTranslation]) as TranslationsMap
+const translationObject = mergeTranslations([
+  HeaderTranslation,
+  HeroHeaderTranslation,
+  UsersTranslation,
+]) as TranslationsMap
 
 export const translation = (translations: TranslationsMap) => (namespace: string) => {
   const t = (key: string): React.ReactElement =>

apps/envited.ascs.digital/common/server/users/getUserById.ts

@@ -1,13 +1,13 @@
 import { isNil } from 'ramda'
 import { cache } from 'react'
 
-import { isOwnUser, userIsIssuedByLoggedInUser } from '../utils'
 import { getServerSession } from '../../auth'
 import { db } from '../../database/queries'
 import { Database } from '../../database/types'
 import { User } from '../../types'
 import { Session } from '../../types/types'
 import { badRequestError, error, unauthorizedError } from '../../utils'
+import { isOwnUser, userIsIssuedByLoggedInUser } from '../utils'
 
 export const _getUserById =
   ({ db, getServerSession }: { db: Database; getServerSession: () => Promise<Session | null> }) =>

apps/envited.ascs.digital/common/server/users/getUsersByIssuerId.test.ts

@@ -10,7 +10,7 @@ describe('common/server/users/getUsersByIssuerId', () => {
       Promise.resolve({
         user: {
           pkh: 'USER_ISSUER_ID',
-          role: Role.federator
+          role: Role.federator,
         },
       }),
     )
@@ -32,7 +32,9 @@ describe('common/server/users/getUsersByIssuerId', () => {
       }),
     )
 
-    const result = await SUT._getUsersByIssuerId({ db: dbStub, getServerSession: getServerSessionStub })('USER_ISSUER_ID')
+    const result = await SUT._getUsersByIssuerId({ db: dbStub, getServerSession: getServerSessionStub })(
+      'USER_ISSUER_ID',
+    )
     expect(result).toEqual([user])
   })
 

apps/envited.ascs.digital/common/server/utils.ts

@@ -2,7 +2,6 @@ import { equals, pathOr, prop } from 'ramda'
 
 import { Role, Session, User } from '../../common/types/types'
 
-
 export const extractIdFromCredential = pathOr('', ['credentialSubject', 'id'])
 
 export const extractIssuerIdFromCredential = pathOr('', ['issuer', 'id'])

apps/envited.ascs.digital/modules/Users/Users.test.tsx

@@ -4,11 +4,13 @@ import { Users } from './Users'
 
 describe('Users', () => {
   it('should render successfully', () => {
-    const USERS_MAP = [{
-      name: 'John Johnson',
-      email: '[email protected]',
-      id: 'did:pkh:tz:tz1SfdVU1mor3Sgej3FmmwMH4HM1EjTzqqeE',
-    }]
+    const USERS_MAP = [
+      {
+        name: 'John Johnson',
+        email: '[email protected]',
+        id: 'did:pkh:tz:tz1SfdVU1mor3Sgej3FmmwMH4HM1EjTzqqeE',
+      },
+    ]
 
     const { baseElement } = render(<Users users={USERS_MAP} />)
     expect(baseElement).toBeTruthy()

apps/envited.ascs.digital/modules/Users/Users.tsx

@@ -1,11 +1,11 @@
 'use client'
 
 import { Card, Heading, Table, TableBody, TableCell, TableHeader, TableRow } from '@envited-marketplace/design-system'
+import { map } from 'ramda'
 import React, { FC } from 'react'
 
 import { useTranslation } from '../../common/i18n'
 import { User } from '../../common/types/types'
-import { map } from 'ramda'
 
 interface UsersProps {
   users: Partial<User>[]
@@ -31,13 +31,13 @@ export const Users: FC<UsersProps> = ({ users }) => {
           </TableRow>
         </TableHeader>
         <TableBody>
-          {map(({id, name, email }: Partial<User>) => 
+          {map(({ id, name, email }: Partial<User>) => (
             <TableRow key={id}>
               <TableCell>{id}</TableCell>
               <TableCell>{name}</TableCell>
               <TableCell>{email}</TableCell>
             </TableRow>
-          )(users)}
+          ))(users)}
         </TableBody>
       </Table>
     </Card>