feat(accessibility): add logic to item bank container to persist options

osu-cass · Nov 21, 2018 · e5512c2 · e5512c2
1 parent b2ae877
commit e5512c2
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/src/ItemBank/ItemBankContainer.tsx b/src/ItemBank/ItemBankContainer.tsx
@@ -20,7 +20,9 @@ import {
   ItemExistsRequestModel,
   ItemExistsResponseModel,
   toExistenceRequestModel,
-  existenceResponseModelToRevisionModel
+  existenceResponseModelToRevisionModel,
+  mergeAccessibilityGroups,
+  resetAccessibilityGroups
 } from "@src/index";
 import { itemsAreEqual } from "@src/ItemBank/ItemBankModels";
 
@@ -264,16 +266,28 @@ export class ItemBankContainer extends React.Component<
    * @memberof ItemBankContainer
    */
   handleChangeViewItem = () => {
-    const { currentItem, items } = this.state;
+    const { currentItem, items, accResourceGroups } = this.state;
+    const currentAccGroups = getResourceContent(accResourceGroups);
     let index = 0;
     if (currentItem && currentItem.valid) {
       this.fetchAboutItemRevisionModel(currentItem)
         .then(aboutItem => {
           return this.fetchAccResourceGroups(aboutItem);
         })
         .then(accGroups => {
-          this.handleUpdateIsaap(accGroups);
-          this.updateNavigationItems();
+          let newGroups: AccResourceGroupModel[];
+          if (currentAccGroups) {
+            newGroups = mergeAccessibilityGroups(accGroups, currentAccGroups);
+          } else {
+            newGroups = accGroups;
+          }
+          this.setState(
+            { accResourceGroups: { kind: "success", content: newGroups } },
+            () => {
+              this.handleUpdateIsaap(newGroups);
+              this.updateNavigationItems();
+            }
+          );
         })
         .catch(e => {
           this.onError(e, () => {
@@ -346,8 +360,13 @@ export class ItemBankContainer extends React.Component<
     const aboutItem = getResourceContent(aboutItemRevisionModel);
     const accResources = getResourceContent(accResourceGroups);
     if (aboutItem && accResources) {
-      this.setState({ currentItem: { ...currentItem, isaap: undefined } }, () =>
-        this.handleUpdateIsaap(accResources)
+      const resetResources = resetAccessibilityGroups(accResources);
+      this.setState(
+        {
+          currentItem: { ...currentItem, isaap: undefined },
+          accResourceGroups: { kind: "success", content: resetResources }
+        },
+        () => this.handleUpdateIsaap(resetResources)
       );
     }
   };