chore: rename types to remove word "Type"

src/features/TodolistsList/Todolist/Task/Task.tsx

@@ -2,10 +2,10 @@ import React, { ChangeEvent, useCallback } from 'react'
 import { Checkbox, IconButton } from '@mui/material'
 import { EditableSpan } from 'components/EditableSpan/EditableSpan'
 import { Delete } from '@mui/icons-material'
-import { TaskStatuses, TaskType } from 'api/todolists-api'
+import { TaskStatuses, TaskEntity } from 'api/todolists-api'
 
-type TaskPropsType = {
-  task: TaskType
+type TaskProps = {
+  task: TaskEntity
   todolistId: string
   changeTaskStatus: (
     id: string,
@@ -19,7 +19,7 @@ type TaskPropsType = {
   ) => void
   removeTask: (taskId: string, todolistId: string) => void
 }
-export const Task = React.memo((props: TaskPropsType) => {
+export const Task = React.memo((props: TaskProps) => {
   const onClickHandler = useCallback(
     () => props.removeTask(props.task.id, props.todolistId),
     [props.task.id, props.todolistId]

src/features/TodolistsList/Todolist/Todolist.tsx

@@ -2,17 +2,17 @@ import React, { useCallback, useEffect } from 'react'
 import { AddItemForm } from 'components/AddItemForm/AddItemForm'
 import { EditableSpan } from 'components/EditableSpan/EditableSpan'
 import { Task } from './Task/Task'
-import { TaskStatuses, TaskType } from 'api/todolists-api'
-import { FilterValuesType, TodolistDomainType } from '../todolists-reducer'
+import { TaskStatuses, TaskEntity } from 'api/todolists-api'
+import { FilterValues, TodolistDomain } from '../todolists-reducer'
 import { fetchTasksTC } from '../tasks-reducer'
 import { useAppDispatch } from 'hooks/useAppDispatch'
 import { Button, IconButton } from '@mui/material'
 import { Delete } from '@mui/icons-material'
 
-type PropsType = {
-  todolist: TodolistDomainType
-  tasks: Array<TaskType>
-  changeFilter: (value: FilterValuesType, todolistId: string) => void
+type Props = {
+  todolist: TodolistDomain
+  tasks: Array<TaskEntity>
+  changeFilter: (value: FilterValues, todolistId: string) => void
   addTask: (title: string, todolistId: string) => void
   changeTaskStatus: (
     id: string,
@@ -33,7 +33,7 @@ type PropsType = {
 export const Todolist = React.memo(function ({
   demo = false,
   ...props
-}: PropsType) {
+}: Props) {
   const dispatch = useAppDispatch()
 
   useEffect(() => {

src/features/TodolistsList/TodolistsList.tsx

@@ -1,19 +1,19 @@
 import React, { useCallback, useEffect } from 'react'
 import { useSelector } from 'react-redux'
-import { AppRootStateType } from 'app/store'
+import { AppRootState } from 'app/store'
 import {
   addTodolistTC,
   changeTodolistFilter,
   changeTodolistTitleTC,
   fetchTodolistsTC,
-  FilterValuesType,
+  FilterValues,
   removeTodolistTC,
-  TodolistDomainType,
+  TodolistDomain,
 } from './todolists-reducer'
 import {
   addTaskTC,
   removeTaskTC,
-  TasksStateType,
+  TasksState,
   updateTaskTC,
 } from './tasks-reducer'
 import { TaskStatuses } from 'api/todolists-api'
@@ -23,18 +23,16 @@ import { Todolist } from './Todolist/Todolist'
 import { Navigate } from 'react-router-dom'
 import { useAppDispatch } from 'hooks/useAppDispatch'
 
-type PropsType = {
+type Props = {
   demo?: boolean
 }
 
-export const TodolistsList: React.FC<PropsType> = ({ demo = false }) => {
-  const todolists = useSelector<AppRootStateType, Array<TodolistDomainType>>(
+export const TodolistsList: React.FC<Props> = ({ demo = false }) => {
+  const todolists = useSelector<AppRootState, Array<TodolistDomain>>(
     (state) => state.todolists
   )
-  const tasks = useSelector<AppRootStateType, TasksStateType>(
-    (state) => state.tasks
-  )
-  const isLoggedIn = useSelector<AppRootStateType, boolean>(
+  const tasks = useSelector<AppRootState, TasksState>((state) => state.tasks)
+  const isLoggedIn = useSelector<AppRootState, boolean>(
     (state) => state.auth.isLoggedIn
   )
 
@@ -77,7 +75,7 @@ export const TodolistsList: React.FC<PropsType> = ({ demo = false }) => {
   }, [])
 
   const changeFilter = useCallback(function (
-    value: FilterValuesType,
+    value: FilterValues,
     todolistId: string
   ) {
     const action = changeTodolistFilter({ id: todolistId, filter: value })

src/features/TodolistsList/tasks-reducer.test.ts

@@ -3,14 +3,14 @@ import {
   removeTask,
   setTasks,
   tasksReducer,
-  TasksStateType,
+  TasksState,
   updateTask,
 } from './tasks-reducer'
 
 import { addTodolist, removeTodolist, setTodolists } from './todolists-reducer'
 import { TaskPriorities, TaskStatuses } from 'api/todolists-api'
 
-let startState: TasksStateType = {}
+let startState: TasksState = {}
 beforeEach(() => {
   startState = {
     todolistId1: [

src/features/TodolistsList/tasks-reducer.ts

@@ -1,9 +1,9 @@
 import {
   TaskPriorities,
   TaskStatuses,
-  TaskType,
+  TaskEntity,
   todolistsAPI,
-  UpdateTaskModelType,
+  UpdateTaskModel,
 } from 'api/todolists-api'
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import {
@@ -11,14 +11,14 @@ import {
   removeTodolist,
   setTodolists,
 } from 'features/TodolistsList/todolists-reducer'
-import { AppRootStateType, AppThunk } from 'app/store'
+import { AppRootState, AppThunk } from 'app/store'
 import { setAppStatus } from 'app/app-reducer'
 import {
   handleServerAppError,
   handleServerNetworkError,
 } from 'utils/error-utils'
 
-export type UpdateDomainTaskModelType = {
+export type UpdateDomainTaskModel = {
   title?: string
   description?: string
   status?: TaskStatuses
@@ -27,11 +27,11 @@ export type UpdateDomainTaskModelType = {
   deadline?: string
 }
 
-export type TasksStateType = {
-  [key: string]: Array<TaskType>
+export type TasksState = {
+  [key: string]: Array<TaskEntity>
 }
 
-const initialState: TasksStateType = {}
+const initialState: TasksState = {}
 
 const tasksSlice = createSlice({
   name: 'tasks',
@@ -51,7 +51,7 @@ const tasksSlice = createSlice({
         ),
       }
     },
-    addTask(state, action: PayloadAction<TaskType>) {
+    addTask(state, action: PayloadAction<TaskEntity>) {
       return {
         ...state,
         [action.payload.todoListId]: [
@@ -64,7 +64,7 @@ const tasksSlice = createSlice({
       state,
       action: PayloadAction<{
         taskId: string
-        model: UpdateDomainTaskModelType
+        model: UpdateDomainTaskModel
         todolistId: string
       }>
     ) {
@@ -81,7 +81,7 @@ const tasksSlice = createSlice({
     setTasks(
       state,
       action: PayloadAction<{
-        tasks: Array<TaskType>
+        tasks: Array<TaskEntity>
         todolistId: string
       }>
     ) {
@@ -156,10 +156,10 @@ export const addTaskTC =
 export const updateTaskTC =
   (
     taskId: string,
-    domainModel: UpdateDomainTaskModelType,
+    domainModel: UpdateDomainTaskModel,
     todolistId: string
   ): AppThunk =>
-  (dispatch, getState: () => AppRootStateType) => {
+  (dispatch, getState: () => AppRootState) => {
     const state = getState()
     const task = state.tasks[todolistId].find((t) => t.id === taskId)
     if (!task) {
@@ -168,7 +168,7 @@ export const updateTaskTC =
       return
     }
 
-    const apiModel: UpdateTaskModelType = {
+    const apiModel: UpdateTaskModel = {
       deadline: task.deadline,
       description: task.description,
       priority: task.priority,

src/features/TodolistsList/todolists-reducer.test.ts

@@ -3,19 +3,19 @@ import {
   changeTodolistEntityStatus,
   changeTodolistFilter,
   changeTodolistTitle,
-  FilterValuesType,
+  FilterValues,
   removeTodolist,
   setTodolists,
-  TodolistDomainType,
+  TodolistDomain,
   todolistsReducer,
 } from './todolists-reducer'
 import { v1 } from 'uuid'
-import { TodolistType } from 'api/todolists-api'
-import { RequestStatusType } from 'app/app-reducer'
+import { Todolist } from 'api/todolists-api'
+import { RequestStatus } from 'app/app-reducer'
 
 let todolistId1: string
 let todolistId2: string
-let startState: Array<TodolistDomainType> = []
+let startState: Array<TodolistDomain> = []
 
 beforeEach(() => {
   todolistId1 = v1()
@@ -48,7 +48,7 @@ test('correct todolist should be removed', () => {
 })
 
 test('correct todolist should be added', () => {
-  let todolist: TodolistType = {
+  let todolist: Todolist = {
     title: 'New Todolist',
     id: 'any id',
     addedDate: '',
@@ -77,7 +77,7 @@ test('correct todolist should change its name', () => {
 })
 
 test('correct filter of todolist should be changed', () => {
-  let newFilter: FilterValuesType = 'completed'
+  let newFilter: FilterValues = 'completed'
 
   const action = changeTodolistFilter({ id: todolistId2, filter: newFilter })
 
@@ -94,7 +94,7 @@ test('todolists should be added', () => {
   expect(endState.length).toBe(2)
 })
 test('correct entity status of todolist should be changed', () => {
-  let newStatus: RequestStatusType = 'loading'
+  let newStatus: RequestStatus = 'loading'
 
   const action = changeTodolistEntityStatus({
     id: todolistId2,

src/features/TodolistsList/todolists-reducer.ts

@@ -1,16 +1,16 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { todolistsAPI, TodolistType } from 'api/todolists-api'
-import { RequestStatusType, setAppStatus } from 'app/app-reducer'
+import { todolistsAPI, Todolist } from 'api/todolists-api'
+import { RequestStatus, setAppStatus } from 'app/app-reducer'
 import { AppThunk } from 'app/store'
 import { handleServerNetworkError } from 'utils/error-utils'
 
-export type FilterValuesType = 'all' | 'active' | 'completed'
-export type TodolistDomainType = TodolistType & {
-  filter: FilterValuesType
-  entityStatus: RequestStatusType
+export type FilterValues = 'all' | 'active' | 'completed'
+export type TodolistDomain = Todolist & {
+  filter: FilterValues
+  entityStatus: RequestStatus
 }
 
-const initialState: Array<TodolistDomainType> = []
+const initialState: Array<TodolistDomain> = []
 
 const todolistsSlice = createSlice({
   name: 'todolists',
@@ -19,7 +19,7 @@ const todolistsSlice = createSlice({
     removeTodolist(state, action: PayloadAction<string>) {
       return state.filter((tl) => tl.id != action.payload)
     },
-    addTodolist(state, action: PayloadAction<TodolistType>) {
+    addTodolist(state, action: PayloadAction<Todolist>) {
       return [
         { ...action.payload, filter: 'all', entityStatus: 'idle' },
         ...state,
@@ -42,7 +42,7 @@ const todolistsSlice = createSlice({
       state,
       action: PayloadAction<{
         id: string
-        filter: FilterValuesType
+        filter: FilterValues
       }>
     ) {
       return state.map((tl) =>
@@ -55,7 +55,7 @@ const todolistsSlice = createSlice({
       state,
       action: PayloadAction<{
         id: string
-        status: RequestStatusType
+        status: RequestStatus
       }>
     ) {
       return state.map((tl) =>
@@ -64,7 +64,7 @@ const todolistsSlice = createSlice({
           : tl
       )
     },
-    setTodolists(state, action: PayloadAction<Array<TodolistType>>) {
+    setTodolists(state, action: PayloadAction<Array<Todolist>>) {
       return action.payload.map((tl) => ({
         ...tl,
         filter: 'all',

src/features/TodolistsList/todolists-tasks-reducer.test.ts

@@ -1,16 +1,16 @@
 import {
   addTodolist,
-  TodolistDomainType,
+  TodolistDomain,
   todolistsReducer,
 } from './todolists-reducer'
-import { tasksReducer, TasksStateType } from './tasks-reducer'
-import { TodolistType } from 'api/todolists-api'
+import { tasksReducer, TasksState } from './tasks-reducer'
+import { Todolist } from 'api/todolists-api'
 
 test('ids should be equals', () => {
-  const startTasksState: TasksStateType = {}
-  const startTodolistsState: Array<TodolistDomainType> = []
+  const startTasksState: TasksState = {}
+  const startTodolistsState: Array<TodolistDomain> = []
 
-  let todolist: TodolistType = {
+  let todolist: Todolist = {
     title: 'new todolist',
     id: 'any id',
     addedDate: '',