diff --git a/pages/_app.tsx b/pages/_app.tsx index bce8840fee98852b2500818232231247f806daa5..b52c4ee9007c7d3e2e2ce1366ffce63b417b4b54 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -98,7 +98,7 @@ const App = (props: React.PropsWithChildren) => { return { name: user.name, avatar: user.image, - data: data, + data } } @@ -130,16 +130,16 @@ const App = (props: React.PropsWithChildren) => { show: '/fdo/show/:id', create: '/fdo' }, { - name: 'repositories', - list: '/repositories', - show: '/repositories/show/:id' - }, { - name: 'info', - show: '/info' - }, { - name: "profiles", - list: "/profiles", - show: "/profiles/show/:id" + name: 'repositories', + list: '/repositories', + show: '/repositories/show/:id' + }, { + name: 'info', + show: '/info' + }, { + name: 'profiles', + list: '/profiles', + show: '/profiles/show/:id' }]} > {props.children} @@ -149,7 +149,7 @@ const App = (props: React.PropsWithChildren) => { </RefineSnackbarProvider> </ColorModeContextProvider> </RefineKbarProvider> - </>; + </> } function MyApp ({ diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts index 462fb1dc59db280acb6fbe0157da2582781d44e7..aae8fd3e5ed95596f28de18068c76bcfbde0977a 100644 --- a/pages/api/auth/[...nextauth].ts +++ b/pages/api/auth/[...nextauth].ts @@ -1,12 +1,12 @@ import NextAuth from 'next-auth' import KeycloakProvider from 'next-auth/providers/keycloak' -//import { UnstorageAdapter } from '@auth/unstorage-adapter' -//import { createStorage } from 'unstorage' +// import { UnstorageAdapter } from '@auth/unstorage-adapter' +// import { createStorage } from 'unstorage' -//const storage = createStorage() +// const storage = createStorage() export const authOptions = { - //adapter: UnstorageAdapter(storage), + // adapter: UnstorageAdapter(storage), session: { maxAge: 172800 // 48h }, @@ -35,15 +35,17 @@ export const authOptions = { }, async session ({ session, user, token }: any) { console.log('### session', session, user, token, '### ### ###') - return { ...session, - account: token.account, + return { + ...session, + account: token.account } }, async jwt ({ token, user, account, profile, isNewUser }: any) { console.log('### jwt', token, user, account, profile, isNewUser, '### ### ###') - if ( account ) { - return { ...token, - account: account + if (account) { + return { + ...token, + account } } return token diff --git a/src/api/api.ts b/src/api/api.ts index cac6a40104b84a6ba5f1f84356d5c43745069cd1..3e8cfaeccc7df79032ac475b987b27ecba85a028 100644 --- a/src/api/api.ts +++ b/src/api/api.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /** * FDO Manager Service API diff --git a/src/api/base.ts b/src/api/base.ts index 78b555a5bbdea94f2117d09ff016d5d2c12e9cfe..89b54ab09df447064fb08782c996cf380d5835ac 100644 --- a/src/api/base.ts +++ b/src/api/base.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /** * FDO Manager Service API diff --git a/src/api/common.ts b/src/api/common.ts index e97d5bff68a02511621c8f102eb9371944ccf99c..9b2273c98700ebe566ff37920e98183099468bce 100644 --- a/src/api/common.ts +++ b/src/api/common.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /** * FDO Manager Service API diff --git a/src/api/configuration.ts b/src/api/configuration.ts index cc56d0239aa38c10cee9f1a074c1ad27514f82f6..e8efb77751fdb2719a59de13b2ab7a78437280bf 100644 --- a/src/api/configuration.ts +++ b/src/api/configuration.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /** * FDO Manager Service API diff --git a/src/api/index.ts b/src/api/index.ts index 4e2f60d5034ada947d9aacb2ea429638c108c8d6..10f56534ef2c21414b7312c81a28f62f8e6bab6f 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,4 +1,3 @@ -/* tslint:disable */ /* eslint-disable */ /** * FDO Manager Service API diff --git a/src/components/fdos/create.tsx b/src/components/fdos/create.tsx index 17be4c932e492ecbfc51ed9bc63fb245c4169fa0..214590b418e471fa10e7731af5bfdedbb585a6c6 100644 --- a/src/components/fdos/create.tsx +++ b/src/components/fdos/create.tsx @@ -1,10 +1,9 @@ -import { IResourceComponentsProps, useList, HttpError } from '@refinedev/core' -import { useGetIdentity } from "@refinedev/core"; +import { IResourceComponentsProps, useList, HttpError, useGetIdentity } from '@refinedev/core' import { Create, SaveButton } from '@refinedev/mui' import { useTheme, styled } from '@mui/material/styles' -import Skeleton from '@mui/material/Skeleton'; -import Stack from '@mui/material/Stack'; +import Skeleton from '@mui/material/Skeleton' +import Stack from '@mui/material/Stack' import Box from '@mui/material/Box' import TextField from '@mui/material/TextField' import InputLabel from '@mui/material/InputLabel' @@ -51,9 +50,9 @@ const StepRepository: React.FC<any> = ({ control, register, errors }) => { name="profile" render={({ field }) => { return ( - profileList.isLoading ? - <Skeleton><Select></Select></Skeleton> : - <Select + profileList.isLoading + ? <Skeleton><Select></Select></Skeleton> + : <Select {...field} error={!!errors.profile} labelId="profile-select-label" @@ -73,9 +72,9 @@ const StepRepository: React.FC<any> = ({ control, register, errors }) => { name="repository" render={({ field }) => { return ( - repositoryList.isLoading ? - <Skeleton><Select></Select></Skeleton> : - <Select + repositoryList.isLoading + ? <Skeleton><Select></Select></Skeleton> + : <Select {...field} error={!!errors.repository} labelId="repository-select-label" @@ -141,11 +140,11 @@ const StepData: React.FC<any> = ({ register, errors }) => { } export const FdoCreate: React.FC<IResourceComponentsProps> = () => { - const identity = useGetIdentity() - const access_token = identity.data?.data?.account?.access_token + const identity = useGetIdentity<any>() + const accessToken = identity.data?.data?.account?.access_token - console.log('access_token: ', access_token) - const formRet = useStepsForm<IRepository, HttpError, any>({ defaultValues: { repository: '', profile: '' }, refineCoreProps: { meta: { headers: { "Authentication" : `Bearer ${access_token}` }}}}) + console.log('accessToken: ', accessToken) + const formRet = useStepsForm<any, HttpError, any>({ defaultValues: { repository: '', profile: '' }, refineCoreProps: { meta: { headers: { Authentication: `Bearer ${accessToken}` } } } }) console.log('formRet', formRet) const { saveButtonProps, diff --git a/src/components/profiles/index.ts b/src/components/profiles/index.ts index 36a92846e2d7c427fc6d9ba205a29ccb7c113231..1f96e3a68076c02110cb0f9ed7dd17ff8256e23d 100644 --- a/src/components/profiles/index.ts +++ b/src/components/profiles/index.ts @@ -1,2 +1,2 @@ -export * from "./list"; -export * from "./show"; +export * from './list' +export * from './show' diff --git a/src/components/profiles/list.tsx b/src/components/profiles/list.tsx index 0b121cf8707905cd50cd18c9ecdcdc3defe7d7e0..ba133b87d5121c0ae663ff356e44fa5c8818aa75 100644 --- a/src/components/profiles/list.tsx +++ b/src/components/profiles/list.tsx @@ -1,5 +1,5 @@ import { IResourceComponentsProps } from '@refinedev/core' -import Link from '@mui/material/Link'; +import Link from '@mui/material/Link' import { List, useDataGrid } from '@refinedev/mui' diff --git a/src/components/profiles/show.tsx b/src/components/profiles/show.tsx index bc81ae0c654dbf676aa33a938799eb3ff454ddb4..ae51dff70e7ba8f3c6336e2ce515663769221064 100644 --- a/src/components/profiles/show.tsx +++ b/src/components/profiles/show.tsx @@ -1,6 +1,6 @@ -import { IResourceComponentsProps } from "@refinedev/core"; -import { MuiInferencer } from "@refinedev/inferencer/mui"; +import { IResourceComponentsProps } from '@refinedev/core' +import { MuiInferencer } from '@refinedev/inferencer/mui' export const ProfilesShow: React.FC<IResourceComponentsProps> = () => { - return <MuiInferencer />; -}; + return <MuiInferencer /> +} diff --git a/src/components/repositories/list.tsx b/src/components/repositories/list.tsx index dece502e381170cd7634b68c506d6d8870cdb437..a9809c0b08bf469166b968950137c66feaa589ee 100644 --- a/src/components/repositories/list.tsx +++ b/src/components/repositories/list.tsx @@ -1,5 +1,5 @@ import { IResourceComponentsProps } from '@refinedev/core' -import Link from '@mui/material/Link'; +import Link from '@mui/material/Link' import { List, useDataGrid } from '@refinedev/mui' diff --git a/src/components/profiles/IProfile.tsx b/src/interfaces/IProfile.tsx similarity index 58% rename from src/components/profiles/IProfile.tsx rename to src/interfaces/IProfile.tsx index 8a72bc76471c943de4441fd4cc94b8920497843d..9a8f63132cedd592c0595129eb8a2b7ab4ad3c33 100644 --- a/src/components/profiles/IProfile.tsx +++ b/src/interfaces/IProfile.tsx @@ -1,4 +1,4 @@ -interface IProfile = { +export interface IProfile { id: string } diff --git a/src/interfaces/IRepository.tsx b/src/interfaces/IRepository.tsx index 8de99e8eca2b8cc88a055dbbab3b8494660cce2c..dde8ae79a562c91e503be3a84958fd5966f8cf8b 100644 --- a/src/interfaces/IRepository.tsx +++ b/src/interfaces/IRepository.tsx @@ -1,4 +1,4 @@ -interface IRepository = { +export interface IRepository { id: string } diff --git a/src/interfaces/index.d.ts b/src/interfaces/index.d.ts index 13cd313b27646bb37f62e1917df9df654e988daf..9aa7cc085c59459262fed9b5802e3a7768bbf4ed 100644 --- a/src/interfaces/index.d.ts +++ b/src/interfaces/index.d.ts @@ -1,2 +1,2 @@ export * from './IRepository' -export * form './IProfile +export * from './IProfile' diff --git a/src/providers/dataProvider.tsx b/src/providers/dataProvider.tsx index 4c1eba3d105a38561d9d4d8714b152660412259f..0814e10c38ae914dc202b29970161f2f20c4ef55 100644 --- a/src/providers/dataProvider.tsx +++ b/src/providers/dataProvider.tsx @@ -36,7 +36,7 @@ const apiDataProvider = (apiUrl: string): DataProvider => { const callOperation = async (resource: string, operation: string, kwargs: any) => { const resourceObj: any = apiResources[resource] || apiResources.default const func: any = apiOperations[resource][operation] - var headers = kwargs?.meta?.headers + const headers = kwargs?.meta?.headers if (func && (operation === 'get' || operation === 'list')) { if (kwargs?.id) { return (await func.apply(resourceObj, [kwargs.id])).data @@ -44,7 +44,7 @@ const apiDataProvider = (apiUrl: string): DataProvider => { return (await func.apply(resourceObj)).data } } else if (func && operation === 'create') { - return await func.apply(resourceObj, kwargs.variables.concat({headers: headers})); + return await func.apply(resourceObj, kwargs.variables.concat({ headers })) } throw new Error('Not implemented') }