Skip to content

Feat/react context for di #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Data/DataSources/Todo/TodoLocalStorageDataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { TodoDataSource } from "../../../Data/DataSources/Todo/TodoDataSource";
import { Todo } from "../../../Domain/Models/Todo";

export class TodoLocalStorageDataSource implements TodoDataSource {
STORAGE_KEY = "Todos";
private STORAGE_KEY = "Todos";

async getTodos() {
return new Promise<Todo[]>((resolve) => {
Expand All @@ -26,12 +26,12 @@ export class TodoLocalStorageDataSource implements TodoDataSource {
});
}

getItems() {
private getItems() {
const raw = localStorage.getItem(this.STORAGE_KEY);
return raw === null ? [] : JSON.parse(raw);
}

setItems(items: Todo[]) {
private setItems(items: Todo[]) {
localStorage.setItem(this.STORAGE_KEY, JSON.stringify(items));
}
}
7 changes: 4 additions & 3 deletions src/Domain/UseCases/useClearTodos.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { TodoRepositoryImpl } from "../../Data/Repositories/TodoRepositoryImpl";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useAppServicesContainer } from "../../Services/AppServicesContainer";
import { useNotification } from "../../Services/useNotification";

export const useClearTodos = (repository: TodoRepositoryImpl) => {
export const useClearTodos = () => {
const { todoRepository } = useAppServicesContainer()
const notify = useNotification();
const queryClient = useQueryClient();
const clearTodos = useMutation({
mutationFn: () => repository.clearTodos(),
mutationFn: () => todoRepository.clearTodos(),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ["todos"] });
notify.success("Cleared Correctly!");
Expand Down
11 changes: 6 additions & 5 deletions src/Domain/UseCases/useCreateTodo.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import { Todo } from "../../Domain/Models/Todo";
import { TodoRepositoryImpl } from "../../Data/Repositories/TodoRepositoryImpl";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useNotification } from "../../Services/useNotification";
import { Todo } from "../../Domain/Models/Todo";
import { useAppServicesContainer } from "../../Services/AppServicesContainer";
import { useLogger } from "../../Services/useLogger";
import { useNotification } from "../../Services/useNotification";

export const useCreateTodo = (repository: TodoRepositoryImpl) => {
export const useCreateTodo = () => {
const { todoRepository } = useAppServicesContainer()
const logger = useLogger();
const notify = useNotification();
const queryClient = useQueryClient();

const createTodo = useMutation({
mutationFn: (todo: Omit<Todo, "id">) => repository.createTodo(todo),
mutationFn: (todo: Omit<Todo, "id">) => todoRepository.createTodo(todo),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ["todos"] });
notify.success("Created Correctly!");
Expand Down
9 changes: 5 additions & 4 deletions src/Domain/UseCases/useFetchTodos.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Todo } from "../../Domain/Models/Todo";
import { useQuery } from "@tanstack/react-query";
import { TodoRepositoryImpl } from "../../Data/Repositories/TodoRepositoryImpl";
import { Todo } from "../../Domain/Models/Todo";
import { useAppServicesContainer } from "../../Services/AppServicesContainer";

export const useFetchTodos = (repository: TodoRepositoryImpl) => {
export const useFetchTodos = () => {
const { todoRepository } = useAppServicesContainer()
const { data, isLoading } = useQuery<Todo[]>({
queryKey: ["todos"],
queryFn: () => repository.getTodos(),
queryFn: () => todoRepository.getTodos(),
});

return {
Expand Down
9 changes: 5 additions & 4 deletions src/Domain/UseCases/useFetchUsers.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { User } from "../../Domain/Models/User";
import { useQuery } from "@tanstack/react-query";
import { UserRepositoryImpl } from "../../Data/Repositories/UserRepositoryImpl";
import { User } from "../../Domain/Models/User";
import { useAppServicesContainer } from "../../Services/AppServicesContainer";

export const useFetchUsers = (repository: UserRepositoryImpl) => {
export const useFetchUsers = () => {
const { userRepository } = useAppServicesContainer()
const { data, isLoading, isError, isSuccess } = useQuery<User[]>({
queryKey: ["users"],
queryFn: () => repository.getUsers(),
queryFn: () => userRepository.getUsers(),
});

return {
Expand Down
12 changes: 3 additions & 9 deletions src/Presentation/Todo/CreateTodoForm.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
import * as React from "react";
import { useClearTodos } from "../../Domain/UseCases/useClearTodos";
import { useCreateTodo } from "../../Domain/UseCases/useCreateTodo";
import { TodoRepositoryImpl } from "../../Data/Repositories/TodoRepositoryImpl";
import { TodoLocalStorageDataSource } from "../../Data/DataSources/Todo/TodoLocalStorageDataSource";
import { useNotification } from "../../Services/useNotification";
import { useClearTodos } from "../../Domain/UseCases/useClearTodos";

export function CreateTodoForm() {
const notify = useNotification();
const inputRef = React.useRef<HTMLInputElement>(null);
const formRef = React.useRef<HTMLFormElement>(null);

const createTodo = useCreateTodo(
new TodoRepositoryImpl(new TodoLocalStorageDataSource())
);
const createTodo = useCreateTodo();

const clearTodos = useClearTodos(
new TodoRepositoryImpl(new TodoLocalStorageDataSource())
);
const clearTodos = useClearTodos();

const handleCreate = async () => {
const title = inputRef.current?.value;
Expand Down
6 changes: 1 addition & 5 deletions src/Presentation/Todo/TodoList.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { useFetchTodos } from "../../Domain/UseCases/useFetchTodos";
import { TodoRepositoryImpl } from "../../Data/Repositories/TodoRepositoryImpl";
import { TodoLocalStorageDataSource } from "../../Data/DataSources/Todo/TodoLocalStorageDataSource";

export function TodoList() {
const { todos, isFetchTodosLoading } = useFetchTodos(
new TodoRepositoryImpl(new TodoLocalStorageDataSource())
);
const { todos, isFetchTodosLoading } = useFetchTodos();

return (
<fieldset>
Expand Down
6 changes: 1 addition & 5 deletions src/Presentation/User/UserList.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import { UserRepositoryImpl } from "../../Data/Repositories/UserRepositoryImpl";
import { UserDataSourceImpl } from "../../Data/DataSources/User/UserAPIDataSource";
import { useFetchUsers } from "../../Domain/UseCases/useFetchUsers";

export function UserList() {
const { users, isFetchUsersLoading, isFetchUsersSuccess } = useFetchUsers(
new UserRepositoryImpl(new UserDataSourceImpl())
);
const { users, isFetchUsersLoading, isFetchUsersSuccess } = useFetchUsers();

return (
<fieldset>
Expand Down
28 changes: 28 additions & 0 deletions src/Services/AppServicesContainer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { createContext, useContext } from 'react';
import { TodoLocalStorageDataSource } from '../Data/DataSources/Todo/TodoLocalStorageDataSource';
import { UserDataSourceImpl } from '../Data/DataSources/User/UserAPIDataSource';

const SERVICES = {
todoRepository: new TodoLocalStorageDataSource(), // Need to inject another dep ? easy, new TodoDataSourceImpl(), no need to change in anywhere else, you just need to make sure your new dep are following the same Interface, in this case: TodoDataSource.
userRepository: new UserDataSourceImpl()
};

const AppServicesContainer = createContext<typeof SERVICES | undefined>(undefined);

const AppServicesContainerProvider = ({ children }: { children: JSX.Element }) => (
<AppServicesContainer.Provider value={SERVICES}>{children}</AppServicesContainer.Provider>
);

const useAppServicesContainer = () => {
const ctx = useContext(AppServicesContainer);

if (!ctx)
throw new Error(
"It's seems you've tryied to use useAppServicesContainer hook outside <AppServicesContainerProvider />"
);

return ctx;
};

export { useAppServicesContainer, AppServicesContainerProvider };

11 changes: 7 additions & 4 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import React from "react";
import ReactDOM from "react-dom/client";
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { TodosPage } from "./Presentation/UI/Pages/TodosPage";
import { UsersPage } from "./Presentation/UI/Pages/UsersPage";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { AppServicesContainerProvider } from "./Services/AppServicesContainer";

const queryClient = new QueryClient();

Expand All @@ -20,8 +21,10 @@ const router = createBrowserRouter([

ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
<React.StrictMode>
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} />
</QueryClientProvider>
<AppServicesContainerProvider>
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} />
</QueryClientProvider>
</AppServicesContainerProvider>
</React.StrictMode>
);