Changed user and api key overview to local TZ, increased JS version

Author: Forceu

build/go-generate/minifyStaticContent.go

@@ -144,6 +144,6 @@ func fileExists(filename string) bool {
 // Auto-generated content below, do not modify
 // Version codes can be changed in updateVersionNumbers.go
 
-const jsAdminVersion = 14
+const jsAdminVersion = 15
 const jsE2EVersion = 8
 const cssMainVersion = 5

build/go-generate/updateVersionNumbers.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 )
 
-const versionJsAdmin = 14
+const versionJsAdmin = 15
 const versionJsDropzone = 5
 const versionJsE2EAdmin = 8
 const versionCssMain = 5

internal/models/ApiKey.go

@@ -3,7 +3,6 @@ package models
 import (
 	"errors"
 	"strings"
-	"time"
 )
 
 const (
@@ -73,14 +72,6 @@ func ApiPermissionFromString(permString string) (ApiPermission, error) {
 	}
 }
 
-// GetReadableDate returns the date as YYYY-MM-DD HH:MM:SS
-func (key *ApiKey) GetReadableDate() string {
-	if key.LastUsed == 0 {
-		return "Never"
-	}
-	return time.Unix(key.LastUsed, 0).Format("2006-01-02 15:04:05")
-}
-
 // GetRedactedId returns a redacted version of the API key
 func (key *ApiKey) GetRedactedId() string {
 	return key.Id[0:2] + "**************************" + key.Id[len(key.Id)-2:]

internal/models/User.go

@@ -2,8 +2,8 @@ package models
 
 import (
 	"encoding/json"
+
 	"github.com/forceu/gokapi/internal/helper"
-	"time"
 )
 
 // UserPermission contains zero or more permissions as uint16
@@ -20,17 +20,6 @@ type User struct {
 	ResetPassword bool           `json:"resetPassword" redis:"ResetPassword"`
 }
 
-// GetReadableDate returns the date as YYYY-MM-DD HH:MM
-func (u *User) GetReadableDate() string {
-	if u.LastOnline == 0 {
-		return "Never"
-	}
-	if time.Now().Unix()-u.LastOnline < 120 {
-		return "Online"
-	}
-	return time.Unix(u.LastOnline, 0).Format("2006-01-02 15:04")
-}
-
 // GetReadableUserLevel returns the userlevel as a group name
 func (u *User) GetReadableUserLevel() string {
 	switch u.UserLevel {

internal/webserver/web/static/js/dateformat.js

@@ -14,3 +14,23 @@ function formatUnixTimestamp(unixTimestamp) {
 function insertFormattedDate(unixTimestamp, id) {
     document.getElementById(id).innerText = formatUnixTimestamp(unixTimestamp);
 }
+
+function insertLastOnlineDate(unixTimestamp, id) {
+    if (unixTimestamp == 0) {
+        document.getElementById(id).innerText = "Never";
+        return;
+    }
+    if ((Date.now()/1000) - 120 < unixTimestamp) {
+        document.getElementById(id).innerText = "Online";
+        return;
+    }
+    insertFormattedDate(unixTimestamp, id);
+}
+
+function insertLastUsed(unixTimestamp, id) {
+    if (unixTimestamp == 0) {
+        document.getElementById(id).innerText = "Never";
+        return;
+    }
+    insertFormattedDate(unixTimestamp, id);
+}

…server/web/static/js/min/admin.min.14.js …server/web/static/js/min/admin.min.15.jsinternal/webserver/web/static/js/min/admin.min.14.js renamed to internal/webserver/web/static/js/min/admin.min.15.js internal/webserver/web/static/js/min/admin.min.14.js renamed to internal/webserver/web/static/js/min/admin.min.15.js

@@ -40,7 +40,8 @@
                             <tr id="row-{{ .PublicId }}">
                                 <td id="friendlyname-{{ .PublicId }}" onClick="addFriendlyNameChange('{{ .PublicId }}')">{{ .FriendlyName }}</td>
                                 <td><div class="font-monospace">{{ .GetRedactedId }}</div></td>
-                                <td>{{ .GetReadableDate }}</td>
+            			<td><span id="cell-lastused-{{ .PublicId }}"></span></td>
+				   <script>insertLastUsed({{ .LastUsed }}, "cell-lastused-{{ .PublicId }}");</script>
                                             <td class="prevent-select">
 						<i id="perm_view_{{ .PublicId }}" class="bi bi-eye {{if not .HasPermissionView}}perm-notgranted{{else}}perm-granted{{end}}" title="List Uploads" onclick='changeApiPermission("{{ .PublicId }}","PERM_VIEW", "perm_view_{{ .PublicId }}");'></i>
 						<i id="perm_upload_{{ .PublicId }}" class="bi bi-file-earmark-arrow-up {{if not .HasPermissionUpload}}perm-notgranted{{else}}perm-granted{{end}}" title="Upload" onclick='changeApiPermission("{{ .PublicId }}","PERM_UPLOAD", "perm_upload_{{ .PublicId }}");'></i>

internal/webserver/web/static/js/min/dateformat.min.js

@@ -35,7 +35,8 @@
                             <tr id="row-{{ .User.Id }}">
                                 <td>{{ .User.Name }}</td>
                                 <td  id="userlevel_{{ .User.Id }}">{{ .User.GetReadableUserLevel }}</td>
-            			<td>{{ .User.GetReadableDate }}</td>
+            			<td><span id="cell-lastonline-{{ .User.Id }}"></span></td>
+				   <script>insertLastOnlineDate({{ .User.LastOnline }}, "cell-lastonline-{{ .User.Id }}");</script>
                                 <td>{{ .UploadCount }}</td>
             			<td class="prevent-select">
 

internal/webserver/web/templates/html_api.tmpl

@@ -3,7 +3,7 @@
 
 // Specifies the version of JS files, so that the browser doesn't
 // use a cached version, if the file has been updated
-{{define "js_admin_version"}}14{{end}}
+{{define "js_admin_version"}}15{{end}}
 {{define "js_dropzone_version"}}5{{end}}
 {{define "js_e2eversion"}}8{{end}}
 {{define "css_main"}}5{{end}}