From 3f087ab3a16c79b3e8feda793b4b53aff7ad0e9b Mon Sep 17 00:00:00 2001
From: Leioy <wlbyan@icloud.com>
Date: Fri, 17 Jan 2025 15:09:45 +0800
Subject: [PATCH] fix(app): add version name ordering in app version lists
 (#4442)

Add 'versionName' ordering parameter to useAppVersionList hook calls in BasicInfoForm
and AppVersionSelector components to ensure consistent version display order

Signed-off-by: leioy <wlbyan@icloud.com>
---
 .../AppBaseInfoForm/BasicInfoForm/index.tsx         |  5 ++++-
 .../components/Apps/AppVersionSelector/index.tsx    | 13 +++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/shared/src/components/Apps/AppForms/AppBaseInfoForm/BasicInfoForm/index.tsx b/packages/shared/src/components/Apps/AppForms/AppBaseInfoForm/BasicInfoForm/index.tsx
index 618c40b8793..df73215cfc0 100644
--- a/packages/shared/src/components/Apps/AppForms/AppBaseInfoForm/BasicInfoForm/index.tsx
+++ b/packages/shared/src/components/Apps/AppForms/AppBaseInfoForm/BasicInfoForm/index.tsx
@@ -45,7 +45,10 @@ export function BasicInfoForm({
 }: Props): JSX.Element {
   const { workspace } = useParams();
   const [initData, setInitData] = useState<Partial<AppBasicInfoFormData>>();
-  const { data: versions } = useAppVersionList({ appName }, { status: versionStatus });
+  const { data: versions } = useAppVersionList(
+    { appName },
+    { status: versionStatus, order: 'versionName' },
+  );
   const sortedVersions = useMemo(
     () =>
       (versions || [])
diff --git a/packages/shared/src/components/Apps/AppVersionSelector/index.tsx b/packages/shared/src/components/Apps/AppVersionSelector/index.tsx
index 38f34b2ffc2..75421e239c2 100644
--- a/packages/shared/src/components/Apps/AppVersionSelector/index.tsx
+++ b/packages/shared/src/components/Apps/AppVersionSelector/index.tsx
@@ -28,10 +28,15 @@ export function AppVersionSelector({
   selectedVersionChange,
 }: Props): JSX.Element {
   const [selectedVersion, setSelectedVersion] = useState<string>('');
-  const { data: versions = [] } = useAppVersionList({
-    workspace,
-    appName: appDetail.metadata.name,
-  });
+  const { data: versions = [] } = useAppVersionList(
+    {
+      workspace,
+      appName: appDetail.metadata.name,
+    },
+    {
+      order: 'versionName',
+    },
+  );
   const versionOptions = useMemo(() => {
     return versions?.map(({ metadata, spec }) => ({
       label: spec.versionName,