Merge pull request #273 from osu-cass/dev

Dev

src/Accessibility/AccessibilityModels.ts

@@ -127,13 +127,30 @@ export function mergeAccessibilityGroups(
       ar.disabled =
         newGroups[groupIndex].accessibilityResources[resourceIndex].disabled;
 
-      return ar;
+      return mergeSelections(
+        newGroups[groupIndex].accessibilityResources[resourceIndex],
+        ar
+      );
     });
   });
 
   return mergedGroups;
 }
 
+function mergeSelections(
+  newModel: AccessibilityResourceModel,
+  current: AccessibilityResourceModel
+): AccessibilityResourceModel {
+  const newSelection: AccessibilityResourceModel = current;
+  newSelection.selections.map((s, index) => {
+    s.disabled = newModel.selections[index].disabled;
+
+    return s;
+  });
+
+  return current;
+}
+
 export function resetAccessibilityGroups(
   accGroups: AccResourceGroupModel[]
 ): AccResourceGroupModel[] {

src/ItemPage/ItemPageModels.ts

@@ -45,14 +45,28 @@ export function toiSAAP(
   for (const group of accResourceGroups) {
     for (const res of group.accessibilityResources) {
       if (res.currentSelectionCode && !res.disabled) {
-        isaapCodes += `${res.currentSelectionCode};`;
+        isaapCodes += `${findSelection(res)};`;
       }
     }
   }
 
   return encodeURIComponent(isaapCodes);
 }
 
+function findSelection(resource: AccessibilityResourceModel) {
+  let selectionCode: String;
+  const currentSelection = resource.selections.filter(
+    s => s.selectionCode === resource.currentSelectionCode
+  );
+  if (currentSelection[0] && currentSelection[0].disabled) {
+    selectionCode = resource.defaultSelection;
+  } else {
+    selectionCode = resource.currentSelectionCode;
+  }
+
+  return selectionCode;
+}
+
 export function resetResource(
   model: AccessibilityResourceModel
 ): AccessibilityResourceModel {