Fix errors

webstudio-is · Jun 14, 2023 · dc11116 · dc11116
1 parent 0243ae3
commit dc11116
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/apps/builder/app/builder/features/topbar/domains.tsx b/apps/builder/app/builder/features/topbar/domains.tsx
@@ -571,6 +571,7 @@ const DomainItem = (props: {
 
             handleUpdateStatus();
           }}
+          isPublishing={props.isPublishing}
         />
       </Grid>
     </CollapsibleDomainSection>

diff --git a/apps/builder/app/builder/features/topbar/entri.tsx b/apps/builder/app/builder/features/topbar/entri.tsx
@@ -10,10 +10,12 @@ export const Entri = ({
   dnsRecords,
   domain,
   onClose,
+  isPublishing,
 }: {
   dnsRecords: DnsRecord[];
   domain: string;
   onClose: (detail: EntriCloseDetail) => void;
+  isPublishing: boolean;
 }) => {
   entriGlobalStyles();
   const { error, isOpen, showDialog } = useEntri({
@@ -27,7 +29,7 @@ export const Entri = ({
       {error !== undefined && <Text color="destructive">{error}</Text>}
 
       <Button
-        disabled={isOpen}
+        disabled={isOpen || isPublishing}
         color="neutral"
         css={{ width: "100%", flexShrink: 0 }}
         onClick={() => {

diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsx
@@ -327,6 +327,20 @@ const Publish = ({
   );
 };
 
+const ErrorText = ({ children }: { children: string }) => (
+  <Flex
+    css={{
+      m: theme.spacing[9],
+      overflowWrap: "anywhere",
+    }}
+    gap={2}
+    direction={"column"}
+  >
+    <Text color="destructive">{children}</Text>
+    <Text color="subtle">Please try again later</Text>
+  </Flex>
+);
+
 const Content = (props: { projectId: Project["id"] }) => {
   const [newDomains, setNewDomains] = useState(new Set<string>());
   const {
@@ -390,17 +404,7 @@ const Content = (props: { projectId: Project["id"] }) => {
     <>
       <ScrollArea>
         {projectSystemError !== undefined && (
-          <Flex
-            css={{
-              m: theme.spacing[9],
-              overflowWrap: "anywhere",
-            }}
-            gap={2}
-            direction={"column"}
-          >
-            <Text color="destructive">{projectSystemError}</Text>
-            <Text color="subtle">Please try again later</Text>
-          </Flex>
+          <ErrorText>{projectSystemError}</ErrorText>
         )}
 
         {projectData?.success && (
@@ -412,10 +416,6 @@ const Content = (props: { projectId: Project["id"] }) => {
           />
         )}
 
-        {domainSystemError !== undefined && (
-          <Text color="destructive">{domainSystemError}</Text>
-        )}
-
         {domainsResult?.success === true && (
           <Domains
             newDomains={newDomains}
@@ -425,15 +425,13 @@ const Content = (props: { projectId: Project["id"] }) => {
             isPublishing={isPublishing}
           />
         )}
+
+        {domainSystemError !== undefined && (
+          <ErrorText>{domainSystemError}</ErrorText>
+        )}
+
         {domainsResult?.success === false && (
-          <Label
-            css={{
-              overflowWrap: "anywhere",
-              color: theme.colors.foregroundDestructive,
-            }}
-          >
-            <div>{domainsResult.error}</div>
-          </Label>
+          <ErrorText>{domainsResult.error}</ErrorText>
         )}
       </ScrollArea>
-Original file line number
+Diff line change
@@ Expand Up / @@ -571,6 +571,7 @@ const DomainItem = (props: { @@
                 handleUpdateStatus();
               }}
+              isPublishing={props.isPublishing}
             />
           </Grid>
         </CollapsibleDomainSection>
@@ Expand Down @@