foreman_resource_quota 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7fe8ad234e899887460b9e87041b4e2d05f6eaad6540a9567110326dc6ec7b
-  data.tar.gz: 100ee9af0fd01a0f7d026cafaae6ef1faf9b1e2897952bdb935ae896ed948dca
+  metadata.gz: e395e2dfdbaf6a690ee47ed3885daa6d1bf02d66fa9ab4ddc9616214913e1bbe
+  data.tar.gz: c6804f4c3ac2245a891f54ddbec65b5736983466c05e18fedc3d0b6ff926c932
 SHA512:
-  metadata.gz: 8511f2e3460efa522ced8b3759555755fc2e4bd44613f68d74266a103a32bc54beafe75982ad58d9263264fd1c77102b44f0eb9564abdf4c972813f7ecbd4135
-  data.tar.gz: 5bd4034854f07d0cc7600864c84904a9295c49f4f0142880c6c5c37855d9fd3b77834dad065fdcf1ffc481a7a2dc7a40c5724e8861896352e349c72440f0c2e6
+  metadata.gz: 54de1fc3feda746af897c9161a3079f12e6e0be2ad9ef372ab39a9987cb86866fc7216bd5df13bcc477beb8ec8587be81bd95f858e65e05f034a22d78e88fa93
+  data.tar.gz: '09bf9301c5b261f83e5ca90d78ae0d38b1eff943c0c680d5c8fbd6eeca080f18c8e744f29a58f753b42f35c5c1bd52f04f0a1a562384ebdfa07dd96796cc31f0'

data/README.md

@@ -14,20 +14,20 @@ For more information, see [Limiting host resources](https://docs.theforeman.org/
 
 | Foreman Version | Plugin Version |
 | --------------- | -------------- |
-| 3.11            |    0.3.1       |
+| 3.15            |    0.5.0       |
+| 3.14            |    0.4.0       |
+| 3.13            | ~> 0.3.0       |
 | 3.5             |    0.0.1       |
 
 ## Usage
 
-_TODO_ Still under development: Official documentation will be added soon.
-
 When several users share a compute resource or infrastructure, there is a concern that some users could use more than its fair share of resources. Resource Quotas are a tool for administrators to address this concern. They limit access to the shared resource in order to guarantee a fair collaboration.
 
 In the context of Foreman, multiple users or groups usually share a fixed number of resources (limitation of compute resources like CPU cores, memory, and disk space). As of now, a user cannot be limited when allocating resources. They can create hosts with as many resources as they want. This could lead to over-usage or unequal balancing of resources under the users.
 
 This plugin introduces the configuration of Resource Quotas. A quota limits specific resources and can be applied to a user or a user group. If a user belongs to a user group, the group’s quota is automatically applied to the user as well. When deploying a new host, a user has to choose a Resource Quota that the host counts to.
 
-A user is hindered from deploying new hosts, if the new host would exceed the corresponding quota limits. In case, a user belongs to multiple user group with quota, the user can determine which quota new hosts belong to. 
+A user is hindered from deploying new hosts, if the new host would exceed the corresponding quota limits. In case, a user belongs to multiple user group with quota, the user can determine which quota new hosts belong to.
 
 
 ## Contributing
@@ -42,7 +42,7 @@ Fork and send a Pull Request. Thanks!
 
 ## Copyright
 
-Copyright (c) 2023 ATIX AG - https://atix.de
+Copyright (c) 2025 ATIX AG - https://atix.de
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/app/controllers/foreman_resource_quota/api/v2/resource_quotas_controller.rb

@@ -40,7 +40,7 @@ module ForemanResourceQuota
         end
 
         api :GET, '/resource_quotas/:id/missing_hosts',
-          N_('Show resources could not be determined when calculating utilization')
+          N_("Show hosts' resources that could not be determined when calculating the quota utilization")
         param :id, :identifier, required: true
         def missing_hosts
           process_response @resource_quota

data/app/controllers/foreman_resource_quota/concerns/api/v2/hosts_controller_extensions.rb

@@ -5,7 +5,14 @@ module ForemanResourceQuota
     module Api
       module V2
         module HostsControllerExtensions
+          extend ActiveSupport::Concern
+
+          included do
+            before_action :check_if_quota_is_set, only: %i[create update]
+          end
+
           extend ::Apipie::DSL::Concern
+
           update_api(:create, :update) do
             param :host, Hash do
               param :resource_quota_id, :number, required: false,
@@ -13,6 +20,20 @@ module ForemanResourceQuota
                          This field is required if the setting `resource_quota_optional_assignment` is set to false.')
             end
           end
+
+          private
+
+          def check_if_quota_is_set # rubocop:disable Metrics/AbcSize
+            return if User.current.quota_assignment_optional?
+            quota = if User.current&.admin?
+                      ResourceQuota.where(id: params['host']['resource_quota_id']).first
+                    else
+                      User.current.resource_quotas.where(id: params['host']['resource_quota_id']).first
+                    end
+            return unless quota.nil? || quota.unassigned?
+            render_error :custom_error, status: :unprocessable_entity,
+locals: { message: 'No valid resource quota provided' }
+          end
         end
       end
     end

data/app/helpers/foreman_resource_quota/hosts_helper.rb

@@ -2,17 +2,28 @@
 
 module ForemanResourceQuota
   module HostsHelper
-    def resource_quota_select(form, user_quotas)
-      blank_opt = { include_blank: true }
-      select_items = user_quotas.order(:name)
+    def resource_quota_select(form, user_quotas, selected, assignment_optional, host_quota)
+      select_opts = { include_blank: false,
+                      selected: selected }
+      html_opts = { label: _('Resource Quota'),
+                    required: !assignment_optional,
+                    help_inline: if assignment_optional
+                                   _('Define the Resource Quota this host counts to.')
+                                 elsif !selected.nil? && (host_quota.nil? ||
+                                       host_quota == ForemanResourceQuota::ResourceQuota.unassigned.id)
+                                   format(_("Quota required! Choosing '%s' by default, change here if needed!"),
+                                     user_quotas.find(selected))
+                                 else
+                                   _('Resource quota assignment required!')
+                                 end }
+
       select_f form,
         :resource_quota_id,
-        select_items,
+        user_quotas,
         :id,
         :to_label,
-        blank_opt,
-        label: _('Resource Quota'),
-        help_inline: _('Define the Resource Quota this host counts to.')
+        select_opts,
+        html_opts
     end
   end
 end

data/app/lib/foreman_resource_quota/exceptions.rb

@@ -8,5 +8,6 @@ module ForemanResourceQuota
     class HostResourcesException < ResourceQuotaException; end
     class ResourceQuotaUtilizationException < ResourceQuotaException; end
     class HostNotFoundException < ResourceQuotaException; end
+    class UnassignedQuotaDeletionException < ResourceQuotaException; end
   end
 end

data/app/models/concerns/foreman_resource_quota/host_managed_extensions.rb

@@ -128,22 +128,21 @@ module ForemanResourceQuota
          "while processing host '#{name}'. The Resource Quota utilization values might be inconsistent.")
     end
 
-    def early_return?(quota)
-      if quota.nil?
-        return true if quota_assigment_optional?
-        raise HostResourceQuotaEmptyException, 'must be given.'
+    def early_return?(quota) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      if quota.nil? || quota.unassigned?
+        self.resource_quota = ResourceQuota.unassigned
+        return true if owner.quota_assignment_optional?
+        if ResourceQuota.assignable.empty? || (!owner.admin? && owner.resource_quotas.assignable.empty?)
+          raise HostResourceQuotaEmptyException,
+            'must be given.'
+        end
+        return true
       end
       return true if quota.active_resources.empty?
       return true if Setting[:resource_quota_global_no_action] # quota is assigned, but not supposed to be checked
       false
     end
 
-    def quota_assigment_optional?
-      return true if Setting[:resource_quota_optional_assignment]
-      return true if owner.respond_to?(:resource_quota_is_optional) && owner.resource_quota_is_optional
-      false
-    end
-
     def save_host_resources
       host_resources.save
     end

data/app/models/concerns/foreman_resource_quota/user_extensions.rb

@@ -4,12 +4,39 @@ module ForemanResourceQuota
   module UserExtensions
     extend ActiveSupport::Concern
     included do
+      after_create :set_unassigned_quota
+
       has_many :resource_quotas_users, class_name: 'ForemanResourceQuota::ResourceQuotaUser', dependent: :destroy,
         inverse_of: :user
       has_many :resource_quotas, class_name: 'ForemanResourceQuota::ResourceQuota', through: :resource_quotas_users
       attribute :resource_quota_is_optional, :boolean, default: false
 
       scoped_search relation: :resource_quotas, on: :name, complete_value: true, rename: :resource_quota
+
+      def assignable_resource_quotas
+        resource_quotas.assignable
+      end
+
+      def quota_assignment_optional?
+        Setting['resource_quota_optional_assignment'] || resource_quota_is_optional
+      end
+
+      def show_unassigned_hosts_warning?
+        return false if Setting['resource_quota_optional_assignment']
+        (admin? &&
+         !ForemanResourceQuota::ResourceQuota.unassigned.hosts.empty?) ||
+          (!admin? &&
+           !resource_quota_is_optional &&
+           !ForemanResourceQuota::ResourceQuota.unassigned.hosts.where(owner: self).empty?)
+      end
+
+      private
+
+      def set_unassigned_quota
+        return if resource_quotas.include?(ForemanResourceQuota::ResourceQuota.unassigned)
+
+        resource_quotas << ForemanResourceQuota::ResourceQuota.unassigned
+      end
     end
   end
 end

data/app/models/concerns/foreman_resource_quota/usergroup_extensions.rb

@@ -4,11 +4,29 @@ module ForemanResourceQuota
   module UsergroupExtensions
     extend ActiveSupport::Concern
     included do
+      after_create :set_unassigned_quota
+
       has_many :resource_quotas_usergroups, class_name: 'ForemanResourceQuota::ResourceQuotaUsergroup',
         dependent: :destroy, inverse_of: :usergroup
       has_many :resource_quotas, class_name: 'ForemanResourceQuota::ResourceQuota', through: :resource_quotas_usergroups
 
       scoped_search relation: :resource_quotas, on: :name, complete_value: true, rename: :resource_quota
+
+      def assignable_resource_quotas
+        resource_quotas.assignable
+      end
+
+      def quota_assignment_optional?
+        Setting['resource_quota_optional_assignment']
+      end
+
+      private
+
+      def set_unassigned_quota
+        return if resource_quotas.include?(ForemanResourceQuota::ResourceQuota.unassigned)
+
+        resource_quotas << ForemanResourceQuota::ResourceQuota.unassigned
+      end
     end
   end
 end

data/app/models/foreman_resource_quota/resource_quota.rb

@@ -23,13 +23,26 @@ module ForemanResourceQuota
 
     validates :name, presence: true, uniqueness: true
 
+    before_destroy :do_not_destroy_unassigned_quota, prepend: true
+    before_destroy :assign_unassigned_quota, prepend: true
+
     scoped_search on: :name, complete_value: true
     scoped_search on: :id, complete_enabled: false, only_explicit: true, validator: ScopedSearch::Validators::INTEGER
 
+    scope :assignable, -> { where(unassigned: false) }
+
+    def self.unassigned
+      find_by(unassigned: true)
+    end
+
     def self.permission_name
       'resource_quotas'
     end
 
+    def unassigned?
+      unassigned
+    end
+
     def number_of_hosts
       hosts_resources.size
     end
@@ -151,6 +164,16 @@ module ForemanResourceQuota
 
     private
 
+    def do_not_destroy_unassigned_quota
+      return unless id == ResourceQuota.unassigned.id
+      raise UnassignedQuotaDeletionException,
+        "You cannot delete the 'Unassigned' quota."
+    end
+
+    def assign_unassigned_quota
+      hosts.update(resource_quota: ResourceQuota.unassigned)
+    end
+
     # Wrap into a function for easier testing
     def call_utilization_helper(quota_hosts)
       utilization_from_resource_origins(active_resources, quota_hosts)

data/app/views/foreman_resource_quota/resource_quotas/index.html.erb

@@ -6,6 +6,9 @@
 <% end %>
 
 <% title _('Resource Quotas') %>
+  <%  if User.current.show_unassigned_hosts_warning? %>
+  <%= alert :class => 'alert-warning', :header => _('You have unassigned hosts!'), text: "The setting 'resource_quota_optional_assignment' is set to 'No' but there are hosts without quota assignment. Please check your hosts' quota assignments! " %>
+<% end %>
 
 <%= title_actions react_component('CreateResourceQuotaModal') %>
 
@@ -22,8 +25,10 @@
   </thead>
   <tbody>
     <% @resource_quotas.each do |quota|
+      showAssignmentWarning = quota.unassigned? && User.current.show_unassigned_hosts_warning?
          react_data = {
            "isNewQuota": false,
+           "showAssignmentWarning": showAssignmentWarning,
            "initialProperties": {
              "id": quota.id,
              "name": quota.name,
@@ -31,6 +36,7 @@
              "cpu_cores": quota.cpu_cores,
              "memory_mb": quota.memory_mb,
              "disk_gb": quota.disk_gb,
+             "unassigned": quota.unassigned?,
            },
          }
     %>
@@ -43,9 +49,11 @@
         <td><%= h(quota.memory_mb) %></td>
         <td><%= h(quota.disk_gb) %></td>
         <td>
+          <% unless quota.unassigned? %>
           <%= action_buttons(
                 display_delete_if_authorized(hash_for_foreman_resource_quota_resource_quota_path(id: quota), data: { confirm: _("Delete %s?") % quota.name})
-              ) %>
+          ) %>
+          <% end %>
         </td>
       </tr>
     <% end %>

data/app/views/hosts/_form_quota_fields.html.erb

@@ -1,4 +1,16 @@
 <%
-  user_quotas = User.current&.admin? ? ForemanResourceQuota::ResourceQuota.all : User.current.resource_quotas
+  user_quotas = User.current&.admin? ? ForemanResourceQuota::ResourceQuota.all : User.current.resource_quotas.distinct
+  user_quotas = user_quotas.assignable if !User.current.quota_assignment_optional?
+  user_quotas = user_quotas.order(:name)
+  selected = @host.resource_quota_id
+  # show Unassigned as default when assignment is optional
+  # show first selectable quota when assignment is mandatory
+  if selected.nil? || selected == ForemanResourceQuota::ResourceQuota.unassigned.id
+    if User.current.quota_assignment_optional?
+      selected = ForemanResourceQuota::ResourceQuota.unassigned.id
+    else
+      selected = user_quotas&.first&.id
+    end
+  end
 %>
-<%= resource_quota_select form, user_quotas %>
+<%= resource_quota_select form, user_quotas, selected, User.current.quota_assignment_optional?, @host.resource_quota_id %>

data/app/views/users/_form_quota_tab.html.erb

@@ -10,7 +10,7 @@
     :label_help => _("It is optional for a user to assign a quota when creating new hosts") %>
 <% end %>
 
-<%= multiple_checkboxes(form, :resource_quotas, resource, ForemanResourceQuota::ResourceQuota, :label => _("Resource Quotas")) %>
+<%= multiple_checkboxes(form, :resource_quotas, resource, ForemanResourceQuota::ResourceQuota.assignable, :label => _("Resource Quotas")) %>
 
 <% if resource_type == :user %>
   <% usergroups = @user.cached_usergroups.includes(:resource_quotas).distinct %>
@@ -34,7 +34,7 @@
             <% unless usergroup.resource_quotas.map(&:name).any? %>
                 <li data-id="<%= usergroup.id %>" class="list-group-item"><%= _('This group has no quotas') %></li>
             <%end %>
-            <% usergroup.resource_quotas.map(&:name).each do |quota_name| %>
+            <% usergroup.assignable_resource_quotas.map(&:name).each do |quota_name| %>
               <li data-id="<%= usergroup.id %>" class="list-group-item"><%= quota_name %></li>
             <% end %>
           <% end %>

data/db/migrate/20240611141939_drop_missing_hosts.rb

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 
 class DropMissingHosts < ActiveRecord::Migration[6.1]
-  def up
-    drop_table :resource_quotas_missing_hosts
+  def change
+    drop_table :resource_quotas_missing_hosts do |t|
+      t.references :resource_quota, null: false, foreign_key: { to_table: :resource_quotas }
+      t.references :missing_host, null: false, unique: true, foreign_key: { to_table: :hosts }
+      t.boolean :no_cpu_cores, default: false
+      t.boolean :no_memory_mb, default: false
+      t.boolean :no_disk_gb, default: false
+      t.timestamps
+    end
   end
 end

data/db/migrate/20250410082728_add_unassigned_flag_to_resource_quota.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddUnassignedFlagToResourceQuota < ActiveRecord::Migration[6.1]
+  def change
+    add_column :resource_quotas, :unassigned, :bool, null: false, default: false
+  end
+end

data/db/seeds.d/030-unassigned_quota.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Default Quota "Unassigned"
+ForemanResourceQuota::ResourceQuota.without_auditing do # rubocop:disable Metrics/BlockLength
+  unassigned = ForemanResourceQuota::ResourceQuota.where(
+    name: 'Unassigned',
+    unassigned: true,
+    description: 'Here, you can see all hosts without a dedicated quota.'
+  ).first_or_create
+
+  # Add default quota to all users and usergroups
+  User.without_auditing do
+    User.all.except_hidden.each do |user|
+      unless user.resource_quotas.include?(unassigned)
+        user.resource_quotas << unassigned
+        user.save!(validate: false)
+      end
+    end
+  end
+
+  Usergroup.without_auditing do
+    Usergroup.all.each do |usergroup|
+      unless usergroup.resource_quotas.include?(unassigned)
+        usergroup.resource_quotas << unassigned
+        usergroup.save!(validate: false)
+      end
+    end
+  end
+
+  # Move all hosts without a quota to quota "Unassigned"
+  Host.without_auditing do
+    Host.all.each do |host|
+      host.update(resource_quota: unassigned) if host.resource_quota.nil?
+    end
+  end
+end

data/lib/foreman_resource_quota/register.rb

@@ -105,5 +105,13 @@ Foreman::Plugin.register :foreman_resource_quota do
       # Future: Overwrite quota-specific "out of resource"-action and take no ..
     end
   end
+  extend_page 'hosts/_list' do |context|
+    context.with_profile :resource_quota, _('Resource Quota'), default: true do
+      add_pagelet :hosts_table_column_header, key: :resource_quota_id, label: s_('Resource Quota'),
+        sortable: true, width: '10%', class: 'hidden-xs'
+      add_pagelet :hosts_table_column_content, key: :resource_quota_id,
+        callback: ->(host) { host.resource_quota.name }, class: 'hidden-xs ellipsis'
+    end
+  end
 end
 # rubocop: enable Metrics/BlockLength

data/lib/foreman_resource_quota/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanResourceQuota
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/tasks/foreman_resource_quota_tasks.rake

@@ -4,11 +4,10 @@ require 'rake/testtask'
 
 # Tasks
 namespace :foreman_resource_quota do
-  namespace :example do
-    desc 'Example Task'
-    task task: :environment do
-      # Task goes here
-    end
+  desc 'EXPERIMENTAL: Revert all database migrations of this plugin, preparing plugin uninstall'
+  task revert_db_migrations: :environment do
+    plugin = Foreman::Plugin.find ForemanResourceQuota.name.underscore
+    ActiveRecord::MigrationContext.new(plugin.migrations_paths, ActiveRecord::SchemaMigration).down
   end
 end
 

data/package.json

@@ -24,9 +24,9 @@
     "@theforeman/vendor": ">= 12.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.0",
+    "@babel/core": "^7.28.0",
     "@sheerun/mutationobserver-shim": "^0.3.3",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
     "@theforeman/builder": ">= 15.0.0",
     "@theforeman/eslint-plugin-foreman": ">= 15.0.0",
@@ -36,8 +36,7 @@
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",
-    "react-redux-test-utils": "^0.2.0",
-    "stylelint": "^16.15.0",
-    "stylelint-config-standard": "^37.0.0"
+    "stylelint": "^16.21.1",
+    "stylelint-config-standard": "^38.0.0"
   }
 }

data/webpack/components/CreateResourceQuotaModal.js

@@ -20,6 +20,7 @@ const CreateResourceQuotaModal = () => {
     <div>
       <Button
         id="foreman-resource-quota-create-modal-button"
+        ouiaId="foreman-resource-quota-create-modal-button"
         variant="primary"
         onClick={() => {
           setIsOpen(true);

data/webpack/components/ResourceQuotaEmptyState/__test__/__snapshots__/ResourceQuotaEmptyState.test.js.snap

@@ -7,6 +7,7 @@ exports[`ResourceQuotaEmptyState should render 1`] = `
       <Button
         id="foreman-resource-quota-welcome-create-modal-button"
         onClick={[Function]}
+        ouiaId="foreman-resource-quota-welcome-create-modal-button"
         variant="primary"
       >
         Create resource quota
@@ -57,6 +58,7 @@ exports[`ResourceQuotaEmptyState should render 1`] = `
           "disk_gb": null,
           "memory_mb": null,
           "name": "",
+          "unassigned": false,
         }
       }
       initialStatus={
@@ -75,6 +77,7 @@ exports[`ResourceQuotaEmptyState should render 1`] = `
       isNewQuota={true}
       onSubmit={[Function]}
       quotaChangesCallback={null}
+      showAssignmentWarning={false}
     />
   </Modal>
 </div>

data/webpack/components/ResourceQuotaEmptyState/index.js

@@ -21,6 +21,7 @@ const ResourceQuotaEmptyState = () => {
   const ActionButton = (
     <Button
       id="foreman-resource-quota-welcome-create-modal-button"
+      ouiaId="foreman-resource-quota-welcome-create-modal-button"
       variant="primary"
       onClick={() => {
         setIsOpen(true);

data/webpack/components/ResourceQuotaForm/ResourceQuotaFormConstants.js

@@ -2,6 +2,7 @@
 export const RESOURCE_IDENTIFIER_ID = 'id';
 export const RESOURCE_IDENTIFIER_NAME = 'name';
 export const RESOURCE_IDENTIFIER_DESCRIPTION = 'description';
+export const RESOURCE_IDENTIFIER_UNASSIGNED = 'unassigned';
 export const RESOURCE_IDENTIFIER_CPU = 'cpu_cores';
 export const RESOURCE_IDENTIFIER_MEMORY = 'memory_mb';
 export const RESOURCE_IDENTIFIER_DISK = 'disk_gb';

data/webpack/components/ResourceQuotaForm/components/Properties/StaticDetail.js

@@ -42,6 +42,7 @@ const StaticDetail = ({
         ) : (
           <TextInput
             id={id}
+            ouiaId={id}
             onChange={(_event, val) => onChange(val)}
             value={value}
             validated={validated}

data/webpack/components/ResourceQuotaForm/components/Properties/TextInputField.js

@@ -19,6 +19,7 @@ const TextInputField = ({
   isRequired,
   isTextArea,
   isNewQuota,
+  isDisabled,
 }) => {
   const dispatch = useDispatch();
   const [currentAttribute, setCurrentAttribute] = useState();
@@ -100,7 +101,7 @@ const TextInputField = ({
       loading={isLoading && currentAttribute === attribute}
       onEdit={onEdit}
       value={value}
-      disabled={false}
+      disabled={isDisabled}
       textArea={isTextArea}
       validated={validated}
       {...{ currentAttribute, setCurrentAttribute }}
@@ -114,6 +115,7 @@ TextInputField.defaultProps = {
   isRequired: false,
   isRestrictInputValidation: false,
   isNewQuota: false,
+  isDisabled: false,
 };
 
 TextInputField.propTypes = {
@@ -127,6 +129,7 @@ TextInputField.propTypes = {
   isTextArea: PropTypes.bool,
   isRequired: PropTypes.bool,
   isNewQuota: PropTypes.bool,
+  isDisabled: PropTypes.bool,
 };
 
 export default TextInputField;

data/webpack/components/ResourceQuotaForm/components/Properties/index.js

@@ -17,6 +17,7 @@ import {
 } from '@patternfly/react-core';
 
 import {
+  ExclamationCircleIcon,
   UserIcon,
   UsersIcon,
   ClusterIcon,
@@ -42,6 +43,8 @@ const Properties = ({
   initialName,
   initialDescription,
   initialStatus,
+  unassigned,
+  showAssignmentWarning,
   handleInputValidation,
   onChange,
   onApply,
@@ -89,6 +92,8 @@ const Properties = ({
         reference={tooltipRefFetchButton}
       >
         <Button
+          id="resource-quota-index-button"
+          ouiaId="resource-quota-index-button"
           isLoading={isFetchLoading}
           icon={<SyncAltIcon />}
           size="sm"
@@ -111,32 +116,48 @@ const Properties = ({
         <FlexItem>
           <LabelGroup isCompact>
             <StatusPropertiesLabel
-              color="blue"
-              iconChild={<ClusterIcon />}
+              color={showAssignmentWarning ? 'red' : 'blue'}
+              iconChild={
+                showAssignmentWarning ? (
+                  <ExclamationCircleIcon />
+                ) : (
+                  <ClusterIcon />
+                )
+              }
               statusContent={
                 statusProperties[RESOURCE_IDENTIFIER_STATUS_NUM_HOSTS]
               }
               linkUrl={`/hosts?search=resource_quota="${initialName}"`}
-              tooltipText="Number of assigned hosts"
-            />
-            <StatusPropertiesLabel
-              color="blue"
-              iconChild={<UserIcon />}
-              statusContent={
-                statusProperties[RESOURCE_IDENTIFIER_STATUS_NUM_USERS]
-              }
-              linkUrl={`/users?search=resource_quota="${initialName}"`}
-              tooltipText="Number of assigned users"
-            />
-            <StatusPropertiesLabel
-              color="blue"
-              iconChild={<UsersIcon />}
-              statusContent={
-                statusProperties[RESOURCE_IDENTIFIER_STATUS_NUM_USERGROUPS]
+              tooltipText={
+                showAssignmentWarning
+                  ? __(
+                      "The setting 'resource_quota_optional_assignment' is set to 'No' but there are hosts with no quota assignment. Please check your hosts' quota assignments!"
+                    )
+                  : __('Number of assigned hosts')
               }
-              linkUrl={`/usergroups?search=resource_quota="${initialName}"`}
-              tooltipText="Number of assigned usergroups"
             />
+            {!unassigned && (
+              <StatusPropertiesLabel
+                color="blue"
+                iconChild={<UserIcon />}
+                statusContent={
+                  statusProperties[RESOURCE_IDENTIFIER_STATUS_NUM_USERS]
+                }
+                linkUrl={`/users?search=resource_quota="${initialName}"`}
+                tooltipText="Number of assigned users"
+              />
+            )}
+            {!unassigned && (
+              <StatusPropertiesLabel
+                color="blue"
+                iconChild={<UsersIcon />}
+                statusContent={
+                  statusProperties[RESOURCE_IDENTIFIER_STATUS_NUM_USERGROUPS]
+                }
+                linkUrl={`/usergroups?search=resource_quota="${initialName}"`}
+                tooltipText="Number of assigned usergroups"
+              />
+            )}
           </LabelGroup>
         </FlexItem>
       </Flex>
@@ -144,7 +165,7 @@ const Properties = ({
   };
 
   return (
-    <Card>
+    <Card id="resource-quota-index-card" ouiaId="resource-quota-index-card">
       <CardHeader actions={{ actions: renderSyncButton() }}>
         {renderHeaderTitle()}
       </CardHeader>
@@ -161,6 +182,7 @@ const Properties = ({
               onChange={onChange}
               isRestrictInputValidation
               isRequired
+              isDisabled={unassigned}
             />
             <TextInputField
               initialValue={initialDescription}
@@ -171,6 +193,7 @@ const Properties = ({
               onApply={onApply}
               onChange={onChange}
               isTextArea
+              isDisabled={unassigned}
             />
           </TextList>
         </TextContent>
@@ -187,6 +210,8 @@ Properties.defaultProps = {
     [RESOURCE_IDENTIFIER_STATUS_NUM_USERS]: null,
     [RESOURCE_IDENTIFIER_STATUS_NUM_USERGROUPS]: null,
   },
+  unassigned: false,
+  showAssignmentWarning: false,
 };
 
 Properties.propTypes = {
@@ -198,6 +223,8 @@ Properties.propTypes = {
     [RESOURCE_IDENTIFIER_STATUS_NUM_USERS]: PropTypes.number,
     [RESOURCE_IDENTIFIER_STATUS_NUM_USERGROUPS]: PropTypes.number,
   }),
+  unassigned: PropTypes.bool,
+  showAssignmentWarning: PropTypes.bool,
   handleInputValidation: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
   onApply: PropTypes.func.isRequired,

data/webpack/components/ResourceQuotaForm/components/Resource/UnitInputField.js

@@ -49,6 +49,7 @@ const UnitInputField = ({
     unitDropdownItems = units.map(unit => (
       <DropdownItem
         id={`unit-dropdownitem-${unit.symbol.toLowerCase()}`}
+        ouiaId={`unit-dropdownitem-${unit.symbol.toLowerCase()}`}
         key={unit.symbol.toLowerCase()}
       >
         {unit.symbol}
@@ -169,10 +170,12 @@ const UnitInputField = ({
     return (
       <InputGroupItem>
         <Dropdown
+          ouiaId="resource-quota-unit-input-field-input-group-item-dropdown"
           onSelect={onUnitSelect}
           toggle={
             <DropdownToggle
               isDisabled={isDisabled}
+              ouiaId="resource-quota-unit-input-field-input-group-item-dropdowni-toggle"
               onToggle={(_event, _val) => onUnitToggle()}
             >
               {__(`${selectedUnit.symbol}`)}
@@ -233,7 +236,8 @@ const UnitInputField = ({
               min={minValue}
               max={maxValue}
               validated={validated}
-              id="reg_token_life_time_input"
+              id="resource-quota-reg-token-life-time-input"
+              ouiaId="resource-quota-reg-token-life-time-input"
               onChange={(_event, val) => setInputValue(val)}
             />
           </InputGroupItem>

data/webpack/components/ResourceQuotaForm/components/Resource/UtilizationProgress.js

@@ -105,19 +105,20 @@ const UtilizationProgress = ({
       <Tooltip
         content={resourceUtilizationTooltipText}
         reference={tooltipRefUtilization}
-      />
-      <div
-        className={isEnabled ? '' : 'progress-disabled'}
-        ref={tooltipRefUtilization}
       >
-        <Progress
-          aria-label={`resource-card-${cardId}-progress`}
-          value={resourceUtilizationPercent}
-          measureLocation={ProgressMeasureLocation.inside}
-          size={ProgressSize.lg}
-          variant={resourceProgressVariant()}
-        />
-      </div>
+        <div
+          className={isEnabled ? '' : 'progress-disabled'}
+          ref={tooltipRefUtilization}
+        >
+          <Progress
+            aria-label={`resource-card-${cardId}-progress`}
+            value={resourceUtilizationPercent}
+            measureLocation={ProgressMeasureLocation.inside}
+            size={ProgressSize.lg}
+            variant={resourceProgressVariant()}
+          />
+        </div>
+      </Tooltip>
     </div>
   );
 };

data/webpack/components/ResourceQuotaForm/components/Resource/__test__/__snapshots__/UnitInputField.test.js.snap

@@ -17,11 +17,12 @@ exports[`UnitInputField should render as disabled field 1`] = `
     <InputGroup>
       <InputGroupItem>
         <TextInput
-          id="reg_token_life_time_input"
+          id="resource-quota-reg-token-life-time-input"
           isDisabled={true}
           max={5}
           min={0}
           onChange={[Function]}
+          ouiaId="resource-quota-reg-token-life-time-input"
           validated="default"
           value={0}
         />
@@ -32,11 +33,13 @@ exports[`UnitInputField should render as disabled field 1`] = `
             Array [
               <DropdownItem
                 id="unit-dropdownitem-mib"
+                ouiaId="unit-dropdownitem-mib"
               >
                 MiB
               </DropdownItem>,
               <DropdownItem
                 id="unit-dropdownitem-gib"
+                ouiaId="unit-dropdownitem-gib"
               >
                 GiB
               </DropdownItem>,
@@ -44,10 +47,12 @@ exports[`UnitInputField should render as disabled field 1`] = `
           }
           isOpen={false}
           onSelect={[Function]}
+          ouiaId="resource-quota-unit-input-field-input-group-item-dropdown"
           toggle={
             <DropdownToggle
               isDisabled={true}
               onToggle={[Function]}
+              ouiaId="resource-quota-unit-input-field-input-group-item-dropdowni-toggle"
             >
               MiB
             </DropdownToggle>
@@ -76,11 +81,12 @@ exports[`UnitInputField should render default 1`] = `
     <InputGroup>
       <InputGroupItem>
         <TextInput
-          id="reg_token_life_time_input"
+          id="resource-quota-reg-token-life-time-input"
           isDisabled={false}
           max={5}
           min={0}
           onChange={[Function]}
+          ouiaId="resource-quota-reg-token-life-time-input"
           validated="default"
           value={0}
         />
@@ -91,11 +97,13 @@ exports[`UnitInputField should render default 1`] = `
             Array [
               <DropdownItem
                 id="unit-dropdownitem-mib"
+                ouiaId="unit-dropdownitem-mib"
               >
                 MiB
               </DropdownItem>,
               <DropdownItem
                 id="unit-dropdownitem-gib"
+                ouiaId="unit-dropdownitem-gib"
               >
                 GiB
               </DropdownItem>,
@@ -103,10 +111,12 @@ exports[`UnitInputField should render default 1`] = `
           }
           isOpen={false}
           onSelect={[Function]}
+          ouiaId="resource-quota-unit-input-field-input-group-item-dropdown"
           toggle={
             <DropdownToggle
               isDisabled={false}
               onToggle={[Function]}
+              ouiaId="resource-quota-unit-input-field-input-group-item-dropdowni-toggle"
             >
               MiB
             </DropdownToggle>
@@ -135,11 +145,12 @@ exports[`UnitInputField should render without dropdown (single unit) 1`] = `
     <InputGroup>
       <InputGroupItem>
         <TextInput
-          id="reg_token_life_time_input"
+          id="resource-quota-reg-token-life-time-input"
           isDisabled={false}
           max={5}
           min={0}
           onChange={[Function]}
+          ouiaId="resource-quota-reg-token-life-time-input"
           validated="default"
           value={0}
         />

data/webpack/components/ResourceQuotaForm/components/Resource/index.js

@@ -143,6 +143,8 @@ const Resource = ({
         variant="primary"
         onClick={onClickApply}
         isLoading={isApplyLoading}
+        id="resource-quota-resource-index-button-apply"
+        ouiaId="resource-quota-resource-index-button-apply"
       >
         {__('Apply')}
       </Button>
@@ -154,6 +156,7 @@ const Resource = ({
       isExpanded={isExpanded}
       isDisabledRaised={!isEnabled}
       id={`resource-card-${cardId}`}
+      ouiaId={`resource-card-${cardId}`}
     >
       <CardHeader
         actions={{ actions: renderApplyButton() }}
@@ -164,6 +167,7 @@ const Resource = ({
           <FlexItem>
             <Switch
               id={`switch-${cardId}`}
+              ouiaId={`switch-${cardId}`}
               aria-label={`switch-${cardId}`}
               onChange={(_event, val) => onChangeEnabled(val)}
               isChecked={isEnabled}

data/webpack/components/ResourceQuotaForm/components/Submit.js

@@ -48,7 +48,8 @@ const Submit = ({ isValid, onCreate, onSubmit }) => {
           onClick={handleOnSubmit}
           isLoading={isSubmitLoading}
           variant="primary"
-          id="submit-button"
+          id="resource-quota-submit-button"
+          ouiaId="resource-quota-submit-button"
         >
           {__('Create resource quota')}
         </Button>

data/webpack/components/ResourceQuotaForm/index.js

@@ -16,6 +16,7 @@ import {
   RESOURCE_IDENTIFIER_CPU,
   RESOURCE_IDENTIFIER_MEMORY,
   RESOURCE_IDENTIFIER_DISK,
+  RESOURCE_IDENTIFIER_UNASSIGNED,
   RESOURCE_IDENTIFIER_STATUS_NUM_HOSTS,
   RESOURCE_IDENTIFIER_STATUS_NUM_USERS,
   RESOURCE_IDENTIFIER_STATUS_NUM_USERGROUPS,
@@ -25,6 +26,7 @@ import {
 
 const ResourceQuotaForm = ({
   isNewQuota,
+  showAssignmentWarning,
   initialProperties,
   initialStatus,
   onSubmit,
@@ -72,33 +74,41 @@ const ResourceQuotaForm = ({
                   RESOURCE_IDENTIFIER_DESCRIPTION
                 )}
                 initialStatus={modelState.getQuotaStatus()}
-                handleInputValidation={modelState.handleInputValidation}
-                onChange={modelState.onChange}
-                onApply={modelState.onApply}
-                onFetch={modelState.onFetchUtilization}
-              />
-            )}
-          </SkeletonLoader>
-        </GalleryItem>
-        <GalleryItem key="edit-resource-quota-resources-item">
-          <SkeletonLoader
-            skeletonProps={{ width: 400 }}
-            status={isNewQuota || !isLoading ? STATUS.RESOLVED : STATUS.PENDING}
-          >
-            {(!isLoading || isNewQuota) && (
-              <Resources
-                isNewQuota={isNewQuota}
-                initialProperties={modelState.getQuotaProperties()}
-                initialStatus={modelState.getQuotaStatus(
-                  RESOURCE_IDENTIFIER_STATUS_UTILIZATION
+                unassigned={modelState.getQuotaProperties(
+                  RESOURCE_IDENTIFIER_UNASSIGNED
                 )}
+                showAssignmentWarning={showAssignmentWarning}
                 handleInputValidation={modelState.handleInputValidation}
                 onChange={modelState.onChange}
                 onApply={modelState.onApply}
+                onFetch={modelState.onFetchUtilization}
               />
             )}
           </SkeletonLoader>
         </GalleryItem>
+        {!modelState.getQuotaProperties(RESOURCE_IDENTIFIER_UNASSIGNED) && (
+          <GalleryItem key="edit-resource-quota-resources-item">
+            <SkeletonLoader
+              skeletonProps={{ width: 400 }}
+              status={
+                isNewQuota || !isLoading ? STATUS.RESOLVED : STATUS.PENDING
+              }
+            >
+              {(!isLoading || isNewQuota) && (
+                <Resources
+                  isNewQuota={isNewQuota}
+                  initialProperties={modelState.getQuotaProperties()}
+                  initialStatus={modelState.getQuotaStatus(
+                    RESOURCE_IDENTIFIER_STATUS_UTILIZATION
+                  )}
+                  handleInputValidation={modelState.handleInputValidation}
+                  onChange={modelState.onChange}
+                  onApply={modelState.onApply}
+                />
+              )}
+            </SkeletonLoader>
+          </GalleryItem>
+        )}
         {isNewQuota && (
           <GalleryItem key="edit-resource-quota-submit-item">
             <Submit
@@ -114,6 +124,7 @@ const ResourceQuotaForm = ({
 };
 
 ResourceQuotaForm.defaultProps = {
+  showAssignmentWarning: false,
   onSubmit: null,
   quotaChangesCallback: null,
   initialProperties: {
@@ -122,6 +133,7 @@ ResourceQuotaForm.defaultProps = {
     [RESOURCE_IDENTIFIER_CPU]: null,
     [RESOURCE_IDENTIFIER_MEMORY]: null,
     [RESOURCE_IDENTIFIER_DISK]: null,
+    [RESOURCE_IDENTIFIER_UNASSIGNED]: false,
   },
   initialStatus: {
     [RESOURCE_IDENTIFIER_STATUS_NUM_HOSTS]: null,
@@ -138,6 +150,7 @@ ResourceQuotaForm.defaultProps = {
 
 ResourceQuotaForm.propTypes = {
   isNewQuota: PropTypes.bool.isRequired,
+  showAssignmentWarning: PropTypes.bool,
   onSubmit: PropTypes.func,
   quotaChangesCallback: PropTypes.func,
   initialProperties: PropTypes.shape({
@@ -147,6 +160,7 @@ ResourceQuotaForm.propTypes = {
     [RESOURCE_IDENTIFIER_CPU]: PropTypes.number,
     [RESOURCE_IDENTIFIER_MEMORY]: PropTypes.number,
     [RESOURCE_IDENTIFIER_DISK]: PropTypes.number,
+    [RESOURCE_IDENTIFIER_UNASSIGNED]: PropTypes.bool,
   }),
   initialStatus: PropTypes.shape({
     [RESOURCE_IDENTIFIER_STATUS_NUM_HOSTS]: PropTypes.oneOfType([

data/webpack/components/UpdateResourceQuotaModal.js

@@ -20,7 +20,11 @@ import {
   RESOURCE_IDENTIFIER_STATUS_UTILIZATION,
 } from './ResourceQuotaForm/ResourceQuotaFormConstants';
 
-const UpdateResourceQuotaModal = ({ initialProperties, initialStatus }) => {
+const UpdateResourceQuotaModal = ({
+  initialProperties,
+  initialStatus,
+  showAssignmentWarning,
+}) => {
   const staticId = `${MODAL_ID_UPDATE_RESOURCE_QUOTA}-${initialProperties[RESOURCE_IDENTIFIER_ID]}`;
   const [isOpen, setIsOpen] = useState(false);
   const [quotaProperties, setQuotaProperties] = useState(initialProperties);
@@ -52,6 +56,7 @@ const UpdateResourceQuotaModal = ({ initialProperties, initialStatus }) => {
       >
         <ResourceQuotaForm
           isNewQuota={false}
+          showAssignmentWarning={showAssignmentWarning}
           initialProperties={quotaProperties}
           initialStatus={quotaStatus}
           quotaChangesCallback={onQuotaChangesCallback}
@@ -138,6 +143,7 @@ UpdateResourceQuotaModal.propTypes = {
       ]),
     }),
   }),
+  showAssignmentWarning: PropTypes.bool.isRequired,
 };
 
 export default UpdateResourceQuotaModal;

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_resource_quota
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bastian Schmidt
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -153,6 +152,8 @@ files:
 - db/migrate/20240611141939_drop_missing_hosts.rb
 - db/migrate/20240611142813_create_hosts_resources.rb
 - db/migrate/20240618163434_remove_resource_quota_from_hosts.rb
+- db/migrate/20250410082728_add_unassigned_flag_to_resource_quota.rb
+- db/seeds.d/030-unassigned_quota.rb
 - lib/foreman_resource_quota.rb
 - lib/foreman_resource_quota/async/refresh_resource_quota_utilization.rb
 - lib/foreman_resource_quota/engine.rb
@@ -306,7 +307,6 @@ licenses:
 - GPL-3.0
 metadata:
   is_foreman_plugin: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -321,8 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Foreman Plug-in for resource quota
 test_files: []