Bug/ivyportal 18043 cannot remove edit process widget which contains …

…wrong process (#1273) * bug/IVYPORTAL-18043-Cannot-remove-edit-process-widget-which-contains-wrong-process-ID - Reorder action menu in Edit mode * bug/IVYPORTAL-18043-Cannot-remove-edit-process-widget-which-contains-wrong-process-ID - Update css * bug/IVYPORTAL-18043-Cannot-remove-edit-process-widget-which-contains-wrong-process-ID - Update css
axonivy-market · Nov 28, 2024 · d091264 · d091264
1 parent 0d9175e
commit d091264
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.../src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ProcessWidget.xhtml b/.../src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ProcessWidget.xhtml
@@ -120,7 +120,7 @@
         </ui:include>
       </ui:fragment>
 
-      <h:panelGroup id="empty-process"
+      <h:panelGroup id="empty-process" styleClass="h-full"
         rendered="#{(displayMode eq 'COMBINED_MODE' or displayMode eq 'FULL_MODE' or displayMode eq 'IMAGE_MODE') and widget.process eq null}">
         <h:panelGroup id="empty-process-actions" rendered="#{!isReadOnlyMode}" styleClass="process-grid-item__action--combined">
           <p:commandButton id="empty-process-edit-widget" styleClass="rounded-button ui-button-outlined u-mar-right-5" global="false" icon="si si-pencil"
@@ -136,7 +136,7 @@
             trackMouse="true" hideEvent="mouseleave click" />
         </h:panelGroup>
 
-        <h:panelGroup styleClass="process-dashboard-widget__empty-process empty-message-container" layout="block">
+        <h:panelGroup styleClass="process-dashboard-widget__empty-process empty-message-container static" layout="block">
           <i class="#{widget.hasPermissionToSee ? 'si si-alert-circle' : 'si si-lock-1'} empty-message-icon" />
           <br />
           <h:outputText value="#{widget.emptyProcessMessage}" styleClass="empty-message-text" />

diff --git a/...l/generic/dashboard/component/ProcessWidgetConfiguration/ProcessWidgetConfiguration.xhtml b/...l/generic/dashboard/component/ProcessWidgetConfiguration/ProcessWidgetConfiguration.xhtml
@@ -241,7 +241,7 @@
 
   <!-- Preview -->
   <h:panelGroup id="widget-preview" styleClass="card widget-preview widget-preview--process" layout="block">
-    <div class="ui-g #{isCompact ? 'widget-preview--compact' : ''} #{isFull ? 'widget-preview--full' : ''} #{isCombined ? 'widget-preview--combined' : ''} #{isImage ? 'widget-preview--image-width' : ''}">
+    <div class="ui-g #{isCompact ? 'widget-preview--compact' : ''} #{isFull ? 'widget-preview--full h-full' : ''} #{isCombined ? 'widget-preview--combined h-full' : ''} #{isImage ? 'widget-preview--image-width' : ''}">
       <div class="ui-g-12 widget-preview__header">
         <h2>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/preview')}</h2>
         <h:outputText value="#{ivy.cms.co('/Dialogs/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidgetConfiguration/DragAndDropToChangeOrder')}" 

diff --git a/...src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml b/...src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml
@@ -51,19 +51,19 @@
           actionListener="#{cc.attrs.actionListenerOnEditProcess}"
           update="#{cc.attrs.componentToUpdateOnEditProcess}"
           rendered="#{canModify}" />
-        <p:menuitem id="delete-process"
-          value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-          icon="si si-bin-1"
-          oncomplete="#{cc.attrs.onCompleteDeleteProcess}"
-          actionListener="#{cc.attrs.actionListenerOnDeleteProcess}"
-          update="#{cc.attrs.componentToUpdateOnDeleteProcess}"
-          rendered="#{canModify}" />
         <p:menuitem id="more-information"
           icon="si si-information-circle"
           url="#{processWidgetBean.getProcessInformationPageUrl(process)}"
           value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/processwidget/MoreInformation')}"
           disabled="#{!cc.attrs.isReadOnlyMode or cc.attrs.isInConfiguration}"
           rendered="#{processWidgetBean.isShowInformationLink(process) and !isExternalLink and !isCaseMap}"/>
+        <p:menuitem id="delete-process"
+          value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
+          icon="si si-bin-1" styleClass="color-destroy"
+          oncomplete="#{cc.attrs.onCompleteDeleteProcess}"
+          actionListener="#{cc.attrs.actionListenerOnDeleteProcess}"
+          update="#{cc.attrs.componentToUpdateOnDeleteProcess}"
+          rendered="#{canModify}" />
       </p:menu>
     </h:panelGroup>
     <div class="start-process" id="start-button-wrap-#{cc.attrs.status.index}" >

diff --git a/AxonIvyPortal/portal/webContent/resources/css/dashboard.css b/AxonIvyPortal/portal/webContent/resources/css/dashboard.css
@@ -1096,6 +1096,7 @@ body .ui-widget.new-widget-dialog__introduction {
   align-content: center;
   width: 100%;
   height: 90%;
+  display: grid;
 }
 
 .process-dashboard-widget__empty-process.empty-message-container {
@@ -1170,9 +1171,9 @@ body .ui-widget.new-widget-dialog__introduction {
 }
 
 .process-grid-item__action--combined {
-  padding: 20px;
-  padding-bottom: 0;
+  padding: 8px;
   float: right;
+  height: 10%
 }
 
 .process-widget--combined {