This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 825fda9b59 ISIS-3109: surface the user's current time-zone in the UI
via ApplicationUser_timeZone (new mixin)
825fda9b59 is described below
commit 825fda9b59d5aeb60aae720ff71b9e5193da97e5
Author: Andi Huber <[email protected]>
AuthorDate: Wed Aug 3 14:55:30 2022 +0200
ISIS-3109: surface the user's current time-zone in the UI via
ApplicationUser_timeZone (new mixin)
---
.../isis/commons/internal/base/_Temporals.java | 8 +++
.../secman/applib/IsisModuleExtSecmanApplib.java | 2 +
.../secman/applib/user/dom/ApplicationUser.java | 19 ++++---
.../user/dom/mixins/ApplicationUser_timeZone.java | 61 ++++++++++++++++++++++
4 files changed, 82 insertions(+), 8 deletions(-)
diff --git
a/commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
b/commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
index 2d4013295e..cc01da783b 100644
---
a/commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
+++
b/commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
@@ -21,6 +21,7 @@ package org.apache.isis.commons.internal.base;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Timestamp;
+import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -99,6 +100,13 @@ public final class _Temporals {
.appendPattern("VV")
.toFormatter(Locale.US); // arbitrarily picking a locale, just in
case; (should have no effect)
+ public String formatZoneId(final ZoneId zoneId, final DateTimeFormatter
zoneOnlyFormatter) {
+ return zoneOnlyFormatter.format(ZonedDateTime.ofInstant(Instant.EPOCH,
zoneId));
+ }
+
+ public String formatZoneId(final ZoneId zoneId) {
+ return formatZoneId(zoneId, DEFAULT_ZONEID_ONLY_FORMAT);
+ }
// -- TEMPORAL TO STRING CONVERTERS
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/IsisModuleExtSecmanApplib.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/IsisModuleExtSecmanApplib.java
index 15e8bfaa97..a5e6d67f9c 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/IsisModuleExtSecmanApplib.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/IsisModuleExtSecmanApplib.java
@@ -62,6 +62,7 @@ import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_
import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_lock;
import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_removeRoles;
import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_resetPassword;
+import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_timeZone;
import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_unlock;
import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_updateAccountType;
import
org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_updateAtPath;
@@ -148,6 +149,7 @@ import
org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
ApplicationUser_effectiveMemberPermissions.class,
ApplicationUser_removeRoles.class,
ApplicationUser_resetPassword.class,
+ ApplicationUser_timeZone.class,
ApplicationUser_unlock.class,
ApplicationUser_updateAccountType.class,
ApplicationUser_updateAtPath.class,
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
index a0e0ef1026..4aeddbaa8a 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
@@ -646,19 +646,17 @@ public abstract class ApplicationUser
// -- IS FOR SELF OR RUN AS ADMINISTRATOR
@Programmatic
- public boolean isForSelfOrRunAsAdministrator() {
+ public boolean isForSelf() {
val currentUser = currentUser();
val currentUserName = currentUser.getName();
- // is for self?
val forSelf = Objects.equals(getUsername(), currentUserName);
- if(forSelf) {
- return true;
- }
-
- // is runAsAdministrator?
+ return forSelf;
+ }
+ @Programmatic
+ public boolean isRunAsAdministrator() {
+ val currentUser = currentUser();
val adminRoleSuffix = ":" + getAdminRoleName();
-
for (final RoleMemento role : currentUser.getRoles()) {
final String roleName = role.getName();
// format is realmName:roleName.
@@ -671,6 +669,11 @@ public abstract class ApplicationUser
return false;
}
+ @Programmatic
+ public boolean isForSelfOrRunAsAdministrator() {
+ return isForSelf()
+ || isRunAsAdministrator();
+ }
// -- HELPERS
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
new file mode 100644
index 0000000000..4377aac9e1
--- /dev/null
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.extensions.secman.applib.user.dom.mixins;
+
+import javax.inject.Inject;
+
+import org.springframework.lang.Nullable;
+
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.services.user.UserCurrentSessionTimeZoneHolder;
+import org.apache.isis.commons.internal.base._Temporals;
+import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
+
+import lombok.RequiredArgsConstructor;
+
+@Property(editing = Editing.DISABLED)
+@PropertyLayout(
+ fieldSetId = "regional",
+ describedAs = "Timezone ID as stored in your current session.
(Logout/Login to change.)",
+ sequence = "2"
+)
+@RequiredArgsConstructor
+public class ApplicationUser_timeZone {
+
+ private final ApplicationUser mixee;
+
+ @Inject private UserCurrentSessionTimeZoneHolder
userCurrentSessionTimeZoneHolder;
+
+ @MemberSupport
+ @Nullable
+ public String prop() {
+ return userCurrentSessionTimeZoneHolder.getUserTimeZone()
+ .map(_Temporals::formatZoneId)
+ .orElse(null);
+ }
+
+ @MemberSupport public boolean hideProp() {
+ // time-zone information only makes sense in the context of the
current (logged on) user
+ return !mixee.isForSelf();
+ }
+
+}
