3

Signed-off-by: bCatanant <[email protected]>
ZupIT · May 14, 2021 · 18d0ebe · 18d0ebe
1 parent 8ce6f89
commit 18d0ebe
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 34 deletions.
diff --git a/ui/src/core/components/Form/Number/helper.ts b/ui/src/core/components/Form/Number/helper.ts
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-export const isNumber = (value: string) => /[0-9]/.test(value);
+export const isNumber = (value: string) => /(\.|[0-9])/.test(value);
 
 export const isIntoMax = (value: string, max: number) => parseInt(value) > max;
diff --git a/ui/src/core/components/Page/constants.ts b/ui/src/core/components/Page/constants.ts
@@ -27,4 +27,9 @@ export const PlaceholderCardItems = [
     text: 'Go to Metrics',
     linkTo: routes.metrics
   },
+  {
+    icon: 'circles',
+    text: 'Go to Circles',
+    linkTo: routes.circles
+  },
 ];
diff --git a/ui/src/core/components/Page/index.tsx b/ui/src/core/components/Page/index.tsx
@@ -27,6 +27,7 @@ interface Props {
   title?: string;
   subtitle?: string;
   hasCards?: boolean;
+  currentPage?: string;
   className?: string;
 }
 
@@ -59,37 +60,43 @@ Page.Placeholder = ({
   title,
   subtitle,
   hasCards,
+  currentPage,
   children,
   className
-}: Props) => (
-  <Styled.Placeholder data-testid="page-placeholder" className={className}>
-    <Icon name={icon} />
-    <Styled.PlaceholderText>
-      {title && (
-        <Text.h1 color="dark" weight="bold" align="center">
-          {title}
-        </Text.h1>
-      )}
-      {subtitle && (
-        <Text.h1 color="dark" weight="bold" align="center">
-          {subtitle}
-        </Text.h1>
-      )}
-    </Styled.PlaceholderText>
-    {hasCards && (
-      <Styled.PlaceholderCardWrapper>
-        {map(PlaceholderCardItems, ({ icon, text, linkTo }: Action) => (
-          <Styled.PlaceholderCard to={linkTo} data-testid={icon} key={icon}>
-            <Icon name={icon} color="dark" size="15px" />
-            <Text.h4 color="dark" weight="bold">
-              {text}
-            </Text.h4>
-          </Styled.PlaceholderCard>
-        ))}
-      </Styled.PlaceholderCardWrapper>
-    )}
-    {children}
-  </Styled.Placeholder>
-);
+}: Props) => {
+
+  return <Styled.Placeholder data-testid="page-placeholder" className={className}>
+            <Icon name={icon} />
+            <Styled.PlaceholderText>
+              {title && (
+                <Text.h1 color="dark" weight="bold" align="center">
+                  {title}
+                </Text.h1>
+              )}
+              {subtitle && (
+                <Text.h1 color="dark" weight="bold" align="center">
+                  {subtitle}
+                </Text.h1>
+              )}
+            </Styled.PlaceholderText>
+            {hasCards && (
+              <Styled.PlaceholderCardWrapper>
+                {map(PlaceholderCardItems, ({ icon, text, linkTo }: Action) => (
+                  <>
+                    {!(currentPage === icon) && 
+                      <Styled.PlaceholderCard to={linkTo} data-testid={icon} key={icon}>
+                        <Icon name={icon} color="dark" size="15px" />
+                        <Text.h4 color="dark" weight="bold">
+                          {text}
+                        </Text.h4>
+                      </Styled.PlaceholderCard>
+                    }
+                  </>
+                ))}
+              </Styled.PlaceholderCardWrapper>
+            )}
+            {children}
+          </Styled.Placeholder>
+};
 
 export default Page;
diff --git a/ui/src/modules/Circles/Comparation/Item/MetricsGroups/AddAction.tsx b/ui/src/modules/Circles/Comparation/Item/MetricsGroups/AddAction.tsx
@@ -128,7 +128,7 @@ const AddAction = ({ onGoBack, metricsGroup, circleId, action }: Props) => {
 
   const loadCirclesByName = debounce(
     name =>
-      getCirclesSimple({ name }).then(response => {
+      getCirclesSimple({ name, circleId }).then(response => {
         const options = normalizeSelectOptions(response.content);
         setCurrentCircleOptions(options);
         return options;

diff --git a/ui/src/modules/Circles/index.tsx b/ui/src/modules/Circles/index.tsx
@@ -61,6 +61,7 @@ const Circles = () => {
       icon="placeholder-circles"
       title={`Welcome, ${profileName}! What do you like to do?`}
       hasCards={true}
+      currentPage="circles"
     />
   );
 

diff --git a/ui/src/modules/Metrics/index.tsx b/ui/src/modules/Metrics/index.tsx
@@ -30,6 +30,7 @@ const Metrics = () => {
       icon="placeholder-metrics"
       title={'Select the metric you want to view from the side menu.'}
       hasCards={true}
+      currentPage="metrics"
     />
   );
 

diff --git a/ui/src/modules/Modules/Placeholder/index.tsx b/ui/src/modules/Modules/Placeholder/index.tsx
@@ -16,16 +16,18 @@
 
 import React from 'react';
 import { getProfileByKey } from 'core/utils/profile';
-import PlaceholderComponent from 'core/components/Placeholder';
+import Page from 'core/components/Page';
 
 const Placeholder = () => {
   const profileName = getProfileByKey('name');
 
   return (
-    <PlaceholderComponent
+    <Page.Placeholder
       icon="empty-modules"
       title={`Hello, ${profileName}!`}
       subtitle="Select or create a module in the side menu."
+      hasCards={true}
+      currentPage="modules"
     />
   );
 };