Merge branch 'main' into dt-studio-chart-kpi

redwoodjs · May 11, 2023 · 6c4c78d · 6c4c78d
2 parents ef2e63d + 8564995
commit 6c4c78d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/packages/api-server/src/server.ts b/packages/api-server/src/server.ts
@@ -11,7 +11,7 @@ export const startServer = ({
   socket,
   fastify,
 }: HttpServerParams) => {
-  const host = process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::'
+  const host = 'localhost'
   const serverPort = socket ? parseInt(socket) : port
 
   fastify.listen({ port: serverPort, host })

diff --git a/packages/core/config/webpack.development.js b/packages/core/config/webpack.development.js
@@ -83,6 +83,12 @@ const getProxyConfig = () => {
 /** @type {import('webpack').Configuration} */
 const baseConfig = merge(webpackConfig('development'), {
   devServer: {
+    // `runtimeErrors` became true by default in webpack-dev-server v4.15.0 and interferes with <FormError />.
+    client: {
+      overlay: {
+        runtimeErrors: false,
+      },
+    },
     // https://webpack.js.org/configuration/dev-server/
     // note: docs not yet updated for webpack-dev-server v4
     devMiddleware: {

diff --git a/packages/studio/frontend/src/Components/SearchFilterBar.tsx b/packages/studio/frontend/src/Components/SearchFilterBar.tsx
@@ -6,22 +6,18 @@ import { useLocation } from 'react-router-dom'
 import { SearchFilterContext } from '../Context/SearchFilterContextProvider'
 
 export default function SearchFilterBar() {
+  const location = useLocation()
   const [searchFilters, dispatcher] = useContext(SearchFilterContext)
 
-  const location = useLocation()
-  const [filterValue, setFilterValue] = useState(
-    location.pathname.startsWith('/explorer/span')
-      ? searchFilters.spansFilter
-      : searchFilters.tracesFilter
-  )
+  const relevantFilters = location.pathname.startsWith('/explorer/span')
+    ? searchFilters.spansFilter
+    : searchFilters.tracesFilter
+
+  const [filterValue, setFilterValue] = useState(relevantFilters)
 
   useEffect(() => {
-    setFilterValue(
-      location.pathname.startsWith('/explorer/span')
-        ? searchFilters.spansFilter
-        : searchFilters.tracesFilter
-    )
-  }, [location])
+    setFilterValue(relevantFilters)
+  }, [location, relevantFilters])
 
   const updateSearchFilter = () => {
     if (location.pathname.startsWith('/explorer/span')) {