Merge pull request #349 from goinvo/fermion/view-cleanup-sign-out-bug…

…-fix Clean up of unused views, refactor existing forms, fix intermittent sign out bug 🤞🏻
goinvo · Oct 12, 2024 · ed99d78 · ed99d78
2 parents 93ac590 + 39e8ebf
commit ed99d78
Show file tree

Hide file tree

Showing 49 changed files with 308 additions and 1,448 deletions.
diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
diff --git a/app/controllers/settings/users_controller.rb b/app/controllers/settings/users_controller.rb
@@ -45,7 +45,11 @@ def create
     rescue ActiveRecord::RecordInvalid
       @user = @command.user
       @user.valid?
-      render :new
+
+      respond_to do |format|
+        format.html { render :new }
+        format.turbo_stream
+      end
     end
   end
 

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
@@ -6,11 +6,24 @@ def show
   end
 
   def update
-    if current_company.update(update_params)
-      flash[:success] = "Company updated successfully"
+    # handle avatar changes first
+    if update_params[:avatar].present?
+      current_company.assign_attributes(avatar: update_params[:avatar])
+      current_company.attachment_changes.any? && current_company.save
+    end
+
+    current_company.assign_attributes(update_params.except(:avatar))
+
+    if current_company.save
+      flash[:success] = "Updates saved!"
       redirect_to settings_path
     else
-      render :show
+      flash.now[:error] = "Some information couldn't be saved."
+
+      respond_to do |format|
+        format.turbo_stream
+        format.html { render :show }
+      end
     end
   end
 

diff --git a/app/controllers/users/profile_controller.rb b/app/controllers/users/profile_controller.rb
@@ -4,11 +4,24 @@ def show
   end
 
   def update
-    if current_user.update(user_params)
-      flash[:notice] = 'Your profile was updated successfully'
+    # handle avatar changes first
+    if user_params[:avatar].present?
+      current_user.assign_attributes(avatar: user_params[:avatar])
+      current_user.attachment_changes.any? && current_user.save
+    end
+
+    current_user.assign_attributes(user_params.except(:avatar))
+
+    if current_user.save
+      flash[:success] = 'Your profile was updated successfully'
       redirect_to users_profile_path
     else
-      render :show
+      flash.now[:error] = 'There was a problem updating your profile'
+
+      respond_to do |format|
+        format.turbo_stream
+        format.html { render :show }
+      end
     end
   end
 

diff --git a/app/helpers/assignments_helper.rb b/app/helpers/assignments_helper.rb
diff --git a/app/helpers/clients_helper.rb b/app/helpers/clients_helper.rb
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
diff --git a/app/models/company.rb b/app/models/company.rb
@@ -39,4 +39,17 @@ def can_access?(user:)
     membership = memberships.find_by(user: user)
     membership.present? && membership.active?
   end
+
+  def restore_avatar
+    if avatar.attached? && avatar.changed?
+      original_picture = avatar.attachment_was
+      if original_picture
+        # Detach the current attachment
+        avatar.detach
+
+        # Reattach the original attachment
+        avatar.attach(original_picture)
+      end
+    end
+  end
 end
diff --git a/app/views/assignments/_assignment.html.erb b/app/views/assignments/_assignment.html.erb
diff --git a/app/views/assignments/_assignment.json.jbuilder b/app/views/assignments/_assignment.json.jbuilder
diff --git a/app/views/assignments/_form.html.erb b/app/views/assignments/_form.html.erb
diff --git a/app/views/assignments/edit.html.erb b/app/views/assignments/edit.html.erb
diff --git a/app/views/assignments/index.html.erb b/app/views/assignments/index.html.erb
diff --git a/app/views/assignments/index.json.jbuilder b/app/views/assignments/index.json.jbuilder
diff --git a/app/views/assignments/new.html.erb b/app/views/assignments/new.html.erb
diff --git a/app/views/assignments/show.html.erb b/app/views/assignments/show.html.erb
diff --git a/app/views/assignments/show.json.jbuilder b/app/views/assignments/show.json.jbuilder