Merge pull request #765 from code0-tech/763-move-abilities-from-query-to-application

Taucher2003 · web-flow · commit c34854726085 · 2025-12-09T20:45:45.000+01:00
Move exposed global abilities from QueryType to ApplicationType
diff --git a/app/graphql/types/application_type.rb b/app/graphql/types/application_type.rb
@@ -10,6 +10,15 @@ class ApplicationType < Types::BaseObject
     field :settings, Types::ApplicationSettingsType, null: true,
                                                      description: 'Global application settings'
 
+    expose_abilities %i[
+      create_organization
+      create_runtime
+      delete_runtime
+      update_runtime
+      rotate_runtime_token
+      update_application_setting
+    ], subject_resolver: -> { :global }
+
     def metadata
       {}
     end
diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb
@@ -52,15 +52,6 @@ class QueryType < Types::BaseObject
 
     field :global_runtimes, Types::RuntimeType.connection_type, null: false, description: 'Find runtimes'
 
-    expose_abilities %i[
-      create_organization
-      create_runtime
-      delete_runtime
-      update_runtime
-      rotate_runtime_token
-      update_application_setting
-    ], entity_name: 'Instance', subject_resolver: -> { :global }
-
     def node(id:)
       context.schema.object_from_id(id, context)
     end
diff --git a/docs/graphql/object/application.md b/docs/graphql/object/application.md
@@ -10,4 +10,5 @@ Represents the application instance
 |------|------|-------------|
 | `metadata` | [`Metadata!`](../object/metadata.md) | Metadata about the application |
 | `settings` | [`ApplicationSettings`](../object/applicationsettings.md) | Global application settings |
+| `userAbilities` | [`ApplicationUserAbilities!`](../object/applicationuserabilities.md) | Abilities for the current user on this Application |
 
diff --git a/docs/graphql/object/applicationuserabilities.md b/docs/graphql/object/applicationuserabilities.md
@@ -1,17 +1,17 @@
 ---
-title: InstanceUserAbilities
+title: ApplicationUserAbilities
 ---
 
-Abilities for the current user on this Instance
+Abilities for the current user on this Application
 
 ## Fields without arguments
 
 | Name | Type | Description |
 |------|------|-------------|
-| `createOrganization` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `create_organization` ability on this Instance |
-| `createRuntime` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `create_runtime` ability on this Instance |
-| `deleteRuntime` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `delete_runtime` ability on this Instance |
-| `rotateRuntimeToken` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `rotate_runtime_token` ability on this Instance |
-| `updateApplicationSetting` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `update_application_setting` ability on this Instance |
-| `updateRuntime` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `update_runtime` ability on this Instance |
+| `createOrganization` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `create_organization` ability on this Application |
+| `createRuntime` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `create_runtime` ability on this Application |
+| `deleteRuntime` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `delete_runtime` ability on this Application |
+| `rotateRuntimeToken` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `rotate_runtime_token` ability on this Application |
+| `updateApplicationSetting` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `update_application_setting` ability on this Application |
+| `updateRuntime` | [`Boolean!`](../scalar/boolean.md) | Shows if the current user has the `update_runtime` ability on this Application |
 
diff --git a/docs/graphql/object/query.md b/docs/graphql/object/query.md
@@ -13,7 +13,6 @@ Root Query type
 | `currentUser` | [`User`](../object/user.md) | Get the currently logged in user |
 | `globalRuntimes` | [`RuntimeConnection!`](../object/runtimeconnection.md) | Find runtimes |
 | `organizations` | [`OrganizationConnection!`](../object/organizationconnection.md) | Find organizations |
-| `userAbilities` | [`InstanceUserAbilities!`](../object/instanceuserabilities.md) | Abilities for the current user on this Instance |
 | `users` | [`UserConnection!`](../object/userconnection.md) | Find users |
 
 ## Fields with arguments
diff --git a/spec/graphql/types/application_type_spec.rb b/spec/graphql/types/application_type_spec.rb
@@ -7,6 +7,7 @@
     %w[
       settings
       metadata
+      user_abilities
     ]
   end
 
diff --git a/spec/graphql/types/query_type_spec.rb b/spec/graphql/types/query_type_spec.rb
@@ -15,7 +15,6 @@
       user
       global_runtimes
       namespace
-      userAbilities
       node
       nodes
     ]

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`%w[`
`8`	`8`	`settings`
`9`	`9`	`metadata`
	`10`	`+ user_abilities`
`10`	`11`	`]`
`11`	`12`	`end`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`user`
`16`	`16`	`global_runtimes`
`17`	`17`	`namespace`
`18`		`- userAbilities`
`19`	`18`	`node`
`20`	`19`	`nodes`
`21`	`20`	`]`