Skip to content

Commit

Permalink
Merge pull request #69 from EscolaLMS/feature/refactof-fields-fix
Browse files Browse the repository at this point in the history
refacotr fields fix
  • Loading branch information
mtmotyka authored Mar 15, 2022
2 parents bc2e2bf + 4f3b364 commit 0e37504
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
8 changes: 3 additions & 5 deletions src/react/context/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,9 @@ export const EscolaLMSContextProvider: FunctionComponent<EscolaLMSContextProvide
getDefaultData('notifications'),
);

const [fields, setFields] = useLocalStorage<ContextListState<EscolaLms.ModelFields.Models.Field>>(
'lms',
'fields',
getDefaultData('fields'),
);
const [fields, setFields] = useLocalStorage<
ContextListState<EscolaLms.ModelFields.Models.Metadata>
>('lms', 'fields', getDefaultData('fields'));

const abortControllers = useRef<{
cart: AbortController | null;
Expand Down
2 changes: 1 addition & 1 deletion src/react/context/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export interface EscolaLMSContextReadConfig {
tokenExpireDate?: string | null;
consultations: ContextPaginatedMetaState<API.Consultation>;
consultation: ContextStateValue<API.Consultation>;
fields: ContextListState<EscolaLms.ModelFields.Models.Field>;
fields: ContextListState<EscolaLms.ModelFields.Models.Metadata>;
}

export interface EscolaLMSContextAPIConfig {
Expand Down
13 changes: 8 additions & 5 deletions src/services/fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ export async function fields(
},
options?: RequestOptionsInit,
) {
return request<API.DefaultResponse<EscolaLms.ModelFields.Models.Field[]>>(`/api/model-fields`, {
method: 'GET',
params,
...(options || {}),
});
return request<API.DefaultResponse<EscolaLms.ModelFields.Models.Metadata[]>>(
`/api/model-fields`,
{
method: 'GET',
params,
...(options || {}),
},
);
}

0 comments on commit 0e37504

Please sign in to comment.