From 63949a9416206bc38a197c35ea3846a5642eedb1 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 29 Jul 2020 12:07:26 +0200 Subject: [PATCH] fixed action disappearing on empty list --- .../seb/sebserver/gui/content/ConfigTemplateForm.java | 8 ++++---- .../seb/sebserver/gui/content/ConfigTemplateList.java | 4 ++-- .../ch/ethz/seb/sebserver/gui/content/ExamList.java | 4 ++-- .../seb/sebserver/gui/content/InstitutionList.java | 10 +++++----- .../ethz/seb/sebserver/gui/content/LmsSetupList.java | 6 +++--- .../ethz/seb/sebserver/gui/content/QuizLookupList.java | 4 ++-- .../seb/sebserver/gui/content/SEBClientConfigList.java | 6 +++--- .../ethz/seb/sebserver/gui/content/SEBClientLogs.java | 2 +- .../seb/sebserver/gui/content/SEBExamConfigForm.java | 2 +- .../seb/sebserver/gui/content/SEBExamConfigList.java | 4 ++-- .../seb/sebserver/gui/content/UserAccountList.java | 6 +++--- .../seb/sebserver/gui/content/UserActivityLogs.java | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateForm.java index 76ebeb9f..f51b944d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateForm.java @@ -251,7 +251,7 @@ public class ConfigTemplateForm implements TemplateComposer { attrTable::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY) - .publishIf(() -> attrTable.hasAnyContent() && modifyGrant, false) + .publishIf(() -> modifyGrant, false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_SET_DEFAULT) .withParentEntityKey(entityKey) @@ -260,7 +260,7 @@ public class ConfigTemplateForm implements TemplateComposer { action -> this.resetToDefaults(action, attrTable), EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY) .noEventPropagation() - .publishIf(() -> attrTable.hasAnyContent() && modifyGrant, false) + .publishIf(() -> modifyGrant, false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_LIST_REMOVE_VIEW) .withParentEntityKey(entityKey) @@ -269,7 +269,7 @@ public class ConfigTemplateForm implements TemplateComposer { action -> this.removeFormView(action, attrTable), EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY) .noEventPropagation() - .publishIf(() -> attrTable.hasAnyContent() && modifyGrant, false) + .publishIf(() -> modifyGrant, false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_ATTR_LIST_ATTACH_DEFAULT_VIEW) .withParentEntityKey(entityKey) @@ -278,7 +278,7 @@ public class ConfigTemplateForm implements TemplateComposer { action -> this.attachView(action, attrTable), EMPTY_ATTRIBUTE_SELECTION_TEXT_KEY) .noEventPropagation() - .publishIf(() -> attrTable.hasAnyContent() && modifyGrant, false); + .publishIf(() -> modifyGrant, false); } pageActionBuilder diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java index e6c18655..f1acf82f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java @@ -148,12 +148,12 @@ public class ConfigTemplateList implements TemplateComposer { .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_VIEW_FROM_LIST) .withSelect(templateTable::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_TEMPLATE_SELECTION_TEXT_KEY) - .publishIf(templateTable::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_TEMPLATE_MODIFY_FROM_LIST) .withSelect( templateTable.getGrantedSelection(this.currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), PageAction::applySingleSelectionAsEntityKey, EMPTY_TEMPLATE_SELECTION_TEXT_KEY) - .publishIf(() -> examConfigGrant.im() && templateTable.hasAnyContent(), false); + .publishIf(() -> examConfigGrant.im(), false); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java index db82db77..c22318db 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java @@ -209,14 +209,14 @@ public class ExamList implements TemplateComposer { actionBuilder .newAction(ActionDefinition.EXAM_VIEW_FROM_LIST) .withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(table::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.EXAM_MODIFY_FROM_LIST) .withSelect( table.getGrantedSelection(currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), action -> modifyExam(action, table), EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> userGrant.im() && table.hasAnyContent(), false); + .publishIf(() -> userGrant.im(), false); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java index 2a33e021..09246655 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java @@ -87,8 +87,8 @@ public class InstitutionList implements TemplateComposer { final Composite content = this.pageService .getWidgetFactory() .defaultPageLayout( - pageContext.getParent(), - TITLE_TEXT_KEY); + pageContext.getParent(), + TITLE_TEXT_KEY); final PageActionBuilder pageActionBuilder = this.pageService.pageActionBuilder(pageContext.clearEntityKeys()); @@ -142,19 +142,19 @@ public class InstitutionList implements TemplateComposer { table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(table::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.INSTITUTION_MODIFY_FROM_LIST) .withSelect( table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> instGrant.m() && table.hasAnyContent(), false) + .publishIf(() -> instGrant.m(), false) .newAction(ActionDefinition.INSTITUTION_TOGGLE_ACTIVITY) .withExec(this.pageService.activationToggleActionFunction(table, EMPTY_SELECTION_TEXT_KEY)) .withConfirm(this.pageService.confirmDeactivation(table)) - .publishIf(() -> instGrant.m() && table.hasAnyContent(), false); + .publishIf(() -> instGrant.m(), false); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupList.java index 781759e5..bd8e85c7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/LmsSetupList.java @@ -169,13 +169,13 @@ public class LmsSetupList implements TemplateComposer { .newAction(ActionDefinition.LMS_SETUP_VIEW_FROM_LIST) .withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(table::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.LMS_SETUP_MODIFY_FROM_LIST) .withSelect( table.getGrantedSelection(currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> userGrant.im() && table.hasAnyContent(), false) + .publishIf(() -> userGrant.im(), false) .newAction(ActionDefinition.LMS_SETUP_TOGGLE_ACTIVITY) .withSelect( @@ -186,7 +186,7 @@ public class LmsSetupList implements TemplateComposer { action -> LmsSetupForm.testLmsSetup(action, null, restService)), EMPTY_SELECTION_TEXT_KEY) .withConfirm(this.pageService.confirmDeactivation(table)) - .publishIf(() -> userGrant.iw() && table.hasAnyContent(), false); + .publishIf(() -> userGrant.iw(), false); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java index 8f94aeaa..9e6adcd8 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java @@ -235,7 +235,7 @@ public class QuizLookupList implements TemplateComposer { institutionNameFunction), EMPTY_SELECTION_TEXT) .noEventPropagation() - .publishIf(table::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.QUIZ_DISCOVERY_EXAM_IMPORT) .withConfirm(importQuizConfirm(table, restService)) @@ -243,7 +243,7 @@ public class QuizLookupList implements TemplateComposer { table.getGrantedSelection(currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), action -> this.importQuizData(action, table), EMPTY_SELECTION_TEXT) - .publishIf(() -> examGrant.im() && table.hasAnyContent(), false); + .publishIf(() -> examGrant.im(), false); } private static Function quizDataLmsSetupNameFunction(final ResourceService resourceService) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigList.java index 37882509..878732a5 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigList.java @@ -172,13 +172,13 @@ public class SEBClientConfigList implements TemplateComposer { .newAction(ActionDefinition.SEB_CLIENT_CONFIG_VIEW_FROM_LIST) .withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(table::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.SEB_CLIENT_CONFIG_MODIFY_FROM_LIST) .withSelect( table.getGrantedSelection(this.currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> clientConfigGrant.im() && table.hasAnyContent(), false) + .publishIf(() -> clientConfigGrant.im(), false) .newAction(ActionDefinition.SEB_CLIENT_CONFIG_TOGGLE_ACTIVITY) .withSelect( @@ -186,7 +186,7 @@ public class SEBClientConfigList implements TemplateComposer { this.pageService.activationToggleActionFunction(table, EMPTY_SELECTION_TEXT_KEY), EMPTY_SELECTION_TEXT_KEY) .withConfirm(this.pageService.confirmDeactivation(table)) - .publishIf(() -> clientConfigGrant.im() && table.hasAnyContent(), false); + .publishIf(() -> clientConfigGrant.im(), false); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java index c273ed80..95bbbcf1 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java @@ -185,7 +185,7 @@ public class SEBClientLogs implements TemplateComposer { action -> this.sebClientLogDetailsPopup.showDetails(action, table.getSingleSelectedROWData()), EMPTY_SELECTION_TEXT) .noEventPropagation() - .publishIf(table::hasAnyContent, false); + .publish(false); } private Function examNameFunction() { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java index 2895d0e4..c2714dd0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigForm.java @@ -336,7 +336,7 @@ public class SEBExamConfigForm implements TemplateComposer { return pageAction.withEntityKey( new EntityKey(selectedExamMapping.examId, EntityType.EXAM)); }) - .publishIf(table::hasAnyContent, false); + .publish(false); } } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigList.java index 3b11f1d7..8262ac13 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SEBExamConfigList.java @@ -161,13 +161,13 @@ public class SEBExamConfigList implements TemplateComposer { .newAction(ActionDefinition.SEB_EXAM_CONFIG_VIEW_PROP_FROM_LIST) .withSelect(configTable::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(configTable::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_MODIFY_PROP_FROM_LIST) .withSelect( configTable.getGrantedSelection(this.currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> examConfigGrant.im() && configTable.hasAnyContent(), false) + .publishIf(() -> examConfigGrant.im(), false) .newAction(ActionDefinition.SEB_EXAM_CONFIG_IMPORT_TO_NEW_CONFIG) .withSelect( diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java index d5c8e42a..aced249e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java @@ -223,16 +223,16 @@ public class UserAccountList implements TemplateComposer { .newAction(ActionDefinition.USER_ACCOUNT_VIEW_FROM_LIST) .withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(table::hasAnyContent, false) + .publish(false) .newAction(ActionDefinition.USER_ACCOUNT_MODIFY_FROM_LIST) .withSelect(table::getSelection, this::editAction, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> userGrant.im() && table.hasAnyContent(), false) + .publishIf(() -> userGrant.im(), false) .newAction(ActionDefinition.USER_ACCOUNT_TOGGLE_ACTIVITY) .withExec(this.pageService.activationToggleActionFunction(table, EMPTY_SELECTION_TEXT_KEY)) .withConfirm(this.pageService.confirmDeactivation(table)) - .publishIf(() -> userGrant.m() && table.hasAnyContent(), false); + .publishIf(() -> userGrant.m(), false); } private PageAction editAction(final PageAction pageAction) { diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java index 8b8229c7..358d971a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java @@ -216,7 +216,7 @@ public class UserActivityLogs implements TemplateComposer { action -> this.showDetails(action, table.getSingleSelectedROWData()), EMPTY_SELECTION_TEXT) .noEventPropagation() - .publishIf(table::hasAnyContent, false); + .publish(false); }