Merge branch 'TS34'

signumsoftware · Apr 1, 2019 · 8ee55ca · 8ee55ca · olmobrutall · Apr 2, 2019
2 parents 93fdb27 + 9cfb521
commit 8ee55ca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/Signum.React/Scripts/Operations/ContextualOperations.tsx b/Signum.React/Scripts/Operations/ContextualOperations.tsx
@@ -12,6 +12,7 @@ import {
 } from '../Operations'
 import { DropdownItem } from "../Components/DropdownItem";
 import { UncontrolledTooltip } from "../Components/Tooltip";
+import { IconProp } from "@fortawesome/fontawesome-svg-core";
 
 export function getConstructFromManyContextualItems(ctx: ContextualItemsContext<Entity>): Promise<MenuItemBlock | undefined> | undefined {
   if (ctx.lites.length == 0)
@@ -195,7 +196,7 @@ export namespace MenuItemConstructor { //To allow monkey patching
         simplifyName(coc.operationInfo.niceName);
 
     const color = coc.settings && coc.settings.color || coc.entityOperationSettings && coc.entityOperationSettings.color || Defaults.getColor(coc.operationInfo);
-    const icon = coc.settings && coc.settings.icon || coc.entityOperationSettings && coc.entityOperationSettings.icon;
+    const icon = coalesceIcon(coc.settings && coc.settings.icon, coc.entityOperationSettings && coc.entityOperationSettings.icon);
     const iconColor = coc.settings && coc.settings.iconColor || coc.entityOperationSettings && coc.entityOperationSettings.iconColor;
 
     const disabled = !!coc.canExecute;
@@ -215,7 +216,7 @@ export namespace MenuItemConstructor { //To allow monkey patching
         data-operation={coc.operationInfo.key}>
         {icon ? <FontAwesomeIcon icon={icon} className="icon" color={iconColor} fixedWidth /> :
           color ? <span className={classes("icon", "empty-icon", "btn-" + color)}></span> : undefined}
-        {(icon || color) && " "}
+        {(icon  != null || color != null) && " "}
         {text}
       </DropdownItem>,
       coc.canExecute ? <UncontrolledTooltip placement="right" target={() => innerRef!}>{coc.canExecute}</UncontrolledTooltip> : undefined
@@ -273,5 +274,15 @@ export function defaultContextualClick(coc: ContextualOperationContext<any>, ...
     }
   }).done();
 
+
+
+}
+
+
+export function coalesceIcon(icon: IconProp | undefined, icon2: IconProp | undefined): IconProp | undefined{ //Till the error is fixed
+  if (icon != null)
+    return icon;
+
+  return icon2;
 }
 
diff --git a/Signum.React/Signum.React.csproj b/Signum.React/Signum.React.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <TypeScriptToolsVersion>3.3</TypeScriptToolsVersion>
+    <TypeScriptToolsVersion>3.4</TypeScriptToolsVersion>
     <LangVersion>latest</LangVersion>
     <OutputType>Library</OutputType>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.3.1">
+    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.4.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -42,12 +42,5 @@
     <TypeScriptCompile Include="**\*.ts" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Remove="package.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="package.json" />
-  </ItemGroup>
 
 </Project>