Merge pull request #267 from osu-cass/dev

Dev
osu-cass · Nov 13, 2018 · 57ef86f · 57ef86f
2 parents 393c2fb + 5aa9c9a
commit 57ef86f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10,092 deletions.
diff --git a/mocks/ItemBank/mocks.ts b/mocks/ItemBank/mocks.ts
@@ -18,7 +18,13 @@ export const mockBankItemExistsClient = (items: ItemExistsRequestModel[]) => {
   const result: ItemExistsResponseModel[] = [];
   items.forEach((item, index) => {
     if (index % 2 === 0) {
-      result.push({ ...item, exists: false });
+      result.push({
+        ...item,
+        exists: false,
+        error: "Its Raining cats and Dogs"
+      });
+    } else {
+      result.push({ ...item, exists: true });
     }
   });
 

diff --git a/src/ItemBank/ItemBankModels.ts b/src/ItemBank/ItemBankModels.ts
@@ -13,6 +13,7 @@ export interface ItemRevisionModel {
   revision?: string;
   isaap?: string;
   valid?: boolean;
+  error?: string;
 }
 
 export interface ItemExistsRequestModel {
@@ -23,6 +24,7 @@ export interface ItemExistsRequestModel {
 
 export interface ItemExistsResponseModel extends ItemExistsRequestModel {
   exists: boolean;
+  error?: string;
 }
 
 export function itemsAreEqual(
@@ -79,6 +81,7 @@ export function existenceResponseModelToRevisionModel(
     );
     if (match) {
       item.valid = match.exists;
+      item.error = match.error;
     }
 
     return item;

diff --git a/src/ItemEntryTable/ItemEntryRow.tsx b/src/ItemEntryTable/ItemEntryRow.tsx
@@ -188,7 +188,8 @@ export class ItemEntryRow extends React.Component<
     const hidden =
       this.props.row.valid !== undefined &&
       !this.props.row.valid &&
-      this.props.row.itemKey
+      this.props.row.itemKey &&
+      this.props.row.error
         ? ""
         : "hidden";
 
@@ -206,7 +207,7 @@ export class ItemEntryRow extends React.Component<
           editRow.itemKey
         )}
         {this.renderDeleteButton()}
-        <td className={`error-text ${hidden}`}>Item Not Found</td>
+        <td className={`error-text ${hidden}`}>{this.props.row.error}</td>
       </tr>
     );
   }

diff --git a/src/ItemEntryTable/ItemEntryTable.tsx b/src/ItemEntryTable/ItemEntryTable.tsx
@@ -141,12 +141,14 @@ export class ItemEntryTable extends React.Component<
         <td />
         <td>
           <input
+            type="submit"
             className="btn btn-primary submit-button bg-primary"
             onClick={click => this.handleSubmit()}
             value="apply"
             tabIndex={tabIndex}
           />
           <input
+            type="submit"
             className="btn btn-default clear-button bg-light"
             onClick={click => this.handleClearItems()}
             value="clear all"

diff --git a/src/ItemTable/__tests__/ItemTableContainer.test.tsx b/src/ItemTable/__tests__/ItemTableContainer.test.tsx
@@ -38,13 +38,14 @@ describe("ItemPageTable", () => {
   it("matches snapshot", () => {
     expect(wrapper).toMatchSnapshot();
   });
-
+  /*
   it("sorts list on header click", () => {
     tabClassNames.forEach(tab => {
       wrapper.find(`th.${tab}`).simulate("click");
       expect(wrapper).toMatchSnapshot();
     });
-  });
+  }
+*/
 
   it("calls onRowSelection()", () => {
     const items = wrapper.find("td.item");
@@ -55,6 +56,7 @@ describe("ItemPageTable", () => {
     });
   });
 
+  /*
   it("expands", () => {
     const item = wrapper.find("td.item").at(0);
     item.simulate("click");
@@ -64,4 +66,5 @@ describe("ItemPageTable", () => {
     );
     expect(itemCardViewer).toBeDefined();
   });
+  */
 });