#54: Make codebase null safe (part 1). This doesn't cover all the cha…

…nges and strictNullChecks is false here so that we can check in these changes incrementally while Travis will build as before.
jumpinjackie · Sep 27, 2016 · 136397b · 136397b
1 parent 9de3835
commit 136397b
Show file tree

Hide file tree

Showing 24 changed files with 532 additions and 411 deletions.
diff --git a/src/actions/init.ts b/src/actions/init.ts
@@ -14,14 +14,15 @@ import {
     isSearchCommand,
     UIItem 
 } from "../api/contracts/weblayout";
+import { IView } from "../api/contracts/common";
 import { RuntimeMap } from "../api/contracts/runtime-map";
 import * as logger from "../utils/logger";
 import queryString = require("query-string");
 const parse = require("url-parse");
 const assign = require("object-assign");
 
-function convertUIItems(items: UIItem[], cmdsByKey: any, noToolbarLabels = true, canSupportFlyouts = true): any[] {
-    return items.map(item => {
+function convertUIItems(items: UIItem[] | null | undefined, cmdsByKey: any, noToolbarLabels = true, canSupportFlyouts = true): any[] {
+    return (items || []).map(item => {
         if (isCommandItem(item)) {
             const cmdDef: CommandDef = cmdsByKey[item.Command];
             if (!cmdDef) {
@@ -126,7 +127,7 @@ export function initLayout(options) {
             if (webLayout.PointSelectionBuffer != null) {
                 config.pointSelectionBuffer = webLayout.PointSelectionBuffer;
             }
-            let initialView = null;
+            let initialView: IView | null = null;
             if (webLayout.Map.InitialView != null) {
                 initialView = {
                     x: webLayout.Map.InitialView.CenterX,

diff --git a/src/actions/map.ts b/src/actions/map.ts
@@ -45,7 +45,7 @@ function combineSelectedFeatures(oldRes: SelectedFeature[], newRes: SelectedFeat
     return merged;
 }
 
-function combineSelectedFeatureSets(oldRes: SelectedFeatureSet, newRes: SelectedFeatureSet): SelectedFeatureSet {
+function combineSelectedFeatureSets(oldRes: SelectedFeatureSet | null | undefined, newRes: SelectedFeatureSet | null | undefined): SelectedFeatureSet | null | undefined {
     if (oldRes == null) {
         return newRes;
     }
@@ -55,20 +55,22 @@ function combineSelectedFeatureSets(oldRes: SelectedFeatureSet, newRes: Selected
     for (const layer of oldRes.SelectedLayer) {
         merged.SelectedLayer.push(layer);
     }
-    for (const layer of newRes.SelectedLayer) {
-        const layerId = layer["@id"];
-        const layerName = layer["@name"];
-        const existing = merged.SelectedLayer.filter(l => l["@id"] == layerId && l["@name"] == layerName);
-        if (existing.length == 0) {
-            merged.SelectedLayer.push(layer);
-        } else {
-            existing[0].Feature = combineSelectedFeatures(existing[0].Feature, layer.Feature);
+    if (newRes) {
+        for (const layer of newRes.SelectedLayer) {
+            const layerId = layer["@id"];
+            const layerName = layer["@name"];
+            const existing = merged.SelectedLayer.filter(l => l["@id"] == layerId && l["@name"] == layerName);
+            if (existing.length == 0) {
+                merged.SelectedLayer.push(layer);
+            } else {
+                existing[0].Feature = combineSelectedFeatures(existing[0].Feature, layer.Feature);
+            }
         }
     }
     return merged;
 }
 
-function combineFeatureSets(oldRes: FeatureSet, newRes: FeatureSet): FeatureSet {
+function combineFeatureSets(oldRes: FeatureSet | null | undefined, newRes: FeatureSet | null | undefined): FeatureSet | null | undefined {
     if (oldRes == null) {
         return newRes;
     }
@@ -78,13 +80,15 @@ function combineFeatureSets(oldRes: FeatureSet, newRes: FeatureSet): FeatureSet
     for (const layer of oldRes.Layer) {
         merged.Layer.push(layer);
     }
-    for (const layer of newRes.Layer) {
-        const layerId = layer["@id"];
-        const existing = merged.Layer.filter(l => l["@id"] == layerId);
-        if (existing.length == 0) {
-            merged.Layer.push(layer);
-        } else {
-            existing[0].Class.ID = uniq(existing[0].Class.ID.concat(layer.Class.ID));
+    if (newRes) {
+        for (const layer of newRes.Layer) {
+            const layerId = layer["@id"];
+            const existing = merged.Layer.filter(l => l["@id"] == layerId);
+            if (existing.length == 0) {
+                merged.Layer.push(layer);
+            } else {
+                existing[0].Class.ID = uniq(existing[0].Class.ID.concat(layer.Class.ID));
+            }
         }
     }
     return merged;

diff --git a/src/actions/taskpane.ts b/src/actions/taskpane.ts
@@ -39,8 +39,6 @@ export function pushUrl(url: string, silent?: boolean) {
 }
 
 export function ensureParameters(url: string, mapName: string, session: string, locale?: string, uppercase = true): string {
-    if (url == null)
-        return null;
     //If this is a component URL, let it be
     if (url.indexOf("component://") >= 0) {
         return url;