feat(apply button): add logic to handle loading item list

osu-cass · Oct 11, 2018 · 0e7ff35 · 0e7ff35
1 parent 510137b
commit 0e7ff35
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 30 deletions.
diff --git a/src/ItemBank/ItemBankContainer.tsx b/src/ItemBank/ItemBankContainer.tsx
@@ -197,17 +197,14 @@ export class ItemBankContainer extends React.Component<
   };
 
   handleUpdateItems = (items: ItemRevisionModel[]) => {
-    const currentItem = items.length > 0 ? items[0] : undefined;
-    const lastItem = items[items.length - 1];
-    items.forEach(item => {
-      if (!validItemRevisionModel(item) && item !== lastItem) {
-        item.valid = false;
-      } else {
-        item.valid = true;
-      }
-    });
-    if (validItemRevisionModel(lastItem) || items.length === 0) {
-      items.push({});
+    let currentItem: ItemRevisionModel | undefined;
+    if (items.length > 1) {
+      const itemMatch = items.filter(
+        item => itemsAreEqual(this.state.currentItem, item) || false
+      );
+      currentItem = itemMatch[0] ? itemMatch[0] : items[0];
+    } else {
+      currentItem = undefined;
     }
     this.setState({ items, currentItem }, () => {
       this.handleChangeViewItem();
@@ -417,15 +414,6 @@ export class ItemBankContainer extends React.Component<
     });
   };
 
-  submitItems = (items: ItemRevisionModel[]) => {
-    // will need to do more stuff here.
-    if (items.length >= 2) {
-      this.setState({ items });
-    } else {
-      this.clearItems();
-    }
-  };
-
   onRevisionSelect = (revision: string) => {
     const { currentItem, revisions } = this.state;
     let revisionContent = getResourceContent(revisions);
@@ -451,14 +439,13 @@ export class ItemBankContainer extends React.Component<
       content = (
         <ItemBankEntry
           updateCsvText={this.handleUpdateCsvText}
-          updateItems={this.handleUpdateItems}
           namespaces={namespacesContent}
           sections={sectionsContent}
           csvText={csvText}
           items={items}
           deleteItem={this.deleteItem}
           clearItems={this.clearItems}
-          submitItems={this.submitItems}
+          submitItems={this.handleUpdateItems}
         />
       );
     }

diff --git a/src/ItemBank/ItemBankEntry.tsx b/src/ItemBank/ItemBankEntry.tsx
@@ -10,7 +10,6 @@ import {
 
 export interface ItemBankEntryProps {
   updateCsvText: (csvText: string) => void;
-  updateItems: (items: ItemRevisionModel[]) => void;
   deleteItem: (item: number) => void;
   clearItems: () => void;
   submitItems: (items: ItemRevisionModel[]) => void;
@@ -54,7 +53,7 @@ export class ItemBankEntry extends React.Component<
   };
 
   renderCsvEntry() {
-    const { csvText, namespaces } = this.props;
+    const { csvText, namespaces, submitItems } = this.props;
 
     return (
       <Accordion
@@ -68,8 +67,8 @@ export class ItemBankEntry extends React.Component<
               csvText={csvText}
               namespaces={namespaces}
               onCsvTextUpdate={this.props.updateCsvText}
-              onItemsUpdate={this.props.updateItems}
               onApply={this.onCsvApply}
+              onItemsUpdate={submitItems}
             />
           </div>
         </div>
@@ -80,7 +79,6 @@ export class ItemBankEntry extends React.Component<
   renderTableEntry() {
     const {
       items,
-      updateItems,
       clearItems,
       namespaces,
       sections,
@@ -96,7 +94,6 @@ export class ItemBankEntry extends React.Component<
       >
         <ItemEntryTable
           itemRows={items}
-          onItemsUpdate={updateItems}
           namespaces={namespaces}
           sections={sections}
           onDeleteItem={deleteItem}

diff --git a/src/ItemEntryTable/ItemEntryTable.tsx b/src/ItemEntryTable/ItemEntryTable.tsx
@@ -19,7 +19,6 @@ export interface ItemEntryTableProps {
   itemRows: ItemRevisionModel[];
   namespaces: NamespaceModel[];
   sections: SectionModel[];
-  onItemsUpdate: (items: ItemRevisionModel[]) => void;
   onDeleteItem: (items: number) => void;
   onClearItems: () => void;
   onSubmit: (items: ItemRevisionModel[]) => void;
@@ -71,8 +70,13 @@ export class ItemEntryTable extends React.Component<
   handleClearItems() {
     this.props.onClearItems();
     this.setState((state: ItemEntryTableState, props: ItemEntryTableProps) => {
-      console.log(props);
+      return { itemRows: props.itemRows };
+    });
+  }
 
+  handleSubmit() {
+    this.props.onSubmit(this.state.itemRows);
+    this.setState((state: ItemEntryTableState, props: ItemEntryTableProps) => {
       return { itemRows: props.itemRows };
     });
   }
@@ -120,7 +124,7 @@ export class ItemEntryTable extends React.Component<
         <td>
           <input
             className="btn btn-primary submit-button bg-primary"
-            onClick={apply => this.props.onSubmit(this.state.itemRows)}
+            onClick={click => this.handleSubmit()}
             type="button"
             value="apply"
           />