From e11a04d81947b89e1b732f4f88f350cbf690010f Mon Sep 17 00:00:00 2001
From: Olmo del Corral <olmo@signumsoftware.com>
Date: Wed, 16 Sep 2020 00:05:14 +0200
Subject: [PATCH] more on MultiPropertySetter

---
 Signum.Entities/DynamicQuery/QueryUtils.cs    | 12 ++-
 Signum.Entities/EnumMessages.cs               |  2 +
 .../ApiControllers/OperationController.cs     | 13 +--
 .../JsonConverters/EntityJsonConverter.cs     | 11 +++
 Signum.React/Scripts/FindOptions.ts           | 30 +++++-
 Signum.React/Scripts/Lines.tsx                | 12 ++-
 Signum.React/Scripts/Operations.tsx           | 13 ++-
 .../Operations/ContextualOperations.tsx       |  6 +-
 .../Operations/MultiPropertySetter.tsx        | 95 +++++++++++++------
 Signum.React/Scripts/Reflection.ts            | 22 ++++-
 Signum.React/Scripts/Signum.Entities.ts       |  2 +
 11 files changed, 168 insertions(+), 50 deletions(-)

diff --git a/Signum.Entities/DynamicQuery/QueryUtils.cs b/Signum.Entities/DynamicQuery/QueryUtils.cs
index c6a2ac7dd2..c727e737a0 100644
--- a/Signum.Entities/DynamicQuery/QueryUtils.cs
+++ b/Signum.Entities/DynamicQuery/QueryUtils.cs
@@ -500,14 +500,24 @@ internal static Type BuildLite(this Type type)
         static readonly MethodInfo miLike = ReflectionTools.GetMethodInfo((string s) => s.Like(s));
         static readonly MethodInfo miDistinctNullable = ReflectionTools.GetMethodInfo((string s) => LinqHints.DistinctNull<int>(null, null)).GetGenericMethodDefinition();
         static readonly MethodInfo miDistinct = ReflectionTools.GetMethodInfo((string s) => LinqHints.DistinctNull<string>(null, null)).GetGenericMethodDefinition();
+        static readonly MethodInfo miEquals = ReflectionTools.GetMethodInfo(() => object.Equals(null, null));
 
         public static Expression GetCompareExpression(FilterOperation operation, Expression left, Expression right, bool inMemory = false)
         {
             switch (operation)
             {
-                case FilterOperation.EqualTo: return Expression.Equal(left, right);
+                case FilterOperation.EqualTo:
+                    {
+                        if (inMemory)
+                            return Expression.Call(null, miEquals, left, right);
+
+                        return Expression.Equal(left, right);
+                    }
                 case FilterOperation.DistinctTo:
                     {
+                        if (inMemory)
+                            return Expression.Not(Expression.Call(null, miEquals, left, right));
+
                         var t = left.Type.UnNullify();
                         var mi = t.IsValueType ? miDistinctNullable : miDistinct;
                         return Expression.Call(mi.MakeGenericMethod(t), left.Nullify(), right.Nullify());
diff --git a/Signum.Entities/EnumMessages.cs b/Signum.Entities/EnumMessages.cs
index 17434e58ca..5911d9fb31 100644
--- a/Signum.Entities/EnumMessages.cs
+++ b/Signum.Entities/EnumMessages.cs
@@ -42,6 +42,8 @@ public enum OperationMessage
 
         Predictate, 
         Setters,
+        [Description("Add setter")]
+        AddSetter,
     }
 
     public enum SynchronizerMessage
diff --git a/Signum.React/ApiControllers/OperationController.cs b/Signum.React/ApiControllers/OperationController.cs
index 15b809509a..187578480f 100644
--- a/Signum.React/ApiControllers/OperationController.cs
+++ b/Signum.React/ApiControllers/OperationController.cs
@@ -6,6 +6,7 @@
 using Signum.Engine.Maps;
 using Signum.Engine.Operations;
 using Signum.Entities;
+using Signum.Entities.DynamicQuery;
 using Signum.Entities.Reflection;
 using Signum.React.Facades;
 using Signum.React.Filters;
@@ -258,7 +259,8 @@ public class MultiOperationRequest : BaseOperationRequest
         public class PropertySetter
         {
             public string Property;
-            public PropertyOperation Operation;
+            public PropertyOperation? Operation;
+            public FilterOperation? FilterOperation;
             public object? Value;
             public string? EntityType;
             public List<PropertySetter>? Predicate;
@@ -338,8 +340,8 @@ public static void SetSetters(ModifiableEntity entity, List<PropertySetter> sett
                     {
                         case PropertyOperation.AddElement:
                             {
-                                var item = (ModifiableEntity)Activator.CreateInstance(pr.Type.ElementType()!)!;
-                                SetSetters(item, setter.Setters!, pr);
+                                var item = (ModifiableEntity)Activator.CreateInstance(elementPr.Type)!;
+                                SetSetters(item, setter.Setters!, elementPr);
                                 ((IList)mlist).Add(item);
                             }
                             break;
@@ -359,7 +361,7 @@ public static void SetSetters(ModifiableEntity entity, List<PropertySetter> sett
                                 var toRemove = ((IEnumerable<object>)mlist).Where(predicate.Compile()).ToList();
                                 foreach (var item in toRemove)
                                 {
-                                    ((IList)mlist).Add(item);
+                                    ((IList)mlist).Remove(item);
                                 }
                             }
                             break;
@@ -407,7 +409,6 @@ private static void SetProperty(ModifiableEntity entity, PropertyRoute pr, Prope
             return pr.PropertyInfo!.GetValue(subEntity);
         }
 
-        static MethodInfo miEquals = ReflectionTools.GetMethodInfo(() => object.Equals(null, null));
 
         static Expression<Func<object, bool>> GetPredicate(List<PropertySetter> predicate, PropertyRoute mainRoute, JsonSerializer serializer)
         {
@@ -422,7 +423,7 @@ static Expression<Func<object, bool>> GetPredicate(List<PropertySetter> predicat
                 var left = Expression.Invoke(lambda, param);
                 object? objClean = ConvertObject(p.Value, pr, serializer);
 
-                return (Expression)Expression.Call(null, miEquals, left, Expression.Constant(objClean));
+                return (Expression)QueryUtils.GetCompareExpression(p.FilterOperation!.Value, left, Expression.Constant(objClean), inMemory: true);
 
             }).Aggregate((a, b) => Expression.AndAlso(a, b));
 
diff --git a/Signum.React/JsonConverters/EntityJsonConverter.cs b/Signum.React/JsonConverters/EntityJsonConverter.cs
index c976aadaa2..99dacd6f40 100644
--- a/Signum.React/JsonConverters/EntityJsonConverter.cs
+++ b/Signum.React/JsonConverters/EntityJsonConverter.cs
@@ -182,6 +182,17 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
                     WriteJsonProperty(writer, serializer, mod, kvp.Key, kvp.Value, tup.pr);
                 }
 
+                var readonlyProps = PropertyConverter.GetPropertyConverters(value!.GetType())
+                    .Where(kvp => kvp.Value.PropertyValidator?.IsPropertyReadonly(mod) == true)
+                    .Select(a => a.Key)
+                    .ToList();
+
+                if (readonlyProps.Any())
+                {
+                    writer.WritePropertyName("readonlyProperties");
+                    serializer.Serialize(writer, readonlyProps);
+                }
+
                 if (mod.Mixins.Any())
                 {
                     writer.WritePropertyName("mixins");
diff --git a/Signum.React/Scripts/FindOptions.ts b/Signum.React/Scripts/FindOptions.ts
index ae7c6ccfca..19a63a00d1 100644
--- a/Signum.React/Scripts/FindOptions.ts
+++ b/Signum.React/Scripts/FindOptions.ts
@@ -1,4 +1,4 @@
-import { TypeReference, PseudoType, QueryKey, getLambdaMembers, QueryTokenString } from './Reflection';
+import { TypeReference, PseudoType, QueryKey, getLambdaMembers, QueryTokenString, tryGetTypeInfos } from './Reflection';
 import { Lite, Entity } from './Signum.Entities';
 import { PaginationMode, OrderType, FilterOperation, FilterType, ColumnOptionsMode, UniqueType, SystemTimeMode, FilterGroupOperation, PinnedFilterActive } from './Signum.Entities.DynamicQuery';
 import { SearchControlProps, SearchControlLoaded } from "./Search";
@@ -421,6 +421,34 @@ export function isList(fo: FilterOperation) {
 }
 
 
+export function getFilterType(tr: TypeReference): FilterType | null {
+  if (tr.name == "number")
+    return "Integer";
+
+  if (tr.name == "decmial")
+    return "Decimal";
+
+  if (tr.name == "boolean")
+    return "Boolean";
+
+  if (tr.name == "string")
+    return "String";
+
+  if (tr.name == "dateTime")
+    return "DateTime";
+
+  if (tr.name == "Guid")
+    return "Guid";
+
+  if (tr.isEmbedded)
+    return "Embedded";
+
+  if (tr.isLite || tryGetTypeInfos(tr)[0]?.name)
+    return "Lite";
+
+  return null;
+}
+
 export const filterOperations: { [a: string /*FilterType*/]: FilterOperation[] } = {};
 filterOperations["String"] = [
   "Contains",
diff --git a/Signum.React/Scripts/Lines.tsx b/Signum.React/Scripts/Lines.tsx
index ba854851db..c3638b3a92 100644
--- a/Signum.React/Scripts/Lines.tsx
+++ b/Signum.React/Scripts/Lines.tsx
@@ -98,8 +98,8 @@ export function taskSetFormat(lineBase: LineBaseController<any>, state: LineBase
   }
 }
 
-tasks.push(taskSetReadOnly);
-export function taskSetReadOnly(lineBase: LineBaseController<any>, state: LineBaseProps) {
+tasks.push(taskSetReadOnlyProperty);
+export function taskSetReadOnlyProperty(lineBase: LineBaseController<any>, state: LineBaseProps) {
   if (!state.ctx.readOnly &&
     state.ctx.propertyRoute &&
     state.ctx.propertyRoute.propertyRouteType == "Field" &&
@@ -108,6 +108,14 @@ export function taskSetReadOnly(lineBase: LineBaseController<any>, state: LineBa
   }
 }
 
+tasks.push(taskSetReadOnly);
+export function taskSetReadOnly(lineBase: LineBaseController<any>, state: LineBaseProps) {
+  if (!state.ctx.readOnly &&
+    state.ctx.binding.getIsReadonly()) {
+    state.ctx.readOnly = true;
+  }
+}
+
 tasks.push(taskSetMandatory);
 export function taskSetMandatory(lineBase: LineBaseController<any>, state: LineBaseProps) {
   if (state.ctx.propertyRoute && state.mandatory == undefined &&
diff --git a/Signum.React/Scripts/Operations.tsx b/Signum.React/Scripts/Operations.tsx
index eae56bdef8..bbdccc537b 100644
--- a/Signum.React/Scripts/Operations.tsx
+++ b/Signum.React/Scripts/Operations.tsx
@@ -19,6 +19,7 @@ import { ContextualItemsContext } from './SearchControl/ContextualItems';
 import { BsColor, KeyCodes } from "./Components/Basic";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
 import Notify from './Frames/Notify';
+import { FilterOperation } from "./Signum.Entities.DynamicQuery";
 
 export namespace Options {
   export function maybeReadonly(ti: TypeInfo) {
@@ -454,11 +455,14 @@ export namespace Defaults {
     return oi.key.endsWith(".Save");
   }
 
-  export function defaultSetterConfig(oi: OperationInfo): SettersConfig {
-    if (!oi.canBeModified)
+  export function defaultSetterConfig(coc: ContextualOperationContext<Entity>): SettersConfig {
+    if (!coc.operationInfo.canBeModified)
       return "No";
 
-    return isSave(oi) ? "Mandatory" : "Optional";
+    if (coc.context.lites.length == 1) //Will create too much noise
+      return "No";
+
+    return isSave(coc.operationInfo) ? "Mandatory" : "Optional";
   }
 
   export function getColor(oi: OperationInfo): BsColor {
@@ -580,7 +584,8 @@ export namespace API {
 
   export interface PropertySetter {
     property: string;
-    operation: PropertyOperation; 
+    operation?: PropertyOperation;
+    filterOperation?: FilterOperation;
     value?: any;
     entityType?: string;
     predicate?: PropertySetter[];
diff --git a/Signum.React/Scripts/Operations/ContextualOperations.tsx b/Signum.React/Scripts/Operations/ContextualOperations.tsx
index 70bb6b70f7..9d5ba58219 100644
--- a/Signum.React/Scripts/Operations/ContextualOperations.tsx
+++ b/Signum.React/Scripts/Operations/ContextualOperations.tsx
@@ -88,7 +88,7 @@ export function getEntityOperationsContextualItems(ctx: ContextualItemsContext<E
       coc.entityOperationSettings = eos;
 
       const visibleByDefault =
-        (!oi.canBeModified || (coc.settings?.settersConfig ?? Defaults.defaultSetterConfig(oi)) != "No") &&
+        (!oi.canBeModified || (coc.settings?.settersConfig ?? Defaults.defaultSetterConfig(coc)) != "No") &&
         (oi.operationType != OperationType.ConstructorFrom || ctx.lites.length == 1);
 
       if (eos == undefined ? visibleByDefault :
@@ -335,7 +335,7 @@ export function defaultContextualClick(coc: ContextualOperationContext<any>, ...
     if (!coc.operationInfo.canBeModified)
       return Promise.resolve([]);
 
-    var settersConfig = coc.settings?.settersConfig ?? Defaults.defaultSetterConfig(coc.operationInfo);
+    var settersConfig = coc.settings?.settersConfig ?? Defaults.defaultSetterConfig(coc);
 
     if (settersConfig == "No")
       return Promise.resolve([]);
@@ -345,7 +345,7 @@ export function defaultContextualClick(coc: ContextualOperationContext<any>, ...
     if (!onlyType)
       return Promise.resolve([]);
 
-    return MultiPropertySetterModal.show(getTypeInfo(onlyType), coc.context.lites, coc.operationInfo);
+    return MultiPropertySetterModal.show(getTypeInfo(onlyType), coc.context.lites, coc.operationInfo, settersConfig == "Mandatory");
   }
 }
 
diff --git a/Signum.React/Scripts/Operations/MultiPropertySetter.tsx b/Signum.React/Scripts/Operations/MultiPropertySetter.tsx
index d8fde43dd9..c2da30ab5a 100644
--- a/Signum.React/Scripts/Operations/MultiPropertySetter.tsx
+++ b/Signum.React/Scripts/Operations/MultiPropertySetter.tsx
@@ -20,6 +20,7 @@ import { Modal } from 'react-bootstrap'
 import { ErrorBoundary } from '../Components'
 import './MultiPropertySetter.css';
 import SelectorModal from '../SelectorModal'
+import { FilterOperation, filterOperations, getFilterType } from '../FindOptions'
 
 
 
@@ -28,6 +29,7 @@ interface MultiPropertySetterModalProps extends IModalProps<boolean | undefined>
   lites: Lite<Entity>[];
   operationInfo: OperationInfo;
   setters: API.PropertySetter[];
+  mandatory: boolean;
 }
 
 export function MultiPropertySetterModal(p: MultiPropertySetterModalProps) {
@@ -59,7 +61,7 @@ export function MultiPropertySetterModal(p: MultiPropertySetterModalProps) {
       </div>
       <div className="modal-body">
         <ErrorBoundary>
-          <MultiPropertySetter setters={p.setters} root={PropertyRoute.root(p.typeInfo)} onChange={forceUpdate} />
+          <MultiPropertySetter setters={p.setters} root={PropertyRoute.root(p.typeInfo)} isPredicate={false} onChange={forceUpdate} />
         </ErrorBoundary>
       </div>
       <div className="modal-footer">
@@ -71,7 +73,7 @@ export function MultiPropertySetterModal(p: MultiPropertySetterModalProps) {
             )}
         </p>
         <br />
-        <button className="btn btn-primary sf-entity-button sf-ok-button" disabled={p.setters.some(s => !isValid(s)) || Defaults.defaultSetterConfig(p.operationInfo) == "Mandatory" && p.setters.length == 0} onClick={handleOkClicked}>
+        <button className="btn btn-primary sf-entity-button sf-ok-button" disabled={p.setters.some(s => !isValid(s)) || p.mandatory && p.setters.length == 0} onClick={handleOkClicked}>
           {JavascriptMessage.ok.niceToString()}
         </button>
         <button className="btn btn-light sf-entity-button sf-close-button" onClick={handleCancelClicked}>
@@ -86,12 +88,12 @@ export function MultiPropertySetterModal(p: MultiPropertySetterModalProps) {
   }
 }
 
-MultiPropertySetterModal.show = (typeInfo: TypeInfo, lites: Lite<Entity>[], operationInfo: OperationInfo, setters?: API.PropertySetter[]): Promise<API.PropertySetter[] | undefined> => {
+MultiPropertySetterModal.show = (typeInfo: TypeInfo, lites: Lite<Entity>[], operationInfo: OperationInfo, mandatory: boolean, setters?: API.PropertySetter[]): Promise<API.PropertySetter[] | undefined> => {
   var settersOrDefault = setters ?? [];
-  return openModal<boolean | undefined>(<MultiPropertySetterModal typeInfo={typeInfo} lites={lites} operationInfo={operationInfo} setters={settersOrDefault} />).then(a => a ? settersOrDefault : undefined);
+  return openModal<boolean | undefined>(<MultiPropertySetterModal typeInfo={typeInfo} lites={lites} operationInfo={operationInfo} mandatory={mandatory} setters={settersOrDefault} />).then(a => a ? settersOrDefault : undefined);
 };
 
-export function MultiPropertySetter({ root, setters, onChange }: { root: PropertyRoute, setters: API.PropertySetter[], onChange: () => void }) {
+export function MultiPropertySetter({ root, setters, onChange, isPredicate }: { root: PropertyRoute, setters: API.PropertySetter[], isPredicate: boolean, onChange: () => void }) {
 
   function handleNewPropertySetter(e: React.MouseEvent) {
     e.preventDefault();
@@ -104,6 +106,10 @@ export function MultiPropertySetter({ root, setters, onChange }: { root: Propert
     onChange();
   }
 
+  var addElement = isPredicate ?
+    SearchMessage.AddFilter.niceToString() :
+    OperationMessage.AddSetter.niceToString()
+
   return (
     <table className="table-sm">
       <thead>
@@ -118,18 +124,17 @@ export function MultiPropertySetter({ root, setters, onChange }: { root: Propert
         {setters.map((ps, i) =>
           <PropertySetterComponent
             key={i} setter={ps} onDeleteSetter={handleDeletePropertySetter}
-            prefixRoute={undefined}
             root={root}
-            isPredicate={false}
+            isPredicate={isPredicate}
             onSetterChanged={() => onChange()} />
         )}
         {
           <tr className="sf-property-create">
             <td colSpan={4}>
-              <a href="#" title={StyleContext.default.titleLabels ? SearchMessage.AddFilter.niceToString() : undefined}
+              <a href="#" title={StyleContext.default.titleLabels ? addElement : undefined}
                 className="sf-line-button sf-create sf-create-condition"
                 onClick={e => handleNewPropertySetter(e)}>
-                <FontAwesomeIcon icon="plus" className="sf-create mr-1" />{SearchMessage.AddFilter.niceToString()}
+                <FontAwesomeIcon icon="plus" className="sf-create mr-1" />{addElement}
               </a>
             </td>
           </tr>
@@ -163,7 +168,6 @@ export function getPropertyOperations(type: TypeReference): PropertyOperation[]
 export interface PropertySetterComponentProps {
   root: PropertyRoute;
   setter: API.PropertySetter;
-  prefixRoute: PropertyRoute | undefined;
   onDeleteSetter: (pi: API.PropertySetter) => void;
   isPredicate: boolean;
   onSetterChanged: () => void;
@@ -181,8 +185,16 @@ export function PropertySetterComponent(p: PropertySetterComponentProps) {
 
   function handlePropertyChanged(newProperty: PropertyRoute | null | undefined) {
     const s = p.setter;
-    s.property = newProperty?.propertyPath() ?? undefined!;
-    s.operation = newProperty == null ? null! : getPropertyOperations(newProperty.typeReference()).firstOrNull()!;
+    s.property = newProperty == null ? undefined! :
+      p.root.propertyRouteType == "Root" ? newProperty.propertyPath() :
+        newProperty.propertyPath().after(p.root.propertyPath()).trimStart('.');
+
+    s.operation = newProperty == null || p.isPredicate ? null! : getPropertyOperations(newProperty.typeReference()).firstOrNull()!;
+
+
+    const filterType = newProperty && getFilterType(newProperty.typeReference());
+    s.filterOperation = newProperty == null || !p.isPredicate || filterType == null ? null! : filterOperations[filterType].firstOrNull()!;
+
     s.value = undefined;
     fixOperation(s, newProperty).then(() => {
       p.onSetterChanged();
@@ -200,11 +212,17 @@ export function PropertySetterComponent(p: PropertySetterComponentProps) {
     }).done();
   }
 
+  function handleChangeFilterOperation(event: React.FormEvent<HTMLSelectElement>) {
+    const fOperation = (event.currentTarget as HTMLSelectElement).value as FilterOperation;
+    const s = p.setter;
+    s.filterOperation = fOperation;
+  }
+
   function fixOperation(p: API.PropertySetter, pr: PropertyRoute | null | undefined): Promise<void> {
 
     p.value = undefined;
-    p.predicate = showPredicate(p.operation) ? [] : undefined;
-    p.setters = showSetters(p.operation) ? [] : undefined;
+    p.predicate = p.operation && showPredicate(p.operation) ? [] : undefined;
+    p.setters = p.operation && showSetters(p.operation) ? [] : undefined;
     if (pr && (p.setters || p.predicate)) {
       var infos = tryGetTypeInfos(pr.typeReference());
       var promise = infos.length == 1 && infos[0] ? Promise.resolve(undefined) :
@@ -229,10 +247,13 @@ export function PropertySetterComponent(p: PropertySetterComponentProps) {
     return o == "AddElement" || o == "ChangeElements" || o == "CreateNewEntiy" || o == "ModifyEntity";
   }
 
-  const pr = React.useMemo(() => p.setter.property == null ? null : PropertyRoute.parse(p.root.findRootType(), p.setter.property),
+  const pr = React.useMemo(() => p.setter.property == null ? null : p.root.addMembers(p.setter.property),
     [p.root, p.setter.property]);
 
-  var operations = pr == null ? [] : getPropertyOperations(pr.typeReference());
+  var operations = pr == null || p.isPredicate ? undefined : getPropertyOperations(pr.typeReference());
+
+  var filterType = p.isPredicate && pr ? getFilterType(pr.typeReference()) : null;
+  var fOperations = filterType ? filterOperations[filterType] : null;
 
   var subRoot = pr && (pr.typeReference().isEmbedded ? (pr.typeReference().isCollection ? pr.addMember("Indexer", "Item", true) :  pr) :
     p.setter.entityType != null ? PropertyRoute.root(getTypeInfo(p.setter.entityType)) : null); 
@@ -251,30 +272,43 @@ export function PropertySetterComponent(p: PropertySetterComponentProps) {
           <div className="rw-widget-xs">
             <PropertySelector
               property={pr}
-              prefixRoute={p.prefixRoute}
               root={p.root}
               onPropertyChanged={handlePropertyChanged} />
           </div>
         </td>
         <td>
           {
-            operations.length == 0 ? null :
+            operations &&
               <select className="form-control form-control-xs" value={p.setter.operation} disabled={operations.length == 1} onChange={handleChangeOperation}>
                 {operations.map((op, i) => <option key={i} value={op}>{PropertyOperation.niceToString(op)}</option>)}
               </select>
           }
+
+          {
+            fOperations &&
+            <select className="form-control form-control-xs" value={p.setter.filterOperation} disabled={fOperations.length == 1} onChange={handleChangeFilterOperation}>
+              {fOperations.map((op, i) => <option key={i} value={op}>{FilterOperation.niceToString(op)}</option>)}
+            </select>
+          }
         </td>
         <td className="sf-filter-value">
-          {p.setter.property && showValue(p.setter.operation) && renderValue()}
-          {subRoot && showPredicate(p.setter.operation) && pr && <div>
-            <h3>{OperationMessage.Predictate.niceToString()}</h3>
-            <MultiPropertySetter onChange={p.onSetterChanged} setters={p.setter.setters!} root={subRoot} />
-          </div>
-          }
-          {subRoot && showSetters(p.setter.operation) && pr && <div>
-            <h3>{OperationMessage.Setters.niceToString()}</h3>
-            <MultiPropertySetter onChange={p.onSetterChanged} setters={p.setter.setters!} root={subRoot} />
-          </div>
+          {p.isPredicate ?
+            <>
+              {p.setter.property && renderValue()}
+            </> :
+            <>
+              {p.setter.property && p.setter.operation && showValue(p.setter.operation) && renderValue()}
+              {subRoot && p.setter.operation && showPredicate(p.setter.operation) && pr && <div>
+                <h5>{OperationMessage.Predictate.niceToString()}</h5>
+                <MultiPropertySetter onChange={p.onSetterChanged} setters={p.setter.predicate!} isPredicate={true} root={subRoot} />
+              </div>
+              }
+              {subRoot && p.setter.operation && showSetters(p.setter.operation) && pr && <div>
+                <h5>{OperationMessage.Setters.niceToString()}</h5>
+                <MultiPropertySetter onChange={p.onSetterChanged} setters={p.setter.setters!} isPredicate={false} root={subRoot} />
+              </div>
+              }
+            </>
           }
         </td>
       </tr>
@@ -301,10 +335,10 @@ export function createSetterValueControl(ctx: TypeContext<any>, handleValueChang
     return <ValueLine ctx={ctx} onChange={handleValueChange} />;
 
   if (tr.isEmbedded)
-    return <EntityLine ctx={ctx} autocomplete={null} onChange={handleValueChange} />;
+    return <EntityLine ctx={ctx} autocomplete={null} onChange={handleValueChange} create={false} />;
 
   if (tr.isLite)
-    return <EntityLine ctx={ctx} onChange={handleValueChange} />;
+    return <EntityLine ctx={ctx} onChange={handleValueChange} create={false}/>;
 
   var tis = tryGetTypeInfos(tr.name);
 
@@ -327,7 +361,6 @@ export function createSetterValueControl(ctx: TypeContext<any>, handleValueChang
 
 interface PropertySelectorProps {
   root: PropertyRoute;
-  prefixRoute?: PropertyRoute | undefined;
   property: PropertyRoute | undefined | null;
   onPropertyChanged: (newProperty: PropertyRoute | undefined) => void;
 }
diff --git a/Signum.React/Scripts/Reflection.ts b/Signum.React/Scripts/Reflection.ts
index 08386acb5d..3937eb0948 100644
--- a/Signum.React/Scripts/Reflection.ts
+++ b/Signum.React/Scripts/Reflection.ts
@@ -525,6 +525,7 @@ export interface IBinding<T> {
   getValue(): T;
   setValue(val: T): void;
   suffix: string;
+  getIsReadonly(): boolean;
   getError(): string | undefined;
   setError(value: string | undefined): void;
 }
@@ -590,6 +591,11 @@ export class Binding<T> implements IBinding<T> {
     return parentErrors && parentErrors[this.member];
   }
 
+  getIsReadonly(): boolean {
+    const readonlyProperties = (this.parentObject as ModifiableEntity).readonlyProperties;
+    return readonlyProperties != null && readonlyProperties.contains(this.member as string);
+  }
+
   setError(value: string | undefined) {
     const parent = this.parentObject as ModifiableEntity;
 
@@ -621,6 +627,10 @@ export class ReadonlyBinding<T> implements IBinding<T> {
     throw new Error("Readonly Binding");
   }
 
+  getIsReadonly() {
+    return true;
+  }
+
   getError(): string | undefined {
     return undefined;
   }
@@ -660,6 +670,10 @@ export class MListElementBinding<T> implements IBinding<T>{
     this.mListBinding.setValue(mlist);
   }
 
+  getIsReadonly() {
+    return false; //Not sure
+  }
+
   getError(): string | undefined {
     return undefined;
   }
@@ -1397,8 +1411,8 @@ export class PropertyRoute {
     return PropertyRoute.parse(fullPropertyRoute.substring(1, endPseudoTypeIndex), propertyString);
   }
 
-  static parse(rootType: PseudoType, propertyString: string): PropertyRoute {
-    let result = PropertyRoute.root(rootType);
+  addMembers(propertyString: string): PropertyRoute {
+    let result: PropertyRoute = this;
 
     function splitMixin(text: string): LambdaMember[] {
 
@@ -1443,6 +1457,10 @@ export class PropertyRoute {
     return result;
   }
 
+  static parse(rootType: PseudoType, propertyString: string): PropertyRoute {
+    return PropertyRoute.root(rootType).addMembers(propertyString);
+  }
+
   constructor(
     parent: PropertyRoute | undefined,
     propertyRouteType: PropertyRouteType,
diff --git a/Signum.React/Scripts/Signum.Entities.ts b/Signum.React/Scripts/Signum.Entities.ts
index 0321a798a4..7f831e8b00 100644
--- a/Signum.React/Scripts/Signum.Entities.ts
+++ b/Signum.React/Scripts/Signum.Entities.ts
@@ -11,6 +11,7 @@ export interface ModifiableEntity {
   modified: boolean;
   isNew: boolean;
   error?: { [member: string]: string };
+  readonlyProperties?: string[];
   mixins?: { [name: string]: MixinEntity }
 }
 
@@ -398,6 +399,7 @@ export module OperationMessage {
   export const PleaseConfirmThatYouDLineToApplyTheAboveChangesAndExecute0Over12 = new MessageKey("OperationMessage", "PleaseConfirmThatYouDLineToApplyTheAboveChangesAndExecute0Over12");
   export const Predictate = new MessageKey("OperationMessage", "Predictate");
   export const Setters = new MessageKey("OperationMessage", "Setters");
+  export const AddSetter = new MessageKey("OperationMessage", "AddSetter");
 }
 
 export const OperationSymbol = new Type<OperationSymbol>("Operation");