Merge remote-tracking branch 'AlejandroCano/O365' into bootstrap5

# Conflicts: # Signum.React.Extensions/Mailing/MailingClient.tsx # Signum.React.Extensions/Workflow/WorkflowClient.tsx
signumsoftware · Nov 12, 2021 · 002bcc9 · 002bcc9 · olmobrutall · Nov 14, 2021
2 parents 53c1189 + 27cc951
commit 002bcc9
Show file tree

Hide file tree

Showing 19 changed files with 283 additions and 206 deletions.
diff --git a/Signum.React.Extensions/Alerts/AlertsClient.tsx b/Signum.React.Extensions/Alerts/AlertsClient.tsx
@@ -52,10 +52,10 @@ export function start(options: { routes: JSX.Element[], showAlerts?: (typeName:
   }));
 
   Operations.addSettings(new EntityOperationSettings(AlertOperation.Delay, {
-    onClick: (eoc) => chooseDate().then(d => d && eoc.defaultClick(d.toISO())).done(),
+    onClick: (eoc) => chooseDate().then(d => d && eoc.defaultClick(d.toISO())),
     hideOnCanExecute: true,
-    contextual: { onClick: (coc) => chooseDate().then(d => d && coc.defaultContextualClick(d.toISO())).done() },
-    contextualFromMany: { onClick: (coc) => chooseDate().then(d => d && coc.defaultContextualClick(d.toISO())).done() },
+    contextual: { onClick: (coc) => chooseDate().then(d => d && coc.defaultContextualClick(d.toISO())) },
+    contextualFromMany: { onClick: (coc) => chooseDate().then(d => d && coc.defaultContextualClick(d.toISO())) },
   }));
 
   var cellFormatter = new Finder.CellFormatter((cell, ctx) => {

diff --git a/Signum.React.Extensions/Dynamic/DynamicTypeClient.tsx b/Signum.React.Extensions/Dynamic/DynamicTypeClient.tsx
@@ -32,24 +32,24 @@ export function start(options: { routes: JSX.Element[] }) {
     onClick: eoc => {
       (eoc.frame.entityComponent as DynamicTypeComponent).beforeSave();
 
-      Operations.API.executeEntity(eoc.entity, eoc.operationInfo.key)
+      return Operations.API.executeEntity(eoc.entity, eoc.operationInfo.key)
         .then(pack => { eoc.frame.onReload(pack); Operations.notifySuccess(); })
         .then(() => {
           if (AuthClient.isPermissionAuthorized(DynamicPanelPermission.ViewDynamicPanel)) {
-            MessageModal.show({
+            return MessageModal.show({
               title: DynamicTypeMessage.TypeSaved.niceToString(),
               message: DynamicTypeMessage.DynamicType0SucessfullySavedGoToDynamicPanelNow.niceToString(eoc.entity.typeName),
               buttons: "yes_no",
               style: "success",
               icon: "success"
             }).then(result => {
-              if (result == "yes")
+              if (result == "yes") 
                 window.open(AppContext.toAbsoluteUrl("~/dynamic/panel"));
-            }).done();
+              return;
+            });
           }
         })
-        .catch(ifError(ValidationError, e => eoc.frame.setError(e.modelState, "entity")))
-        .done();
+        .catch(ifError(ValidationError, e => eoc.frame.setError(e.modelState, "entity")));
     },
     alternatives: eoc => [],
   }));

diff --git a/Signum.React.Extensions/Dynamic/DynamicViewClient.tsx b/Signum.React.Extensions/Dynamic/DynamicViewClient.tsx
@@ -64,33 +64,33 @@ export function start(options: { routes: JSX.Element[] }) {
     onClick: ctx => {
       (ctx.frame.entityComponent as DynamicViewEntityComponent).beforeSave();
       cleanCaches();
-      ctx.defaultClick();
+      return ctx.defaultClick();
     }
   }));
 
   Operations.addSettings(new EntityOperationSettings(DynamicViewOperation.Delete, {
     onClick: ctx => {
       cleanCaches();
-      ctx.defaultClick();
+      return ctx.defaultClick();
     },
-    contextual: { onClick: ctx => { cleanCaches(); ctx.defaultContextualClick(); } },
-    contextualFromMany: { onClick: ctx => { cleanCaches(); ctx.defaultContextualClick(); } },
+    contextual: { onClick: ctx => { cleanCaches(); return ctx.defaultContextualClick(); } },
+    contextualFromMany: { onClick: ctx => { cleanCaches(); return ctx.defaultContextualClick(); } },
   }));
 
   Operations.addSettings(new EntityOperationSettings(DynamicViewSelectorOperation.Save, {
     onClick: ctx => {
       cleanCaches();
-      ctx.defaultClick();
+      return ctx.defaultClick();
     }
   }));
 
   Operations.addSettings(new EntityOperationSettings(DynamicViewSelectorOperation.Delete, {
     onClick: ctx => {
       cleanCaches();
-      ctx.defaultClick();
+      return ctx.defaultClick();
     },
-    contextual: { onClick: ctx => { cleanCaches(); ctx.defaultContextualClick(); } },
-    contextualFromMany: { onClick: ctx => { cleanCaches(); ctx.defaultContextualClick(); } },
+    contextual: { onClick: ctx => { cleanCaches(); return ctx.defaultContextualClick(); } },
+    contextualFromMany: { onClick: ctx => { cleanCaches(); return ctx.defaultContextualClick(); } },
   }));
 
   Navigator.setViewDispatcher(new DynamicViewViewDispatcher());

diff --git a/Signum.React.Extensions/MachineLearning/PredictorClient.tsx b/Signum.React.Extensions/MachineLearning/PredictorClient.tsx
@@ -68,20 +68,18 @@ export function start(options: { routes: JSX.Element[] }) {
 
   Operations.addSettings(new EntityOperationSettings(PredictorOperation.Publish, {
     hideOnCanExecute: true,
-    onClick: eoc => {
+    onClick: eoc =>
       API.publications(eoc.entity.mainQuery.query!.key)
         .then(pubs => SelectorModal.chooseElement(pubs, { buttonDisplay: a => symbolNiceName(a), buttonName: a => a.key }))
         .then(pps => pps && eoc.defaultClick(pps))
-        .done();
-    },
+    ,
     contextual: {
-      onClick: coc => {
+      onClick: coc =>
         Navigator.API.fetch(coc.context.lites[0])
           .then(p => API.publications(p.mainQuery.query!.key))
           .then(pubs => SelectorModal.chooseElement(pubs, { buttonDisplay: a => symbolNiceName(a), buttonName: a => a.key }))
           .then(pps => pps && coc.defaultContextualClick(pps))
-          .done();
-      }
+
     }
   }));
 

diff --git a/Signum.React.Extensions/Mailing/MailingClient.tsx b/Signum.React.Extensions/Mailing/MailingClient.tsx
@@ -3,10 +3,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { ajaxPost, ajaxGet } from '@framework/Services';
 import { EntitySettings } from '@framework/Navigator'
 import * as Navigator from '@framework/Navigator'
+import * as Constructor from '@framework/Constructor'
 import * as Finder from '@framework/Finder'
 import { Lite, Entity, registerToString, JavascriptMessage } from '@framework/Signum.Entities'
 import { EntityOperationSettings } from '@framework/Operations'
-import { PseudoType, Type, getTypeName } from '@framework/Reflection'
+import { PseudoType, Type, getTypeName, isTypeEntity } from '@framework/Reflection'
 import * as Operations from '@framework/Operations'
 import { EmailMessageEntity, EmailTemplateMessageEmbedded, EmailMasterTemplateEntity, EmailMasterTemplateMessageEmbedded, EmailMessageOperation, EmailPackageEntity, EmailRecipientEmbedded, EmailConfigurationEmbedded, EmailTemplateEntity, AsyncEmailSenderPermission, EmailModelEntity, IEmailOwnerEntity, EmailFromEmbedded, MicrosoftGraphEmbedded } from './Signum.Entities.Mailing'
 import { EmailSenderConfigurationEntity, Pop3ConfigurationEntity, Pop3ReceptionEntity, EmailAddressEmbedded } from './Signum.Entities.Mailing'
@@ -61,17 +62,20 @@ export function start(options: {
 
   Operations.addSettings(new EntityOperationSettings(EmailMessageOperation.CreateEmailFromTemplate, {
     onClick: (ctx) => {
-
       var promise: Promise<string | undefined> = ctx.entity.model ? API.getConstructorType(ctx.entity.model) : Promise.resolve(undefined);
-      promise
-
-      Finder.find({ queryName: ctx.entity.query!.key }).then(lite => {
-        if (!lite)
-          return;
-        Navigator.API.fetch(lite).then(entity =>
-          ctx.defaultClick(entity))
-          .done();
-      }).done();
+      return promise.then(ct => {
+        if (!ct || isTypeEntity(ct))
+          return Finder.find({ queryName: ctx.entity.query!.key }).then(lite => {
+            if (!lite)
+              return;
+            return Navigator.API.fetch(lite).then(entity => ctx.defaultClick(entity));
+          });
+        else {
+          var s = settings[ct];
+          var promise = (s?.createFromTemplate ? s.createFromTemplate(ctx.entity) : Constructor.constructPack(ct).then(a => a && Navigator.view(a)));
+          return promise.then(model => model && ctx.defaultClick(model));
+        }
+      });
     }
   }));
 

diff --git a/Signum.React.Extensions/Tree/TreeClient.tsx b/Signum.React.Extensions/Tree/TreeClient.tsx
@@ -36,7 +36,7 @@ export function start(options: { routes: JSX.Element[] }) {
     new EntityOperationSettings(TreeOperation.Copy, {
       onClick: ctx => copyModal(toLite(ctx.entity)).then(m => {
         if (m) {
-          ctx.onConstructFromSuccess = pack => Operations.notifySuccess();
+          ctx.onConstructFromSuccess = pack => { Operations.notifySuccess(); return Promise.resolve(); };
           ctx.defaultClick(m);
         }
       }),

diff --git a/Signum.React.Extensions/Word/WordClient.tsx b/Signum.React.Extensions/Word/WordClient.tsx
@@ -60,7 +60,7 @@ export function start(options: { routes: JSX.Element[], contextual: boolean, que
     onClick: ctx => {
 
       var promise: Promise<string | undefined> = ctx.entity.model ? API.getConstructorType(ctx.entity.model) : Promise.resolve(undefined);
-      promise
+      return promise
         .then<Response | undefined>(ct => {
           var template = toLite(ctx.entity);
 
@@ -77,8 +77,8 @@ export function start(options: { routes: JSX.Element[], contextual: boolean, que
           if (!response)
             return;
 
-          saveFile(response);
-        }).done();
+          return saveFile(response);
+        });
     }
   }));
 

diff --git a/Signum.React.Extensions/Workflow/Case/CaseFrameModal.tsx b/Signum.React.Extensions/Workflow/Case/CaseFrameModal.tsx
@@ -38,6 +38,7 @@ interface CaseFrameModalState {
   show: boolean;
   prefix?: string;
   refreshCount: number;
+  executing?: boolean;
 }
 
 var modalCount = 0;
@@ -65,7 +66,7 @@ export default class CaseFrameModal extends React.Component<CaseFrameModalProps,
       .done();
   }
 
-  handleKeyDown(e: KeyboardEvent) {
+    handleKeyDown(e: KeyboardEvent) {
     this.buttonBar && this.buttonBar.handleKeyDown(e);
   }
 
@@ -176,7 +177,18 @@ export default class CaseFrameModal extends React.Component<CaseFrameModalProps,
       },
       refreshCount: this.state.refreshCount,
       allowExchangeEntity: false,
-      prefix: this.prefix
+      prefix: this.prefix,
+      isExecuting: () => this.state.executing == true,
+      execute: action => {
+        if (this.state.executing)
+          return;
+
+        this.setState({ executing: true });
+        action()
+          .finally(() => this.setState({ executing: undefined }))
+          .done();
+      }
+
     };
 
     var activityPack = { entity: pack.activity, canExecute: pack.canExecuteActivity };
@@ -229,7 +241,18 @@ export default class CaseFrameModal extends React.Component<CaseFrameModalProps,
       },
       refreshCount: this.state.refreshCount,
       allowExchangeEntity: false,
-      prefix: this.prefix
+      prefix: this.prefix,
+      isExecuting: () => this.state.executing == true,
+      execute: action => {
+        if (this.state.executing)
+          return;
+
+        this.setState({ executing: true });
+
+        action()
+          .finally(() => this.setState({ executing: undefined }))
+          .done();
+      }
     };
 
     var ti = this.getMainTypeInfo();
@@ -247,7 +270,7 @@ export default class CaseFrameModal extends React.Component<CaseFrameModalProps,
     };
 
     return (
-      <div className="sf-main-entity case-main-entity" data-main-entity={entityInfo(mainEntity)}>
+      <div className="sf-main-entity case-main-entity" style={this.state.executing == true ? { opacity: ".7" } : undefined} data-main-entity={entityInfo(mainEntity)}>
         <div className="sf-button-widget-container">
           {renderWidgets(wc)}
           {this.entityComponent && !mainEntity.isNew && !pack.activity.doneBy ? <ButtonBar ref={bb => this.buttonBar = bb} frame={mainFrame} pack={mainFrame.pack} /> : <br />}

diff --git a/Signum.React.Extensions/Workflow/Case/CaseFramePage.tsx b/Signum.React.Extensions/Workflow/Case/CaseFramePage.tsx
@@ -29,6 +29,7 @@ interface CaseFramePageState {
   pack?: WorkflowClient.CaseEntityPack;
   getComponent?: (ctx: TypeContext<Entity>) => React.ReactElement<any>;
   refreshCount: number;
+  executing?: boolean;
 }
 
 export default class CaseFramePage extends React.Component<CaseFramePageProps, CaseFramePageState> implements IHasCaseActivity {
@@ -161,7 +162,17 @@ export default class CaseFramePage extends React.Component<CaseFramePageProps, C
       },
       refreshCount: this.state.refreshCount,
       allowExchangeEntity: false,
-      prefix: "caseFrame"
+      prefix: "caseFrame",
+      isExecuting: () => this.state.executing == true,
+      execute: action => {
+        if (this.state.executing)
+          return;
+
+        this.setState({ executing: true });
+        action()
+          .finally(() => { this.setState({ executing: undefined }) })
+          .done();
+      }
     };
 
 
@@ -232,7 +243,17 @@ export default class CaseFramePage extends React.Component<CaseFramePageProps, C
       },
       refreshCount: this.state.refreshCount,
       allowExchangeEntity: false,
-      prefix: "caseFrame"
+      prefix: "caseFrame",
+      isExecuting: () => this.state.executing == true,
+      execute: action => {
+        if (this.state.executing)
+          return;
+
+        this.setState({ executing: true });
+        action()
+          .finally(() => this.setState({ executing: undefined }))
+          .done();
+      }
     };
 
     var ti = this.getMainTypeInfo();
@@ -252,7 +273,7 @@ export default class CaseFramePage extends React.Component<CaseFramePageProps, C
     };
 
     return (
-      <div className="sf-main-entity case-main-entity" data-main-entity={entityInfo(mainEntity)}>
+      <div className="sf-main-entity case-main-entity" style={this.state.executing == true ? { opacity: ".7" } : undefined} data-main-entity={entityInfo(mainEntity)}>
         <div className="sf-button-widget-container">
           {renderWidgets(wc)}
           {this.entityComponent && !mainEntity.isNew && !pack.activity.doneBy ? <ButtonBar ref={a => this.buttonBar = a} frame={mainFrame} pack={mainFrame.pack} /> : <br />}