Skip to content

Progress.hide() does not work when called from Static Progress EXO #483

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
merged 6 commits into from
Jan 27, 2022
Merged

Progress.hide() does not work when called from Static Progress EXO #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f96a59
Use $ for explicit log name
ggallotti Nov 24, 2021
129304e
Always send progress to Client. Do not check if it running.
ggallotti Nov 26, 2021
d79c7eb
Remove running var
ggallotti Nov 29, 2021
a2ab1cc
Merge branch 'master' into websocket-ide
ggallotti Nov 29, 2021
e33912f
Merge branch 'master' into websocket-ide
ggallotti Jan 27, 2022
8328148
Merge branch 'master' into websocket-ide
ggallotti Jan 27, 2022
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
3 changes: 2 additions & 1 deletion common/src/main/java/com/genexus/diagnostics/UserLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ public static ILogger getMainLogger() {
private static ILogger getLogger(String topic) {
ILogger log;
if (topic != null && topic.length() > 0) {
log = LogManager.getLogger(String.format("%s.%s", defaultUserLogNamespace, topic.trim()));
String loggerName = topic.startsWith("$") ? topic.substring(1): String.format("%s.%s", defaultUserLogNamespace, topic.trim());
log = LogManager.getLogger(loggerName);
}
else {
log = getMainLogger();
Expand Down
19 changes: 5 additions & 14 deletions java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ public class GXWebProgressIndicator
private GXWebNotification notification;
private GXWebProgressIndicatorInfo info;
private ModelContext context;
private boolean running = false;


public GXWebProgressIndicator(ModelContext gxContext)
{
Expand All @@ -20,34 +18,28 @@ public GXWebProgressIndicator(ModelContext gxContext)

public void show()
{
running = true;
setAction("0");
updateProgress();
}

private void updateProgress()
{
if (running)
{
GXWebNotificationInfo notif = new GXWebNotificationInfo(0,context,"");
notif.setId(GXWebProgressIndicator.ID);
notif.setGroupName(GXWebProgressIndicator.ID);
notif.setMessage(info);
notification.notify(notif);
}
GXWebNotificationInfo notif = new GXWebNotificationInfo(0,context,"");
notif.setId(GXWebProgressIndicator.ID);
notif.setGroupName(GXWebProgressIndicator.ID);
notif.setMessage(info);
notification.notify(notif);
}

public void showWithTitle(String title)
{
running = true;
setTitle(title);
setAction("1");
updateProgress();
}

public void showWithTitleAndDescription(String title, String desc)
{
running = true;
setTitle(title);
setDescription(desc);
setAction("2");
Expand All @@ -58,7 +50,6 @@ public void hide()
{
setAction("3");
updateProgress();
running = false;
}

private String getAction() {
Expand Down