From 7eb2886ed5ad8ec8a752005ceeb5e8cb2fd15033 Mon Sep 17 00:00:00 2001
From: Filip Aleksic <faleksic@gitlab.com>
Date: Mon, 1 Sep 2025 15:03:13 +0200
Subject: [PATCH 1/4] Sort scopes for tokens

---
 .../vue_shared/access_tokens/components/access_token_form.vue   | 2 +-
 app/views/shared/tokens/_scopes_form.html.haml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue b/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
index c8f32359d12ad2..44ca337a62916e 100644
--- a/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
+++ b/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
@@ -170,7 +170,7 @@ export default {
       <template #input(scopes)="{ id, input, validation, value }">
         <gl-form-checkbox-group :id="id" :state="validation.state" :checked="value" @input="input">
           <gl-form-checkbox
-            v-for="scope in accessTokenAvailableScopes"
+            v-for="scope in [...accessTokenAvailableScopes].sort((a, b) => a > b ? 1 : -1)"
             :key="scope.value"
             :value="scope.value"
             :state="validation.state"
diff --git a/app/views/shared/tokens/_scopes_form.html.haml b/app/views/shared/tokens/_scopes_form.html.haml
index 8e363f6c86ad5e..2adacb6cfda64b 100644
--- a/app/views/shared/tokens/_scopes_form.html.haml
+++ b/app/views/shared/tokens/_scopes_form.html.haml
@@ -5,7 +5,7 @@
 - f = local_assigns.fetch(:f)
 
 %fieldset
-  - scopes.each do |scope|
+  - scopes.sort().each do |scope|
     - help_text = t scope, scope: scope_description(description_prefix)
     = f.gitlab_ui_checkbox_component :scopes, scope,
       help_text: help_text,
-- 
GitLab


From 9d8913d1fe0e6c3fe60998b31bb374976c7459ae Mon Sep 17 00:00:00 2001
From: Filip Aleksic <faleksic@gitlab.com>
Date: Mon, 1 Sep 2025 15:15:38 +0200
Subject: [PATCH 2/4] sort function fix

---
 .../vue_shared/access_tokens/components/access_token_form.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue b/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
index 44ca337a62916e..e19cac017807e3 100644
--- a/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
+++ b/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
@@ -170,7 +170,7 @@ export default {
       <template #input(scopes)="{ id, input, validation, value }">
         <gl-form-checkbox-group :id="id" :state="validation.state" :checked="value" @input="input">
           <gl-form-checkbox
-            v-for="scope in [...accessTokenAvailableScopes].sort((a, b) => a > b ? 1 : -1)"
+            v-for="scope in [...accessTokenAvailableScopes].sort((a, b) => a.value > b.value ? 1 : -1)"
             :key="scope.value"
             :value="scope.value"
             :state="validation.state"
-- 
GitLab


From ad599bde764d07e231921baab1d4f82a28bb0705 Mon Sep 17 00:00:00 2001
From: Filip Aleksic <faleksic@gitlab.com>
Date: Mon, 1 Sep 2025 15:43:50 +0200
Subject: [PATCH 3/4] satisfy linter

---
 .../vue_shared/access_tokens/components/access_token_form.vue | 4 +++-
 app/views/shared/tokens/_scopes_form.html.haml                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue b/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
index e19cac017807e3..2329b92717f73c 100644
--- a/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
+++ b/app/assets/javascripts/vue_shared/access_tokens/components/access_token_form.vue
@@ -170,7 +170,9 @@ export default {
       <template #input(scopes)="{ id, input, validation, value }">
         <gl-form-checkbox-group :id="id" :state="validation.state" :checked="value" @input="input">
           <gl-form-checkbox
-            v-for="scope in [...accessTokenAvailableScopes].sort((a, b) => a.value > b.value ? 1 : -1)"
+            v-for="scope in [...accessTokenAvailableScopes].sort((a, b) => {
+              return a.value > b.value ? 1 : -1;
+            })"
             :key="scope.value"
             :value="scope.value"
             :state="validation.state"
diff --git a/app/views/shared/tokens/_scopes_form.html.haml b/app/views/shared/tokens/_scopes_form.html.haml
index 2adacb6cfda64b..ba3e0f4f88e717 100644
--- a/app/views/shared/tokens/_scopes_form.html.haml
+++ b/app/views/shared/tokens/_scopes_form.html.haml
@@ -5,7 +5,7 @@
 - f = local_assigns.fetch(:f)
 
 %fieldset
-  - scopes.sort().each do |scope|
+  - scopes.sort.each do |scope|
     - help_text = t scope, scope: scope_description(description_prefix)
     = f.gitlab_ui_checkbox_component :scopes, scope,
       help_text: help_text,
-- 
GitLab


From b0e83f96a4f6bba294717d411a184521402db084 Mon Sep 17 00:00:00 2001
From: Filip Aleksic <faleksic@gitlab.com>
Date: Mon, 1 Sep 2025 15:49:56 +0200
Subject: [PATCH 4/4] fix test case

---
 .../access_tokens/components/access_token_form_spec.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/frontend/vue_shared/access_tokens/components/access_token_form_spec.js b/spec/frontend/vue_shared/access_tokens/components/access_token_form_spec.js
index 616059a6450556..62650ccd6dd018 100644
--- a/spec/frontend/vue_shared/access_tokens/components/access_token_form_spec.js
+++ b/spec/frontend/vue_shared/access_tokens/components/access_token_form_spec.js
@@ -25,7 +25,7 @@ describe('AccessTokenForm', () => {
   const accessTokenAvailableScopes = [
     { value: 'read_service_ping', text: 'scope 1' },
     { value: 'read_user', text: 'scope 2' },
-    { value: 'other', text: 'scope 3' },
+    { value: 'write_registry', text: 'scope 3' },
   ];
 
   const createComponent = (props = {}) => {
-- 
GitLab