Merge upstream changes

yalla-coop · Sep 14, 2023 · 0cbd1d7 · 0cbd1d7
1 parent ca29b1e
commit 0cbd1d7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/dashboard/CHANGELOG.md b/dashboard/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/dashboard
 
+## 0.20.13
+
+### Patch Changes
+
+- e84acf469: fix(run): handle subdomain undefined error when creating a new service
+
 ## 0.20.12
 
 ### Patch Changes

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nhost/dashboard",
-  "version": "0.20.12",
+  "version": "0.20.13",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",

diff --git a/dashboard/src/features/services/components/ServiceForm/ServiceForm.tsx b/dashboard/src/features/services/components/ServiceForm/ServiceForm.tsx
@@ -122,7 +122,7 @@ export default function ServiceForm({
   const [replaceRunServiceConfig] = useReplaceRunServiceConfigMutation();
   const [detailsServiceId, setDetailsServiceId] = useState('');
   const [detailsServiceSubdomain, setDetailsServiceSubdomain] = useState(
-    initialData.subdomain,
+    initialData?.subdomain,
   );
 
   const [createServiceFormError, setCreateServiceFormError] =
@@ -345,7 +345,7 @@ export default function ServiceForm({
               <Tooltip title="Name of the service, must be unique per project.">
                 <InfoIcon
                   aria-label="Info"
-                  className="h-4 w-4"
+                  className="w-4 h-4"
                   color="primary"
                 />
               </Tooltip>
@@ -385,7 +385,7 @@ export default function ServiceForm({
               >
                 <InfoIcon
                   aria-label="Info"
-                  className="h-4 w-4"
+                  className="w-4 h-4"
                   color="primary"
                 />
               </Tooltip>
@@ -416,7 +416,7 @@ export default function ServiceForm({
               <Tooltip title="Command to run when to start the service. This is optional as the image may already have a baked-in command.">
                 <InfoIcon
                   aria-label="Info"
-                  className="h-4 w-4"
+                  className="w-4 h-4"
                   color="primary"
                 />
               </Tooltip>
@@ -460,7 +460,7 @@ export default function ServiceForm({
         {createServiceFormError && (
           <Alert
             severity="error"
-            className="grid grid-flow-col items-center justify-between px-4 py-3"
+            className="grid items-center justify-between grid-flow-col px-4 py-3"
           >
             <span className="text-left">
               <strong>Error:</strong> {createServiceFormError.message}

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @nhost/docs
 
+## 0.5.1
+
+### Patch Changes
+
+- 819e1e97d: update fqdn format for nhost run
+
 ## 0.5.0
 
 ### Minor Changes

diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nhost/docs",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",