Fix

notifo-io · Feb 15, 2024 · c823a33 · c823a33
1 parent 37d3a57
commit c823a33
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/backend/src/Notifo.Domain/NotificationFormatting.cs b/backend/src/Notifo.Domain/NotificationFormatting.cs
@@ -130,7 +130,7 @@ public static NotificationFormatting<TOut> Transform<TIn, TOut>(this Notificatio
         {
             var result = new LocalizedText(source);
 
-            foreach (var (key, value) in source)
+            foreach (var (key, value) in other)
             {
                 if (!string.IsNullOrWhiteSpace(value))
                 {

diff --git a/frontend/src/app/pages/integrations/ConfiguredIntegration.tsx b/frontend/src/app/pages/integrations/ConfiguredIntegration.tsx
@@ -62,23 +62,23 @@ export const ConfiguredIntegration = React.memo((props: ConfiguredIntegrationPro
                             ))}
 
                             {configured.status !== 'Verified' &&
-                                <StatusLabel status={configured.status} />
+                                <StatusLabel className='mr-1' status={configured.status} />
                             }
 
                             {configured.test === true &&
-                                <Badge pill>{texts.integrations.modeTest}</Badge>
+                                <Badge className='mr-1' pill>{texts.integrations.modeTest}</Badge>
                             }
 
                             {configured.test === false &&
-                                <Badge pill>{texts.integrations.modeProduction}</Badge>
+                                <Badge className='mr-1' pill>{texts.integrations.modeProduction}</Badge>
                             }
 
-                            {configured.enabled &&
-                                <Badge color='danger' pill>{texts.common.disabled}</Badge>
+                            {!configured.enabled &&
+                                <Badge className='mr-1' color='danger' pill>{texts.common.disabled}</Badge>
                             }
 
                             {!!configured.condition &&
-                                <Badge pill>{texts.integrations.condition}</Badge>
+                                <Badge className='mr-1' pill>{texts.integrations.condition}</Badge>
                             }
 
                             {!!configured.priority &&
@@ -90,7 +90,7 @@ export const ConfiguredIntegration = React.memo((props: ConfiguredIntegrationPro
                             {properties.filter(x => !!x.value).map(property => (
                                 <div key={property.label} className='mt-2'>
                                     <small>
-                                        <strong>{property.label}</strong><br />{property.value}
+                                        <strong>{property.label}</strong><br /><div className='truncate'>{property.value}</div>
                                     </small>
                                 </div>
                             ))}

diff --git a/frontend/src/app/pages/integrations/StatusLabel.tsx b/frontend/src/app/pages/integrations/StatusLabel.tsx
@@ -9,11 +9,11 @@ import { Badge } from 'reactstrap';
 import { IntegrationStatus } from '@app/service';
 import { texts } from '@app/texts';
 
-export const StatusLabel = (props: { status: IntegrationStatus }) => {
+export const StatusLabel = (props: { status: IntegrationStatus; className?: string }) => {
     const [color, text] = getStatusText(props.status);
 
     return (
-        <Badge pill color={color}>{text}</Badge>
+        <Badge pill className={props.className} color={color}>{text}</Badge>
     );
 };