Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IVYPORTAL-17918 Notification bug: some lines have no message and cause error when clicking Start #1247

Merged
merged 11 commits into from
Nov 25, 2024
Merged

IVYPORTAL-17918 Notification bug: some lines have no message and cause error when clicking Start #1247

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5db82eb
IVYPORTAL-17855 Various or urgent requests in IVYPORTAL - S267 > IVYP…
mnhnam-axonivy Oct 31, 2024
1dee5d3
Merge branch 'master' of https://github.com/axonivy-market/portal
nhthinh-axonivy Nov 18, 2024
4121f4d
Merge branch 'master' of https://github.com/axonivy-market/portal
nhthinh-axonivy Nov 19, 2024
b77d51b
Merge branch 'master' of https://github.com/axonivy-market/portal
nhthinh-axonivy Nov 21, 2024
44d3f8f
master
nhthinh-axonivy Nov 21, 2024
eff77ea
Merge branch 'master' of https://github.com/axonivy-market/portal
nhthinh-axonivy Nov 21, 2024
17403e3
Merge branch 'master' of https://github.com/axonivy-market/portal
nhthinh-axonivy Nov 22, 2024
fe05a20
bug/IVYPORTAL-17918-BUG-Notification-bug-some-lines-have-no-message-a…
nhthinh-axonivy Nov 22, 2024
9cd40f4
Merge branch 'master' of https://github.com/axonivy-market/portal
nhthinh-axonivy Nov 22, 2024
674e2e8
bug/IVYPORTAL-17918-BUG-Notification-bug-some-lines-have-no-message-a…
nhthinh-axonivy Nov 22, 2024
3adbdbc
bug/IVYPORTAL-17918-BUG-Notification-bug-some-lines-have-no-message-a…
nhthinh-axonivy Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions AxonIvyPortal/portal/src/com/axonivy/portal/bean/NotificationBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,8 @@ private void handleTask(Consumer<ITask> taskHandler) {
}
}

public boolean isActionAvailible(NotificationDto dto) {
return dto.getRunAction() != null;
}

}
25 changes: 15 additions & 10 deletions ...ortal/src_hd/com/axonivy/portal/component/NotificationFullPage/NotificationFullPage.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,26 @@
<p:tooltip for="notification-mark-as-read"
value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/notifications/markAsRead')}" />
</div>
<div class="flex notification-message-block flex-column">
<p:commandLink id="notification-message" styleClass="notification-message"
actionListener="#{notificationBean.goToTaskDetail(notification)}" rendered="#{notification.infoAction != null}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</p:commandLink>
<p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
<h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
</div>
<div class="flex notification-action-block">
<div class="flex notification-message-block flex-column">
<h:panelGroup rendered="#{notification.infoAction != null}">
<p:commandLink id="notification-message" styleClass="notification-message"
actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</p:commandLink>
<p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
</h:panelGroup>
<h:panelGroup rendered="#{notification.infoAction == null}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</h:panelGroup>
<h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
</div>
<p:outputPanel rendered="#{notificationBean.isActionAvailible(notification)}" styleClass="flex notification-action-block">
<p:commandLink id="notification-start-task" styleClass="notification-start-task"
actionListener="#{notificationBean.startTask(notification)}" rendered="#{notification.runAction != null}">
<i class="fa fa-play notification-start-task-icon" />
</p:commandLink>
<p:tooltip for="notification-start-task" value="#{notification.runAction.title}" />
</div>
</p:outputPanel>
</div>
</div>
</p:dataScroller>
Expand Down
17 changes: 11 additions & 6 deletions ...src_hd/com/axonivy/portal/dashboard/component/NotificationWidget/NotificationWidget.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,26 @@
value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/notifications/markAsRead')}" />
</div>
<div class="flex notification-message-block flex-column">
<p:commandLink id="notification-message" styleClass="notification-message" actionListener="#{widget.goToTaskDetail(notification)}"
rendered="#{notification.infoAction != null}" disabled="#{!isReadOnlyMode}" >
<h:panelGroup rendered="#{notification.infoAction != null}">
<p:commandLink id="notification-message"
styleClass="notification-message"
actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</p:commandLink>
<p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
<p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
<p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
</h:panelGroup>
<h:panelGroup rendered="#{notification.infoAction == null}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</h:panelGroup>
<h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
</div>
<div class="flex notification-action-block">
<p:outputPanel rendered="#{notificationBean.isActionAvailible(notification)}" styleClass="flex notification-action-block">
<p:commandLink disabled="#{!isReadOnlyMode}" id="notification-start-task" styleClass="notification-start-task"
actionListener="#{widget.startTaskFromNoti(notification)}" rendered="#{notification.runAction != null}" >
<i class="fa fa-play notification-start-task-icon" />
</p:commandLink>
<p:tooltip for="notification-start-task" value="#{notification.runAction.title}" />
</div>
</p:outputPanel>
</div>
</div>
</p:dataScroller>
Expand Down
20 changes: 12 additions & 8 deletions AxonIvyPortal/portal/webContent/layouts/includes/notification.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,26 @@
value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/notifications/markAsRead')}" />
</div>
<div class="flex notification-message-block flex-column">
<p:commandLink id="notification-message" styleClass="notification-message"
actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}"
rendered="#{notification.infoAction != null}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</p:commandLink>
<h:panelGroup rendered="#{notification.infoAction != null}">
<p:commandLink id="notification-message" styleClass="notification-message"
actionListener="#{notificationBean.goToNotificationDetail(notification, isWorkingOnATask, task)}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</p:commandLink>
<p:tooltip for="notification-message" value="#{notification.infoAction.title}" />
<h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
</h:panelGroup>
<h:panelGroup rendered="#{notification.infoAction == null}">
<h:outputText value="#{htmlSanitizerBean.sanitize(notification.message)}" />
</h:panelGroup>
<h:outputText value="#{notification.timeSince}" styleClass="font-normal notifications-item-time-since" />
</div>
<div class="flex notification-action-block">
<p:outputPanel rendered="#{notificationBean.isActionAvailible(notification)}" styleClass="flex notification-action-block">
<p:commandLink id="notification-start-task"
styleClass="notification-start-task"
actionListener="#{notificationBean.startTaskFromNotification(notification, isWorkingOnATask, task)}">
<i class="fa fa-play notification-start-task-icon" />
</p:commandLink>
<p:tooltip for="notification-start-task" value="#{notification.runAction.title}" />
</div>
</p:outputPanel>
</div>
</div>
</p:dataScroller>
Expand Down
Loading