Merge pull request #2442 from FarmBot/staging

v15.8.4

README.md

@@ -24,7 +24,7 @@ Hosting your own server requires an understanding of how Ruby on Rails applicati
 
 ## Local setup
 
-We recommend all self hosted installations be installed on a fresh Ubuntu server using the instructions provided in [ubuntu_example.sh](https://github.com/FarmBot/Farmbot-Web-App/blob/main/ubuntu_example.sh). These instructions are reguarly checked and updated to ensure they work. **At this time we cannot provide assistance for running the web app in different environments.**
+We recommend all self hosted installations be installed on a fresh Ubuntu server using the instructions provided in [ubuntu_example.sh](https://github.com/FarmBot/Farmbot-Web-App/blob/main/ubuntu_example.sh). These instructions are regularly checked and updated to ensure they work. **At this time we cannot provide assistance for running the web app in different environments.**
 
 If you raise an issue indicating that you haven't followed the setup instructions, looked through past issues, or done a cursory internet search for basic help, expect the issue to be closed and we'll point you to the setup instructions. *Again, if you do not have at least intermediate Linux and Ruby experience, please use [my.farm.bot](https://my.farm.bot).* Running a self-hosted server is not easy!
 

app/controllers/api/tools_controller.rb

@@ -33,7 +33,7 @@ def tools
     end
 
     def tool
-      @tool ||= Tool.join_tool_slot_and_find_by_id(params[:id])
+      @tool ||= Tool.join_tool_slot_and_find_by_id(params[:id].to_i)
     end
   end
 end

frontend/plants/grid/plant_grid.tsx

@@ -122,8 +122,7 @@ export class PlantGrid extends React.Component<PlantGridProps, PlantGridState> {
           grid: this.initGridState,
           gridId: uuid(),
           status: "clean",
-        });
-        this.props.close?.();
+        }, this.props.close);
       });
 
   Buttons = () => {

frontend/tools/add_tool.tsx

@@ -54,6 +54,8 @@ export class RawAddTool extends React.Component<AddToolProps, AddToolState> {
 
   newTool = (name: string) => this.props.dispatch(initSave("Tool", { name }));
 
+  back = () => push(Path.tools());
+
   save = () => {
     const initTool = init("Tool", {
       name: this.state.toolName,
@@ -63,10 +65,8 @@ export class RawAddTool extends React.Component<AddToolProps, AddToolState> {
     const { uuid } = initTool.payload;
     this.setState({ uuid });
     this.props.dispatch(save(uuid))
-      .then(() => {
-        this.setState({ uuid: undefined });
-        push(Path.tools());
-      }).catch(() => { });
+      .then(() => this.setState({ uuid: undefined }, this.back))
+      .catch(() => { });
   };
 
   componentWillUnmount = () =>

frontend/ui/filter_search.tsx

@@ -40,7 +40,8 @@ export class FilterSearch
           "filter-search-popover",
           Classes.MINIMAL,
           this.props.items.length < 4 ? "few-items" : "",
-        ].join(" ")
+        ].join(" "),
+        modifiers: { offset: { options: { offset: [0, 5] } } },
       }}>
       <i className="fa fa-caret-down fa-md" />
       <Button

ubuntu_example.sh

@@ -1,4 +1,4 @@
-# How to install FarmBot Web API on a Fresh Ubuntu 22.10 Machine
+# How to install FarmBot Web API on a Fresh Ubuntu 22.04 Machine
 
 # IMPORTANT NOTE: Resources are limited and Farmbot, inc. cannot provide
 # longterm support to self-hosted users. If you have never administered a
@@ -16,19 +16,18 @@
 sudo apt remove docker-engine
 sudo apt remove docker docker.io containerd runc
 
-# Install docker
+# Install docker and docker compose
 sudo apt update
 sudo apt install ca-certificates curl gnupg lsb-release -y
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo install -m 0755 -d /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 sudo apt update
-sudo apt install docker-ce docker-ce-cli containerd.io docker-compose-plugin -y
-sudo docker run hello-world # Should run!
-# Install docker-compose
-sudo mkdir -p /usr/local/lib/docker/cli-plugins
-sudo curl -SL "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose
-sudo chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
-sudo docker compose version # test installation
+sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
+# Verify installation
+sudo docker run hello-world
+sudo docker compose version
 
 # Install FarmBot Web App
 # ⚠ SKIP THIS STEP IF UPGRADING!