2 lines only

make the creation date a tooltip of the expiration

Author: mawinter69

core/src/main/java/jenkins/security/ApiTokenProperty.java

@@ -28,6 +28,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import hudson.Extension;
+import hudson.Functions;
 import hudson.Util;
 import hudson.model.Descriptor.FormException;
 import hudson.model.User;
@@ -44,6 +45,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -274,7 +276,8 @@ public TokenInfoAndStats(@NonNull ApiTokenStore.HashedToken token, @NonNull ApiT
             if (expirationDate == null) {
                 this.expirationDate = "never";
             } else {
-                this.expirationDate = expirationDate.toString();
+                this.expirationDate = expirationDate.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
+                        .withLocale(Functions.getCurrentLocale()));
             }
 
             this.useCounter = stats.getUseCounter();
@@ -617,7 +620,8 @@ public HttpResponse doGenerateNewToken(@AncestorInPath User u, @QueryParameter S
             TokenUuidAndPlainValue tokenUuidAndPlainValue = p.generateNewToken(tokenName, expirationDate);
             String expirationDateString = "never";
             if (expirationDate != null) {
-                expirationDateString = expirationDate.toString();
+                expirationDateString = expirationDate.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
+                        .withLocale(Functions.getCurrentLocale()));
             }
 
             Map<String, String> data = new HashMap<>();
@@ -634,7 +638,7 @@ private LocalDate getExpirationDate(String tokenExpiration, String expirationDur
             }
             expirationDuration = expirationDuration.trim();
 
-            return  switch (expirationDuration) {
+            return switch (expirationDuration) {
                 case "", "never" -> {
                     yield null;
                 }

core/src/main/java/jenkins/security/apitoken/ApiTokenStore.java

@@ -178,7 +178,7 @@ private void addLegacyToken(@NonNull Secret legacyToken, boolean migrationFromEx
     }
 
     /**
-     * Create a new token with the given name and expiration and return it id and secret value.
+     * Create a new token with the given name and expiration and return its id and secret value.
      * Result meant to be sent / displayed and then discarded.
      */
     public synchronized @NonNull TokenUuidAndPlainValue generateNewToken(@NonNull String name, @Nullable LocalDate expirationDate) {

core/src/main/resources/jenkins/security/ApiTokenProperty/config.jelly

@@ -91,12 +91,9 @@ THE SOFTWARE.
                 <div class="token-card__title">
                     <span class="token-name">${token.name}</span>
                 </div>
-                <div>
+                <div class="token-stats">
                     <span class="api-token-new-expiration" data-never="${%This token does not expire}"
                           data-expires-on="${%tokenExpiresOn('__DATA__')}"/>
-                </div>
-                <div class="token-stats">
-                    <span class="token-creation" tooltip="${%Just Now}">${%Created just now}</span>
                     <span class="token-last-used">${%TokenNeverUsed}</span>
                 </div>
             </div>
@@ -162,32 +159,29 @@ THE SOFTWARE.
                                         </j:if>
                                         <span class="token-name">${token.name}</span>
                                 </div>
-                                <div>
+                                <j:set var="creationDateFormat" value="${%NoCreationDate}" />
+                                <j:if test="${token.creationDate != null}">
+                                    <i:formatDate var="creationDateFormat" value="${token.creationDate}" type="both" dateStyle="medium" timeStyle="medium" />
+                                    <!--TODO convert to "Today", "Tomorrow", "4 days ago", "2 weeks ago", etc. -->
+                                </j:if>
+                                <div class="token-stats">
                                     <j:choose>
                                         <j:when test="${token.expired}">
-                                            <span class="error">
+                                            <span class="error" tooltip="${%tokenCreatedOn(creationDateFormat)}">
                                                 ${%This token has expired}
                                             </span>
                                         </j:when>
                                         <j:when test="${token.expirationDate == 'never'}">
-                                            <span class="warning">
+                                            <span class="warning" tooltip="${%tokenCreatedOn(creationDateFormat)}">
                                                 ${%This token does not expire}
                                             </span>
                                         </j:when>
                                         <j:otherwise>
-                                            <span class="${token.aboutToExpire ? 'warning' : ''}">
+                                            <span class="${token.aboutToExpire ? 'warning' : ''}" tooltip="${%tokenCreatedOn(creationDateFormat)}">
                                                 ${%tokenExpiresOn(token.expirationDate)}
                                             </span>
                                         </j:otherwise>
                                     </j:choose>
-                                </div>
-                                <j:set var="creationDateFormat" value="${%NoCreationDate}" />
-                                <j:if test="${token.creationDate != null}">
-                                    <i:formatDate var="creationDateFormat" value="${token.creationDate}" type="both" dateStyle="medium" timeStyle="medium" />
-                                    <!--TODO convert to "Today", "Tomorrow", "4 days ago", "2 weeks ago", etc. -->
-                                </j:if>
-                                <div class="token-stats">
-                                    <span class="token-creation ${oldClazz}" tooltip="${creationDateFormat}">${token.createdDaysAgo()}</span>
                                     <span class="token-last-used">
                                         <j:choose>
                                             <j:when test="${isStatisticsEnabled}">

core/src/main/resources/jenkins/security/ApiTokenProperty/config.properties

@@ -19,3 +19,4 @@ NoCreationDate=There is no creation date for that token
 NoCreationDateValue=Unknown
 ConfirmRevokeSingleTitle=Revoke token
 tokenExpiresOn=Expires on {0}
+tokenCreatedOn=Created on {0}