Merge pull request #1709 from paulvanbrenk/npmUiMissingPackage

Npm ui missing package

Author: paulvanbrenk

Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.Designer.cs

@@ -186,4 +186,7 @@
   <data name="WindowTitle" xml:space="preserve">
     <value>Install New npm Packages</value>
   </data>
+  <data name="MissingLocallyMessage" xml:space="preserve">
+    <value>Package missing</value>
+  </data>
 </root>

Nodejs/Product/Nodejs/NpmUI/NpmInstallWindowResources.resx

@@ -148,6 +148,13 @@
                                            FontWeight="Bold"
                                            Text="{x:Static resx:NpmInstallWindowResources.InstalledLocallyMessage}" />
 
+                                <TextBlock Grid.Column="1"
+                                           x:Name="LocalInstallMissingMessage"
+                                           Visibility="Collapsed"
+                                           FontWeight="Bold"
+                                           Foreground="Red"
+                                           Text="{x:Static resx:NpmInstallWindowResources.MissingLocallyMessage}" />
+                                
                                 <TextBlock Grid.Column="1"
                                            x:Name="LocalInstallOutOfDateMessage"
                                            Visibility="Collapsed"
@@ -171,6 +178,9 @@
                             <DataTrigger Binding="{Binding IsInstalledLocally}" Value="true">
                                 <Setter TargetName="LocalInstallMessage" Property="Visibility" Value="Visible" />
                             </DataTrigger>
+                            <DataTrigger Binding="{Binding IsLocalInstallMissing}" Value="true">
+                                <Setter TargetName="LocalInstallMissingMessage" Property="Visibility" Value="Visible" />
+                            </DataTrigger>
                             <DataTrigger Binding="{Binding IsLocalInstallOutOfDate}" Value="true">
                                 <Setter TargetName="LocalInstallMessage" Property="Visibility" Value="Collapsed" />
                                 <Setter TargetName="LocalInstallOutOfDateMessage" Property="Visibility" Value="Visible" />

Nodejs/Product/Nodejs/NpmUI/NpmPackageInstallWindow.xaml

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
@@ -12,6 +12,7 @@ internal abstract class PackageCatalogEntryViewModel
     {
         private readonly SemverVersion? version;
         private readonly SemverVersion? localVersion;
+        private readonly bool? localInstallMissing;
 
         protected PackageCatalogEntryViewModel(
             string name,
@@ -21,7 +22,8 @@ protected PackageCatalogEntryViewModel(
             string description,
             IEnumerable<string> homepages,
             string keywords,
-            SemverVersion? localVersion
+            SemverVersion? localVersion,
+            bool? localInstallMissing
         )
         {
             this.Name = name;
@@ -32,6 +34,7 @@ protected PackageCatalogEntryViewModel(
             this.Homepages = homepages ?? Enumerable.Empty<string>();
             this.Keywords = keywords;
             this.localVersion = localVersion;
+            this.localInstallMissing = localInstallMissing;
         }
 
         public virtual string Name { get; }
@@ -51,8 +54,12 @@ protected PackageCatalogEntryViewModel(
 
         public string Keywords { get; }
 
-        public bool IsInstalledLocally => this.localVersion.HasValue;
-        public bool IsLocalInstallOutOfDate => this.localVersion.HasValue && this.localVersion < this.version;
+        public bool IsInstalledLocally => !this.IsLocalInstallMissing && this.localVersion.HasValue;
+        public bool IsLocalInstallOutOfDate => this.IsInstalledLocally && this.localVersion < this.version;
+
+        // Local install is missing if we expect a local install, but it's not there. 
+        // This means that if a package is not in the package.json, we don't report it missing.
+        public bool IsLocalInstallMissing => this.localInstallMissing == true;
         public string LocalVersion => this.localVersion?.ToString() ?? string.Empty;
 
         public override string ToString()
@@ -74,7 +81,8 @@ public ReadOnlyPackageCatalogEntryViewModel(IPackage package, IPackage localInst
                 (package.Keywords != null && package.Keywords.Any())
                     ? string.Join(", ", package.Keywords)
                     : Resources.NoKeywordsInPackage,
-                localInstall != null ? (SemverVersion?)localInstall.Version : null
+                localInstall?.Version,
+                localInstall?.IsMissing
             )
         {
             if (string.IsNullOrEmpty(this.Name))