Merge branch 'main' into fix-issue-sugg

Author: GiteaBot

package-lock.json

@@ -46,7 +46,6 @@
     "sortablejs": "1.15.2",
     "swagger-ui-dist": "5.17.14",
     "tailwindcss": "3.4.10",
-    "temporal-polyfill": "0.2.5",
     "throttle-debounce": "5.0.2",
     "tinycolor2": "1.6.0",
     "tippy.js": "6.3.7",

package.json

@@ -9,6 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/context"
 )
 
@@ -39,7 +40,7 @@ func Organizations(ctx *context.Context) {
 	)
 	sortOrder := ctx.FormString("sort")
 	if sortOrder == "" {
-		sortOrder = "newest"
+		sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest")
 		ctx.SetFormString("sort", sortOrder)
 	}
 

routers/web/explore/org.go

@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/sitemap"
 	"code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/context"
 )
 
@@ -149,7 +150,7 @@ func Users(ctx *context.Context) {
 	)
 	sortOrder := ctx.FormString("sort")
 	if sortOrder == "" {
-		sortOrder = "newest"
+		sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest")
 		ctx.SetFormString("sort", sortOrder)
 	}
 

routers/web/explore/user.go

@@ -17,7 +17,7 @@ const colors = ref({
 const activityTopAuthors = window.config.pageData.repoActivityTopAuthors || [];
 
 const graphPoints = computed(() => {
-  return activityTopAuthors.value.map((item) => {
+  return activityTopAuthors.map((item) => {
     return {
       value: item.commits,
       label: item.name,
@@ -26,7 +26,7 @@ const graphPoints = computed(() => {
 });
 
 const graphAuthors = computed(() => {
-  return activityTopAuthors.value.map((item, idx) => {
+  return activityTopAuthors.map((item, idx) => {
     return {
       position: idx + 1,
       ...item,
@@ -35,7 +35,7 @@ const graphAuthors = computed(() => {
 });
 
 const graphWidth = computed(() => {
-  return activityTopAuthors.value.length * 40;
+  return activityTopAuthors.length * 40;
 });
 
 const styleElement = ref<HTMLElement | null>(null);

web_src/js/components/RepoActivityTopAuthors.vue

@@ -7,9 +7,15 @@ test('toAbsoluteLocaleDate', () => {
     day: 'numeric',
   })).toEqual('March 15, 2024');
 
-  expect(toAbsoluteLocaleDate('2024-03-15', 'de-DE', {
+  expect(toAbsoluteLocaleDate('2024-03-15T01:02:03', 'de-DE', {
     year: 'numeric',
     month: 'long',
     day: 'numeric',
   })).toEqual('15. März 2024');
+
+  expect(toAbsoluteLocaleDate('12345-03-15 01:02:03', '', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })).toEqual('Mar 15, 12345');
 });

web_src/js/webcomponents/absolute-date.test.ts

@@ -1,30 +1,28 @@
-import {Temporal} from 'temporal-polyfill';
-
-export function toAbsoluteLocaleDate(dateStr, lang, opts) {
-  return Temporal.PlainDate.from(dateStr).toLocaleString(lang ?? [], opts);
+export function toAbsoluteLocaleDate(date: string, lang: string, opts: Intl.DateTimeFormatOptions) {
+  return new Date(date).toLocaleString(lang || [], opts);
 }
 
 window.customElements.define('absolute-date', class extends HTMLElement {
   static observedAttributes = ['date', 'year', 'month', 'weekday', 'day'];
 
+  initialized = false;
+
   update = () => {
-    const year = this.getAttribute('year') ?? '';
-    const month = this.getAttribute('month') ?? '';
-    const weekday = this.getAttribute('weekday') ?? '';
-    const day = this.getAttribute('day') ?? '';
+    const opt: Intl.DateTimeFormatOptions = {};
+    for (const attr of ['year', 'month', 'weekday', 'day']) {
+      if (this.getAttribute(attr)) opt[attr] = this.getAttribute(attr);
+    }
     const lang = this.closest('[lang]')?.getAttribute('lang') ||
       this.ownerDocument.documentElement.getAttribute('lang') || '';
 
-    // only use the first 10 characters, e.g. the `yyyy-mm-dd` part
-    const dateStr = this.getAttribute('date').substring(0, 10);
+    // only use the date part, it is guaranteed to be in ISO format (YYYY-MM-DDTHH:mm:ss.sssZ)
+    let date = this.getAttribute('date');
+    let dateSep = date.indexOf('T');
+    dateSep = dateSep === -1 ? date.indexOf(' ') : dateSep;
+    date = dateSep === -1 ? date : date.substring(0, dateSep);
 
     if (!this.shadowRoot) this.attachShadow({mode: 'open'});
-    this.shadowRoot.textContent = toAbsoluteLocaleDate(dateStr, lang, {
-      ...(year && {year}),
-      ...(month && {month}),
-      ...(weekday && {weekday}),
-      ...(day && {day}),
-    });
+    this.shadowRoot.textContent = toAbsoluteLocaleDate(date, lang, opt);
   };
 
   attributeChangedCallback(_name, oldValue, newValue) {