Hotfix/image picker (#2176)

* Fix os picket

* Didn't finish rebase

Author: bgklein

src/app/models/pool-os-skus.ts

@@ -1,7 +1,6 @@
 import { ObjectUtils } from "@batch-flask/utils";
 import { List } from "immutable";
 import { ImageInformation } from "./image-information";
-import { ImageReference } from "./image-reference";
 
 const dataScienceVms = {
     "linux-data-science-vm": {
@@ -16,6 +15,9 @@ const dataScienceVms = {
     "dsvm-windows": {
         osType: "windows",
     },
+    "dsvm-win-2019": {
+        osType: "windows",
+    },
 };
 
 const renderingPublisher = "batch";
@@ -28,6 +30,7 @@ const dockerContainer = {
         "2019-datacenter-with-containers-smalldisk",
         "2019-datacenter-core-with-containers",
         "2019-datacenter-core-with-containers-smalldisk",
+        "datacenter-core-1903-with-containers-smalldisk",
     ],
     "windowsserversemiannual": ["datacenter-core-1809-with-containers-smalldisk"],
     "centos-container-rdma": true,
@@ -66,51 +69,7 @@ export class PoolOsSkus {
         //        unverified images, or add some visual indicator to those which are unverified.
         let targetOffers: StringMap<Offer> | null = null;
         images.forEach((image: ImageInformation) => {
-            let imageReference = image.imageReference;
-            // Do some manual cleanup here as some images made breaking name changes
-            // (causes UI to not collate same offer)
-            if (imageReference.offer.includes("dsvm-win")) {
-                imageReference = new ImageReference({
-                    publisher: imageReference.publisher,
-                    sku: imageReference.sku,
-                    offer: "dsvm-windows",
-                    version: imageReference.version,
-                    virtualMachineImageId: imageReference.virtualMachineImageId,
-                });
-            } else if (imageReference.publisher === "microsoft-dsvm" && (imageReference.offer.includes("ubuntu"))) {
-                imageReference = new ImageReference({
-                    publisher: imageReference.publisher,
-                    sku: imageReference.sku,
-                    offer: "linux-data-science-vm-ubuntu",
-                    version: imageReference.version,
-                    virtualMachineImageId: imageReference.virtualMachineImageId,
-                });
-            } else if (imageReference.offer === "windowsserversemiannual") {
-                imageReference = new ImageReference({
-                    publisher: imageReference.publisher,
-                    sku: imageReference.sku,
-                    offer: "windowsserver",
-                    version: imageReference.version,
-                    virtualMachineImageId: imageReference.virtualMachineImageId,
-                });
-            } else if (imageReference.offer === "debian-10") {
-                imageReference = new ImageReference({
-                    publisher: imageReference.publisher,
-                    sku: imageReference.sku,
-                    offer: "debian",
-                    version: imageReference.version,
-                    virtualMachineImageId: imageReference.virtualMachineImageId,
-                });
-            }
-            if (imageReference.sku === "linuxdsvmubuntu" && image.nodeAgentSKUId.includes("16.04")) {
-                imageReference = new ImageReference({
-                    publisher: imageReference.publisher,
-                    sku: "16.04",
-                    offer: imageReference.offer,
-                    version: imageReference.version,
-                    virtualMachineImageId: imageReference.virtualMachineImageId,
-                });
-            }
+            const imageReference = image.imageReference;
             targetOffers = offers;
             if (dockerContainer[imageReference.offer]
                 && (dockerContainer[imageReference.offer] === true
@@ -134,9 +93,10 @@ export class PoolOsSkus {
 
         this.allOffers = ObjectUtils.values(offers);
         this.renderingOffers = this.allOffers.filter(x => x.publisher === renderingPublisher);
-        this.vmOffers = this.allOffers.filter(x => !(x.name in dataScienceVms) && x.publisher !== renderingPublisher);
-        this.dataScienceOffers = this.allOffers
-            .filter(x => (x.name in dataScienceVms) && x.publisher !== renderingPublisher);
+        this.dataScienceOffers = this.allOffers.filter(x =>
+            ((x.name in dataScienceVms) || x.publisher === "microsoft-dsvm") && !(this.renderingOffers.includes(x)));
+        this.vmOffers = this.allOffers.filter(x =>
+            !(this.renderingOffers.includes(x) || this.dataScienceOffers.includes(x)));
         this.dockerOffers = ObjectUtils.values(dockerOffers);
     }
 }

src/app/utils/pool-utils.ts

@@ -26,13 +26,16 @@ const iconMapping = {
     "centos-hpc": Icons.centos,
     "windowsserver": Icons.windows,
     "debian": Icons.debian,
+    "debian-10": Icons.debian,
     "oracle-linux": Icons.oracle,
     "linux-data-science-vm": Icons.linux,
+    "ubuntu-1804": Icons.ubuntu,
     "linux-data-science-vm-ubuntu": Icons.ubuntu,
     "opensuse-Leap": Icons.openSUSE,
     "sles": Icons.openSUSE,
     "sles-hpc": Icons.openSUSE,
     "standard-data-science-vm": Icons.windows,
+    "dsvm-win-2019": Icons.windows,
     "rendering-windows2016": Icons.windows,
     "autodesk-maya-arnold-centos73": Icons.centos,
     "rendering-centos73": Icons.centos,