filter empty annotations (#3788)

porter-dev · Oct 10, 2023 · 6b7e24f · 6b7e24f
1 parent 5b6ad3e
commit 6b7e24f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/dashboard/src/lib/porter-apps/services.ts b/dashboard/src/lib/porter-apps/services.ts
@@ -231,10 +231,9 @@ export function serializeService(service: ClientService): SerializedService {
             name: domain.name.value,
           })),
           ingressAnnotations: Object.fromEntries(
-            config.ingressAnnotations.map((annotation) => [
-              annotation.key,
-              annotation.value,
-            ])
+            config.ingressAnnotations
+              .filter((a) => a.key.length > 0 && a.value.length > 0)
+              .map((annotation) => [annotation.key, annotation.value])
           ),
           private: config.private?.value,
         },

diff --git a/dashboard/src/main/home/app-dashboard/app-view/tabs/Settings.tsx b/dashboard/src/main/home/app-dashboard/app-view/tabs/Settings.tsx
@@ -19,7 +19,7 @@ const Settings: React.FC = () => {
   const queryClient = useQueryClient();
   const history = useHistory();
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-  const { porterApp, clusterId, projectId } = useLatestRevision();
+  const { porterApp, clusterId, projectId, latestProto } = useLatestRevision();
   const { updateAppStep } = useAppAnalytics();
   const [isDeleting, setIsDeleting] = useState(false);
 
@@ -139,7 +139,9 @@ const Settings: React.FC = () => {
 
   return (
     <StyledSettingsTab>
-      {currentProject?.preview_envs_enabled && <PreviewEnvironmentSettings />}
+      {currentProject?.preview_envs_enabled && !!latestProto.build ? (
+        <PreviewEnvironmentSettings />
+      ) : null}
       <Text size={16}>Delete "{porterApp.name}"</Text>
       <Spacer y={0.5} />
       <Text color="helper">