Merge pull request #18859 from rubhanazeem/attributes-rewrite

Check for existing attributes before creating new ones

Author: krauselukas

src/api/app/controllers/webui/attribute_controller.rb

@@ -1,8 +1,8 @@
 class Webui::AttributeController < Webui::WebuiController
   helper :all
-  before_action :set_project, only: %i[index new edit]
-  before_action :set_package, only: %i[index new edit]
-  before_action :set_container, only: %i[index new edit]
+  before_action :set_project, only: %i[index new edit create]
+  before_action :set_package, only: %i[index new edit create]
+  before_action :set_container, only: %i[index new edit create]
   before_action :set_attribute, only: %i[update destroy]
 
   # raise an exception if authorize has not yet been called.
@@ -23,7 +23,7 @@ def new
 
     authorize @attribute, :create?
 
-    @attribute_types = AttribType.includes(:attrib_namespace).all.sort_by(&:fullname)
+    @attribute_types = AttribType.includes(:attrib_namespace).where.not(id: @container.attribs.map(&:attrib_type_id)).sort_by(&:fullname)
   end
 
   def edit
@@ -42,8 +42,7 @@ def edit
   end
 
   def create
-    @attribute = Attrib.new(attrib_params)
-
+    @attribute = @container.attribs.find_or_initialize_by(attrib_type_id: attrib_params[:attrib_type_id])
     authorize @attribute
 
     # build the default values

src/api/app/views/webui/attribute/new.html.haml

@@ -8,8 +8,10 @@
     = form_for(@attribute) do |form|
       .row
         = form.hidden_field(:project_id)
+        = hidden_field_tag(:project_name, @project.name)
         - if @attribute.package_id
           = form.hidden_field(:package_id)
+          = hidden_field_tag(:package_name, @package.name)
         .col-12.col-md-auto
           = form.collection_select(:attrib_type_id, @attribute_types, :id, :fullname, {}, class: 'form-control form-select')
         .col-form-label.col-12.col-md

src/api/spec/controllers/webui/attribute_controller_spec.rb

@@ -107,7 +107,7 @@
 
     context 'with editable values' do
       before do
-        post :create, params: { attrib: { project_id: user.home_project.id, attrib_type_id: attribute_type1.id } }
+        post :create, params: { attrib: { project_id: user.home_project.id, attrib_type_id: attribute_type1.id }, project_name: user.home_project.name }
       end
 
       it { expect(response).to redirect_to(edit_attribs_path(project: user.home_project_name, package: '', attribute: attribute_type1_name)) }
@@ -116,7 +116,7 @@
 
     context 'with non editable values' do
       before do
-        post :create, params: { attrib: { project_id: user.home_project.id, attrib_type_id: attribute_type0.id } }
+        post :create, params: { attrib: { project_id: user.home_project.id, attrib_type_id: attribute_type0.id }, project_name: user.home_project.name }
       end
 
       it { expect(response).to redirect_to(index_attribs_path(project: user.home_project_name, package: '')) }
@@ -126,7 +126,7 @@
     context 'fails at save' do
       before do
         allow_any_instance_of(Attrib).to receive(:save).and_return(false)
-        post :create, params: { attrib: { project_id: user.home_project.id, attrib_type_id: attribute_type1.id } }
+        post :create, params: { attrib: { project_id: user.home_project.id, attrib_type_id: attribute_type1.id }, project_name: user.home_project.name }
       end
 
       it { expect(response).to redirect_to(root_path) }