Merge branch 'main' into 5372AlignmentNudges3

Author: awwaiid

.devcontainer/Dockerfile

@@ -1,7 +1,11 @@
-# Installs Ruby 3.2.2. When human-essentials moves to a newer version of ruby,
+# Installs Ruby 3.4. When human-essentials moves to a newer version of ruby,
 # it will be more efficient to change the image.
 # See https://github.com/devcontainers/images/blob/main/src/ruby/history/
-FROM mcr.microsoft.com/devcontainers/ruby:dev-3.2
+#
+# See devcontainers/features#1431 for why we include the `-bookworm`
+# suffix. Once that issue is resolved, we can remove the suffix, which
+# will let us follow the debian upgrade to trixie.
+FROM mcr.microsoft.com/devcontainers/ruby:dev-3.4-bookworm
 RUN export DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get -y install vim curl gpg postgresql postgresql-contrib
 RUN cd /tmp

.devcontainer/devcontainer.json

@@ -5,12 +5,8 @@
   "features": {
     "ghcr.io/devcontainers/features/desktop-lite:1": {}
   },
-  "forwardPorts": [3000, 5432, 6080],
+  "forwardPorts": [5432, 6080],
   "portsAttributes": {
-    "3000": {
-      "label": "Application",
-      "onAutoForward": "silent"
-    },
     "5432": {
       "label": "Database",
       "onAutoForward": "silent"
@@ -26,6 +22,8 @@
     "vscode": {
       "extensions": ["Shopify.ruby-extensions-pack"],
       "settings": {
+        // This doesn't seem to work. Not sure if we actually
+        // install+configure rvm.
         "rubyLsp.rubyVersionManager": {
           "identifier": "rvm"
         }

.devcontainer/docker-compose.yml

@@ -16,6 +16,7 @@ services:
     command: sleep infinity
 
     # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
+    # (Although we're not sure if our port forwarding is actually doing any good)
     network_mode: service:postgres
 
   postgres:

.devcontainer/post-create.sh

@@ -1,28 +1,26 @@
-RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
-
 # copy the file only if it doesn't already exist
 echo "*** Creating initial .env and vscode settings, if needed"
 cp -n .devcontainer/.env.codespaces .env
 mkdir -p .vscode && cp -n .devcontainer/launch.json.codespaces .vscode/launch.json
 
-# If the project's required ruby version changes from 3.2.2, this command
-# will download and compile the correct version, but it will take a long time.
-if [ "$RUBY_VERSION" != "3.2.2" ]; then
-  echo "*** Installing Ruby $RUBY_VERSION (this may take a while)"
-  rvm install $RUBY_VERSION
-  rvm use $RUBY_VERSION
-  echo "Ruby $RUBY_VERSION installed"
-fi
-
 echo "*** Setting up node"
-nvm install node
+nvm install node &
 
 echo "*** Setting up ruby environment"
-rbenv init bash
-rbenv init zsh
+rbenv init bash &
+rbenv init fish &
+rbenv init zsh &
 
 # echo "*** Forcing platform version of nokogiri"
 # gem install nokogiri -v 1.18.1 --platform=ruby -- --use-system-libraries
 
+# If the project's required ruby version (specified in .ruby-version)
+# changes from 3.4.3, this command will download and compile the correct
+# version, but it will take a long time.
+echo "*** Installing rbenv-able Ruby ***"
+rbenv install --skip-existing &
+
+wait
+
 echo "*** Running project bin/setup"
 bin/setup

.prettierignore

@@ -0,0 +1 @@
+**

CONTRIBUTING.md

@@ -134,19 +134,22 @@ You might also want to try VSCode with [this WSL extension](https://marketplace.
   ```
 </details>
 
-## Codespaces and Dev Container - EXPERIMENTAL 🛠️
+## One-click in-the-cloud env via Codespaces and Dev Container - EXPERIMENTAL 🛠️
 
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/rubyforgood/human-essentials/tree/main?quickstart=1)
-
-[![Clone and open in VSCode Dev Container](https://img.shields.io/static/v1?label=Dev%20Containers&message=Clone%20and%20Open%20in%20VSCode&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rubyforgood/human-essentials)
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/rubyforgood/human-essentials/tree/fix-devcontainers?quickstart=1)
 
 1. Create the container:
     - To run the container on a Github VM, follow the Codespace link above. You can connect to the Codespace using VSCode or the VSCode web editor.
     - Or follow instructions to [create a new Codespace.](https://docs.github.com/en/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository)
     - To clone this repo and run the container locally, follow instructions to [install VSCode and Docker](https://code.visualstudio.com/docs/devcontainers/containers). Click the Dev Container link above. Don't forget to add a git remote pointing to your fork once the container is setup and you want to push changes.
 2. Wait for the container to start. This will take a few (10-15) minutes since Ruby needs to be installed, the database needs to be created, and the `bin/setup` script needs to run
-3. Run `bin/start`. On the Ports tab, visit the forwarded port 3000 URL marked as Application to see the human essentials page.
-4. Login as a sample user with the default [credentials](#credentials).
+3. Run `bin/start`.
+4. On the Ports tab, visit the forwarded port 3000 URL marked as Application to see the human essentials page.
+5. Login as a sample user with the default [credentials](#credentials).
+
+### Further experimental option—local dev container
+
+[![Clone and open in VSCode Dev Container](https://img.shields.io/static/v1?label=Dev%20Containers&message=Clone%20and%20Open%20in%20VSCode&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/rubyforgood/human-essentials)
 
 ## Troubleshooting 👷🏼‍♀️
 

Gemfile.lock

@@ -76,27 +76,28 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
-    annotaterb (4.16.0)
+    annotaterb (4.19.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     awesome_print (1.9.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1123.0)
-    aws-sdk-core (3.226.1)
+    aws-partitions (1.1168.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.106.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.113.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.191.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.199.1)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -123,7 +124,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -169,9 +170,9 @@ GEM
     cuprite (0.17)
       capybara (~> 3.0)
       ferrum (~> 0.17.0)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     debug (1.11.0)
@@ -238,9 +239,9 @@ GEM
       smart_properties
     erubi (1.13.1)
     execjs (2.10.0)
-    factory_bot (6.5.4)
+    factory_bot (6.5.5)
       activesupport (>= 6.1.0)
-    factory_bot_rails (6.5.0)
+    factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
     faker (3.5.1)
@@ -340,7 +341,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.12.2)
+    json (2.15.1)
     jwt (3.1.2)
       base64
     kaminari (1.2.2)
@@ -355,7 +356,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    knapsack_pro (8.3.3)
+    knapsack_pro (8.4.0)
       rake
     language_server-protocol (3.17.0.5)
     launchy (3.0.0)
@@ -394,7 +395,6 @@ GEM
     memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
     minitest (5.25.5)
     monetize (1.12.0)
       money (~> 6.12)
@@ -423,11 +423,8 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    newrelic_rpm (9.20.0)
+    newrelic_rpm (9.21.0)
     nio4r (2.7.4)
-    nokogiri (1.18.9)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
     nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-darwin)
@@ -469,7 +466,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -496,7 +493,7 @@ GEM
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.5.2)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -517,7 +514,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (7.0.4)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.2.1)
@@ -581,7 +578,7 @@ GEM
       erb
       psych (>= 4.0.0)
     recaptcha (5.20.1)
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -613,18 +610,18 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
-    rubocop (1.75.8)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
@@ -692,10 +689,10 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stackprof (0.2.27)
-    standard (1.50.0)
+    standard (1.51.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.5)
+      rubocop (~> 1.80.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -718,14 +715,14 @@ GEM
     tilt (2.2.0)
     timeout (0.4.3)
     ttfunk (1.7.0)
-    turbo-rails (2.0.16)
+    turbo-rails (2.0.17)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uniform_notifier (1.17.0)
     uri (1.0.3)
     useragent (0.16.11)
@@ -753,7 +750,6 @@ GEM
 
 PLATFORMS
   arm64-darwin
-  ruby
   x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu

app/assets/stylesheets/custom.scss

@@ -112,3 +112,7 @@
     max-width: 100%;
   }
 }
+
+.cursor-default {
+    cursor: default !important;
+}

app/controllers/admin/users_controller.rb

@@ -87,6 +87,12 @@ def add_role
     redirect_back(fallback_location: admin_users_path, notice: "Role added!")
   end
 
+  def resend_invitation
+    user = User.find(params[:user_id])
+    user.invite!
+    redirect_back(fallback_location: admin_users_path, notice: "#{user.name} reinvited!")
+  end
+
   def remove_role
     RemoveRoleService.call(user_id: params[:user_id], role_id: params[:role_id])
     redirect_back(fallback_location: admin_users_path, notice: "Role removed!")

app/controllers/audits_controller.rb

@@ -7,6 +7,13 @@ def index
     @selected_location = filter_params[:at_location]
     @audits = current_organization.audits.includes(:line_items, :storage_location).class_filter(filter_params)
     @storage_locations = StorageLocation.with_audits_for(current_organization).select(:id, :name)
+
+    respond_to do |format|
+      format.html
+      format.csv do
+        send_data Audit.generate_csv(@audits), filename: "Audits-#{Time.zone.today}.csv"
+      end
+    end
   end
 
   def show