Merge pull request #1984 from Heigvd/dev

Dev to master

Author: xgo-work

wegas-app/src/main/node/wegas-react/src/Components/Outputs/Inbox.tsx

@@ -2,15 +2,17 @@ import { css, cx } from '@emotion/css';
 import { faArrowLeft } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import * as React from 'react';
-import { IInboxDescriptor, IMessage } from 'wegas-ts-api';
+import { IAttachment, IInboxDescriptor, IMessage } from 'wegas-ts-api';
 import {
-  bolder, defaultMarginBottom,
+  bolder,
+  defaultMarginBottom,
   defaultMarginTop,
   expandWidth,
   flex,
   flexBetween,
   flexColumn,
   flexRow,
+  flexWrap,
   itemCenter,
   toolboxHeaderStyle,
 } from '../../css/classes';
@@ -24,13 +26,17 @@ import { wwarn } from '../../Helper/wegaslog';
 import { componentsTranslations } from '../../i18n/components/components';
 import { useInternalTranslate } from '../../i18n/internalTranslator';
 import {
-  DefaultEntityChooserLabel, defaultEntityDisplay,
+  DefaultEntityChooserLabel,
+  defaultEntityDisplay,
   EntityChooser,
   EntityChooserLabelProps,
 } from '../EntityChooser';
 import { useTranslate } from '../Hooks/useTranslate';
 import { themeVar } from '../Theme/ThemeVars';
 import { TranslatableText } from './HTMLText';
+import { fileURL } from '../../API/files.api';
+import {languagesCTX} from "../Contexts/LanguagesProvider";
+import {translate} from "../../data/i18n";
 
 interface MessageLabelProps {
   message: IMessage;
@@ -62,6 +68,13 @@ const labelTitleStyle = css({
   whiteSpace: 'nowrap',
 });
 
+const attachmentDisplay = cx(
+  flex,
+  flexRow,
+  flexWrap,
+  css({ flexShrink: 0, marginLeft: '5px', width: '100%' }),
+);
+
 function MessageLabel({ message }: MessageLabelProps) {
   const translatedLabel = useTranslate(message.subject);
   const translatedFrom = useTranslate(message.from);
@@ -116,6 +129,28 @@ function MessageChooser(props: EntityChooserLabelProps<IMessage>) {
   );
 }
 
+interface AttachmentsDisplayProps {
+  attachments: IAttachment[];
+}
+
+function AttachmentsDisplay({ attachments }: AttachmentsDisplayProps) {
+  const { lang, availableLang } = React.useContext(languagesCTX);
+  const files = attachments.map(attachment => translate(attachment.file, lang, availableLang));
+
+  return (
+    <div className={attachmentDisplay}>
+      {files.map((file, index) => (
+        <span className={css({ marginLeft: '5px' })} key={index}>
+          <a href={fileURL(file)} target="_blank" rel="noreferrer">
+            {file.slice(1)}
+          </a>
+          {index < files.length - 1 && ','}
+        </span>
+      ))}
+    </div>
+  );
+}
+
 interface MessageDisplayProps {
   entity: IMessage;
 }
@@ -126,11 +161,14 @@ function MessageDisplay({ entity }: MessageDisplayProps) {
   const subject = useTranslate(entity.subject);
   const date = useTranslate(entity.date);
   const from = useTranslate(entity.from);
+  const attachments = entity.attachments;
 
   return (
     <div className={defaultEntityDisplay}>
       <div className={cx(toolboxHeaderStyle)}>
-        {subject && <div className={cx(bolder, defaultMarginBottom)}>{subject}</div>}
+        {subject && (
+          <div className={cx(bolder, defaultMarginBottom)}>{subject}</div>
+        )}
         {date && (
           <div>
             {i18nComponentValues.inbox.date}: {date}
@@ -141,8 +179,14 @@ function MessageDisplay({ entity }: MessageDisplayProps) {
             {i18nComponentValues.inbox.sender}: {from}
           </div>
         )}
+        {attachments.length > 0 && (
+          <div className={cx(flex, flexRow, css({whiteSpace: 'nowrap'}))}>
+            {i18nComponentValues.inbox.attachments}:
+            <AttachmentsDisplay attachments={attachments}/>
+          </div>
+        )}
       </div>
-      <TranslatableText content={entity.body}/>
+      <TranslatableText content={entity.body} />
     </div>
   );
 }

wegas-app/src/main/node/wegas-react/src/Editor/Components/ScriptEditors/TempScriptEditor.tsx

@@ -399,7 +399,7 @@ export function TempScriptEditor(props: TempScriptEditorProps) {
       {error && <MessageString value={error} type="error" />}
       {resizable ? (
         <ResizeHandle
-          minSize={100}
+          minSize={125}
           textContent={value + '\n\n' || '\n\n\n\n\n'}
         >
           <SrcEditor

wegas-app/src/main/node/wegas-react/src/i18n/components/de.ts

@@ -5,6 +5,7 @@ export const DE: ComponentsTranslations = {
     subject: 'Betreff',
     sender: 'Von',
     date: 'Datum',
+    attachments: 'Anhäge',
     noSelectionMessage: 'Wählen Sie eine anzuzeigende Nachricht aus',
   },
   question: {

wegas-app/src/main/node/wegas-react/src/i18n/components/definitions.ts

@@ -3,6 +3,7 @@ export interface ComponentsTranslations {
     subject: string;
     sender: string;
     date: string;
+    attachments: string;
     noSelectionMessage: string;
   };
   question: {

wegas-app/src/main/node/wegas-react/src/i18n/components/en.ts

@@ -5,6 +5,7 @@ export const EN: ComponentsTranslations = {
     subject: 'Subject',
     sender: 'From',
     date: 'Date',
+    attachments: 'Attachment(s)',
     noSelectionMessage: 'Choose a message to display',
   },
   question: {

wegas-app/src/main/node/wegas-react/src/i18n/components/fr.ts

@@ -5,6 +5,7 @@ export const FR: ComponentsTranslations = {
     subject: 'Objet',
     sender: 'De',
     date: 'Date',
+    attachments: 'Pièce(s) jointe(s)',
     noSelectionMessage: 'Choisissez un message à afficher',
   },
   question: {

wegas-app/src/main/node/wegas-react/src/i18n/components/it.ts

@@ -5,6 +5,7 @@ export const IT: ComponentsTranslations = {
     subject: 'Oggetto',
     sender: 'Da',
     date: 'Data',
+    attachments: 'Alegato/i',
     noSelectionMessage: 'Scegli un messaggio da vasualizzare',
   },
   question: {

wegas-app/src/main/webapp/wegas-app/jsf/app-default.xhtml

@@ -44,6 +44,9 @@
                 </ui:fragment>
 
 
+                <!-- Self hosted mutation events polyfill -->
+                <script type="text/javascript" src="#{request.contextPath}/lib/mutation-events-polyfill/mutation_events.min.js"></script>
+
                 <!-- Self hosted YUI 3 -->
                 <script type="text/javascript" src="#{request.contextPath}/lib/yui3/build/yui/yui-min.js"></script>
 

wegas-core/src/main/java/com/wegas/resourceManagement/ejb/ResourceFacade.java

@@ -27,8 +27,6 @@
 import com.wegas.resourceManagement.persistence.TaskDescriptor;
 import com.wegas.resourceManagement.persistence.TaskInstance;
 import com.wegas.resourceManagement.persistence.WRequirement;
-import java.util.Collection;
-import java.util.Set;
 import jakarta.ejb.LocalBean;
 import jakarta.ejb.Stateless;
 import jakarta.inject.Inject;
@@ -37,6 +35,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+import java.util.Set;
+
 /**
  *
  * @author Francois-Xavier Aeberhard (fx at red-agent.com)
@@ -398,6 +399,7 @@ public void reviveTaskDescriptor(TaskDescriptor task) {
              * New predecessor's names : be sure they're registered
              */
             task.getPredecessors().clear();
+            this.getEntityManager().flush();
 
             for (String predecessorName : predecessorNames) {
                 try {

wegas-resources/pom.xml

@@ -63,6 +63,7 @@
                         <exclude>lib/jsPlumb/**</exclude>
                         <exclude>lib/tiny_mce/**</exclude>
                         <exclude>lib/yui3/**</exclude>
+                        <exclude>lib/mutation-events-polyfill/**</exclude>
                     </excludes>
                     <statistics>false</statistics>
                     <jswarn>false</jswarn>

wegas-resources/src/main/webapp/lib/mutation-events-polyfill/LICENSE

@@ -0,0 +1,28 @@
+BSD 3-Clause License
+
+Copyright (c) 2023, Mason Freed
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.