Revize a7264b57

re #10454: ItemView: minor api call update

src/pages/ItemViewPage.tsx

@@ -3 +3 @@
 import { useDispatch, useSelector } from "react-redux"
 import { AppDispatch } from "../stores/store"
 import { getPreviousConcordance, getNextConcordance, getItem } from "../stores/actions/itemThunks"
-import { Item, ItemState } from "../types/item"
+import { Item, ItemViewState } from "../types/item"
 import { login } from "../stores/actions/userThunks"
 
 interface ItemViewProps {
@@ -14 +14 @@
 
   const dispatch = useDispatch<AppDispatch>();
 
-  const itemViewState = useSelector((itemState: ItemState) => itemState)
+  const itemViewState = useSelector((itemState: ItemViewState) => itemState)
 
   const handleGetPreviousConcordance = async () => {
     dispatch(getPreviousConcordance());
@@ -29 +29 @@
     dispatch(getItem(props.itemId));
   }, []);
 
-  console.log(itemViewState.item);
+  console.log(itemViewState.item)
 
   return (
     <VStack>

src/stores/actions/itemThunks.ts

@@ -1 +1 @@
 import { createAsyncThunk } from "@reduxjs/toolkit"
 import { getItemRequest } from "../../api/itemservice"
 import { getItemNotesRequest } from "../../api/notesservice"
-import { ItemState } from "../../types/item";
+import { ItemViewState } from "../../types/item";
 
 
 export const getItem = createAsyncThunk(
@@ -17 +17 @@
             // data with image
             if (response.status === 200 && response.data.object.length > 1) {
                 return {
+                    id: itemId,
                     fullView: true,
 
                     concordances: response.data.concordances,
@@ -47 +48 @@
             // data without image
             else if (response.status === 200 && response.data.object.length == 1) {
                 return {
+                    id: itemId,
                     fullView: false,
-
                     concordances: response.data.concordances,
 
-                    authorName: response.data.object[0].name[0].getty_data.display_name,
+                    authorDisplayName: response.data.object[0].name[0].getty_data.display_name,
                     workName: response.data.object[0].caption,
+                    inventoryItem: response.data.text,
+                    searchSubjects: response.data.search_subject,
                 }
             } {
                 return Promise.reject(response.data ? response.data : "Error")
@@ -66 +69 @@
 export const getNextConcordance = createAsyncThunk(
     "item/getNextConcordance",
     async (_, { getState, dispatch }) => {
-        const state = getState() as ItemState;
+        const state = getState() as ItemViewState;
 
         const nextIndex = (state.selectedConcordance + 1) % state.concordances.length;
 
@@ -81 +84 @@
 export const getPreviousConcordance = createAsyncThunk(
     "item/getPreviousConcordance",
     async (_, { getState, dispatch }) => {
-        const state = getState() as ItemState;
+        const state = getState() as ItemViewState;
         const previousIndex = (state.selectedConcordance - 1 + state.concordances.length) % state.concordances.length;
         await dispatch(getItem(state.concordances[previousIndex].id));
         return previousIndex;

src/stores/reducers/itemSlice.ts

@@ -1 +1 @@
 import { PayloadAction, createSlice } from "@reduxjs/toolkit"
 import { getItem, getItemNotes, getNextConcordance, getPreviousConcordance } from "../actions/itemThunks"
-import { Certainty, ItemState, Item } from "../../types/item";
+import { Certainty, ItemViewState, Item } from "../../types/item";
 
 
 export const CertaintyWithColors: Record<Certainty, { certainty: Certainty; color: string }> = {
@@ -10 +10 @@
     low: { certainty: Certainty.Low, color: "#00FF00" },
 };
 
-const initialState: ItemState = {
+const initialState: ItemViewState = {
     item: {} as Item,
     selectedConcordance: 0,
     concordances: [],
@@ -32 +32 @@
                 state.concordances = action.payload.concordances;
             }
 
+            state.item = {
+                id: action.payload.id,
+                authorDisplayName: action.payload.authorDisplayName,
+                workName: action.payload.workName,
+                concordances: action.payload.concordances,
+                searchSubjects: action.payload.searchSubjects,
+                inventoryItem: action.payload.inventoryItem,
+                fullView: action.payload.fullView,
+            } as Item
+
             if(action.payload.fullView){
                 state.item = {
-                    fullView: true,
-                    
-                    authorDisplayName: action.payload.authorDisplayName,
-                    workName: action.payload.workName,
-                    concordances: action.payload.concordances,
-                    searchSubjects: action.payload.searchSubjects,
-                    inventoryItem: action.payload.inventoryItem,
-
+                    ...state.item,
                     // additional
                     institution: action.payload.institution,
                     authorName: action.payload.authorName,
@@ -52 +55 @@
                     description: action.payload.description
                 }
             }
-            else{
-                state.item = {
-                    fullView: false,
-                    authorDisplayName: action.payload.authorDisplayName,
-                    workName: action.payload.workName,
-                    concordances: action.payload.concordances,
-                    searchSubjects: action.payload.searchSubjects,
-                    inventoryItem: action.payload.inventoryItem
-                }
-            }
         })
         builder.addCase(getItem.rejected, (state, action) => {
             state.lastError = action.error.message

src/types/item.ts

@@ -1 +1 @@
 import { Note } from "./note"
 
 export type  Item = {
+    id: string
+    
     concordances: Concordance[]
 
     authorDisplayName: string
     workName: string
-
     inventoryItem: string
     searchSubjects: string[]
 
@@ -13 +14 @@
 
     authorName?: string
     imageUrl?: string
-
     title?: string
     institution?: { 
         name :string,
@@ -26 +26 @@
     description?: string
 }
 
-export type ItemState = {
+export type ItemViewState = {
     item: Item
     concordances: Concordance[]
     selectedConcordance: number