Skip to content

Eliminate DiscussionService #573

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

Merged
labkey-adam merged 2 commits into from
Oct 7, 2025
+11 −12
Merged

Eliminate DiscussionService #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76f3c21
Eliminate DiscussionService
labkey-adam Oct 2, 2025
91bd800
Merge remote-tracking branch 'origin/develop' into fb_86_discussions
labkey-adam Oct 4, 2025
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
20 changes: 10 additions & 10 deletions panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.Test;
import org.labkey.api.announcements.DiscussionService.StatusOption;
import org.labkey.api.announcements.api.Announcement;
import org.labkey.api.announcements.api.AnnouncementService;
import org.labkey.api.announcements.api.AnnouncementService.StatusOption;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.markdown.MarkdownService;
Expand Down Expand Up @@ -97,7 +97,7 @@ private static void notifyUserAction(ExperimentAnnotations expAnnotations, Journ
.append(" You will receive a confirmation message after your data has been copied.");
messageBody.append(NL);
appendSubmissionDetails(expAnnotations, journal, je, submission, currentJournalCopy, messageBody);
postNotification(expAnnotations, journal, je, messageBody, true, action.title(), StatusOption.Active, user);
postNotification(expAnnotations, journal, je, messageBody, true, action.title(), AnnouncementService.StatusOption.Active, user);
}

@NotNull
Expand All @@ -120,7 +120,7 @@ public static void notifyDeleted(ExperimentAnnotations expAnnotations, Journal j
messageBody.append(NL).append("* Folder: ").append(getContainerLink(expAnnotations.getContainer()));
messageBody.append(NL).append("* ExperimentID: ").append(expAnnotations.getId());

postNotification(expAnnotations, journal, je, messageBody, false, ACTION.DELETED.title(), StatusOption.Closed, user);
postNotification(expAnnotations, journal, je, messageBody, false, ACTION.DELETED.title(), AnnouncementService.StatusOption.Closed, user);
}

public static void notifyCopied(ExperimentAnnotations srcExpAnnotations, ExperimentAnnotations targetExpAnnotations, Journal journal,
Expand All @@ -133,7 +133,7 @@ public static void notifyCopied(ExperimentAnnotations srcExpAnnotations, Experim
ACTION action = isRecopy ? ACTION.RECOPIED : ACTION.COPIED;

postNotification(journal, je, messageBody, user /* User is either a site admin or a Panorama Public admin, and should have permissions to post*/,
action.title(), StatusOption.Closed, getNotifyList(srcExpAnnotations, user));
action.title(), AnnouncementService.StatusOption.Closed, getNotifyList(srcExpAnnotations, user));
}

public static void notifyDataPublished(ExperimentAnnotations srcExperiment, ExperimentAnnotations journalCopy, Journal journal,
Expand Down Expand Up @@ -194,8 +194,8 @@ else if (addedPublication)

postNotification(srcExperiment, journal, je, messageBody, false, ACTION.PUBLISHED.title(),
(doiError != null || journalCopy.hasPxid())
? StatusOption.Active
: StatusOption.Closed,
? AnnouncementService.StatusOption.Active
: AnnouncementService.StatusOption.Closed,
user);
}

Expand All @@ -209,7 +209,7 @@ public static void notifyCatalogEntryAdded(ExperimentAnnotations srcExperiment,
.append(LookAndFeelProperties.getInstance(ContainerManager.getRoot()).getShortName())
.append(" (").append(AppProps.getInstance().getBaseServerUrl()).append(").");

postNotification(srcExperiment, journal, je, messageBody, false, ACTION.CATALOG_ENTRY.title(), StatusOption.Active, user);
postNotification(srcExperiment, journal, je, messageBody, false, ACTION.CATALOG_ENTRY.title(), AnnouncementService.StatusOption.Active, user);
}

private static void postNotification(ExperimentAnnotations experimentAnnotations, Journal journal, JournalExperiment je,
Expand Down Expand Up @@ -319,7 +319,7 @@ public static void postPrivateStatusExtensionMessage(@NotNull Journal journal, @
messageBody.append(NL2).append("Best regards,");
messageBody.append(NL).append(getUserName(journalAdmin));

postNotificationFullTitle(journal, je, messageBody.toString(), journalAdmin, messageTitle, StatusOption.Closed, null);
postNotificationFullTitle(journal, je, messageBody.toString(), journalAdmin, messageTitle, AnnouncementService.StatusOption.Closed, null);
}

public static void postDataDeletionRequestMessage(@NotNull Journal journal, @NotNull JournalExperiment je, @NotNull ExperimentAnnotations expAnnotations, User submitter)
Expand Down Expand Up @@ -355,7 +355,7 @@ public static void postDataDeletionRequestMessage(@NotNull Journal journal, @Not
messageBody.append(NL2).append("Best regards,");
messageBody.append(NL).append(getUserName(journalAdmin));

postNotificationFullTitle(journal, je, messageBody.toString(), journalAdmin, messageTitle, StatusOption.Active, null);
postNotificationFullTitle(journal, je, messageBody.toString(), journalAdmin, messageTitle, AnnouncementService.StatusOption.Active, null);
}


Expand All @@ -365,7 +365,7 @@ public static void postPrivateDataReminderMessage(@NotNull Journal journal, @Not
{
String message = getDataStatusReminderMessage(expAnnotations, submitter, js, announcement, announcementsContainer, journalAdmin);
String title = "Action Required: Status Update for Your Private Data on Panorama Public";
postNotificationFullTitle(journal, js.getJournalExperiment(), message, messagePoster, title, StatusOption.Closed, notifyUsers);
postNotificationFullTitle(journal, js.getJournalExperiment(), message, messagePoster, title, AnnouncementService.StatusOption.Closed, notifyUsers);
}

public static String getDataStatusReminderMessage(@NotNull ExperimentAnnotations exptAnnotations, @NotNull User submitter,
Expand Down
3 changes: 1 addition & 2 deletions panoramapublic/src/org/labkey/panoramapublic/pipeline/PostPanoramaPublicMessageJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.labkey.api.announcements.DiscussionService;
import org.labkey.api.announcements.api.Announcement;
import org.labkey.api.announcements.api.AnnouncementService;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -132,7 +131,7 @@ private void postMessage()
notifyList.add(expAnnotations.getLabHeadUser());
}
PanoramaPublicNotification.postNotification(journal, submission.getJournalExperiment(), placeholdersSubstituted, submitter, getUser(),
title, DiscussionService.StatusOption.Closed, notifyList);
title, AnnouncementService.StatusOption.Closed, notifyList);
}

done++;
Expand Down