contentoh-components-library 21.2.65 → 21.2.67

package/src/components/organisms/DashboardMetric/index.js

@@ -22,14 +22,16 @@ export const DashboardMetric = ({
 }) => {
   const labels =
     type === "doughnut"
-      ? Object.keys(dataObject).map((key) => getFullStatus(key))
+      ? Object.keys(dataObject).map((key) => key !== "NS" && getFullStatus(key))
       : Object.keys(dataObject);
   const newObject =
     type === "doughnut" ? removeOldStatus(dataObject) : dataObject;
   const values = Object.values(newObject)?.length
     ? Object.values(newObject)
     : [0];
-  const colorsArray = Object.keys(newObject).map((key) => getStatusColor(key));
+  const colorsArray = Object.keys(newObject).map(
+    (key) => key !== "NS" && getStatusColor(key)
+  );
 
   const data = {
     labels,

package/src/components/organisms/DashboardMetric/styles.js

@@ -49,7 +49,7 @@ export const Container = styled.div`
   }
 
   .graphic-cotainer {
-    height: 320px;
+    height: 350px;
     border: 1px solid ${GlobalColors.s3};
     padding: 10px;
     border-radius: 5px;

package/src/components/pages/Dashboard/Dashboard.stories.js

@@ -9,37 +9,37 @@ const Template = (args) => <Dashboard {...args} />;
 export const DashboardDeafult = Template.bind({});
 DashboardDeafult.args = {
   user: {
-    id_user: 30,
-    name: "Admin",
-    last_name: "Ulises",
-    email: "salmeron.5@hotmail.com",
-    position: "Admin",
-    telephone: "",
-    country: "México",
-    id_company: 2,
-    id_cognito: "c94a7305-9365-46ff-a423-4b4bc3b8b180",
+    id_user: 425,
+    name: "Auditor QA",
+    last_name: " ",
+    email: "ladiboh785@mi166.com",
+    position: "Tester",
+    telephone: null,
+    country: null,
+    id_company: 254,
+    id_cognito: "23a3f496-4e38-4e12-9bf5-7f90b77a2f35",
     birth_Date: null,
-    about_me: "",
-    zip_code: "",
-    address: "",
-    job: "",
-    id_stripe: "",
+    about_me: null,
+    zip_code: null,
+    address: null,
+    job: null,
+    id_stripe: null,
     id_role: 6,
     active: 1,
     is_retailer: 0,
-    email_notify: 1,
+    email_notify: null,
     membership: {
-      id: 2,
-      start_date: "2021-11-05T02:35:12.000Z",
-      end_date: "2022-11-05T02:34:49.000Z",
-      planID: 1,
-      plan: "prod_KtkvuFFLpOdP6e",
-      name: "Plan Free",
-      user_limit: "1",
-      products_limit: "3",
-      type: "PyMES",
+      id: 750,
+      start_date: "2022-01-07T21:32:54.000Z",
+      end_date: "2023-01-07T21:32:54.000Z",
+      planID: 6,
+      plan: "prod_KvGd6YSTJyR3AP",
+      name: "Plan Small",
+      user_limit: "10",
+      products_limit: "1000",
+      type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-30/30.png?1666294798400",
+    src: "https://content-management-profile-prod.s3.amazonaws.com/id-425/425.png?1666639556174",
   },
-  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJjOTRhNzMwNS05MzY1LTQ2ZmYtYTQyMy00YjRiYzNiOGIxODAiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjp0cnVlLCJjb2duaXRvOnVzZXJuYW1lIjoiYzk0YTczMDUtOTM2NS00NmZmLWE0MjMtNGI0YmMzYjhiMTgwIiwiY29nbml0bzpyb2xlcyI6WyJhcm46YXdzOmlhbTo6ODk4NjcwMjMyODA3OnJvbGVcL2NvbnRlbnRvaC1kZXYtdXMtZWFzdC0xLWxhbWJkYVJvbGUiXSwiYXVkIjoiNWFjOHRwZ3M2Z2JzcTEzZnJ2cnBpZWVwNDAiLCJldmVudF9pZCI6ImJmODBhZmM4LTVjMWMtNDJmNi1hY2RhLTg0M2I1NDg3OWExZSIsInRva2VuX3VzZSI6ImlkIiwiYXV0aF90aW1lIjoxNjY2Mjk0Nzk2LCJuYW1lIjoiQ29sYWJvcmFkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIxMTExIiwiZXhwIjoxNjY2Mjk4Mzk2LCJpYXQiOjE2NjYyOTQ3OTYsImVtYWlsIjoic2FsbWVyb24uNUBob3RtYWlsLmNvbSJ9.RHigufdS172zrKNRuSKB9AALBvpHW2_xkHKMIVl5o4UtwiLOFyCI2gtdHDb7pgXxJH1Lk5n4OyNIiD6rta40o-eq7oY5unlUI38UVO0f8VXvjkvoi2CQ3J6JdNCZVzSzpT29vk0qvT39HFKVKfru4UxjTbPvVX77yZZ_QYoQvZ6gTjhzcvQslBSlQHh-RDAIwI9jbcePBDLIExbt_fq7Q6T5WdhnXkam8xBavF-3c3tVK9SjCAD_Y2gQhVmnAO5Co2Mqh59XfdT6uwNLTtwWd3aK5YX1thWW_oACfKBWAvLMSoYO3mjiXGWzKKLe7uNSvv92VhpLUeoYnVfrtafXAg",
+  jwt: "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIyM2EzZjQ5Ni00ZTM4LTRlMTItOWJmNS03ZjkwYjc3YTJmMzUiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjIzYTNmNDk2LTRlMzgtNGUxMi05YmY1LTdmOTBiNzdhMmYzNSIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiJiMTRhODNhNS05NDhjLTQyMDgtOTUzNi02NTBiZWFhYjI2MmYiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2NjYzOTU1NiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2NjY0MzE1NiwiaWF0IjoxNjY2NjM5NTU2LCJlbWFpbCI6ImxhZGlib2g3ODVAbWkxNjYuY29tIn0.orGhdg1rhoD52Y5hOfr1H2ZWcfx57O_xSu-i8rZaWqQG2FrdeaoNNZ4r207uhaZF-gyuQevMkb02b4GkpMX1WaPRoS6f0OR0zNrOMXiag262G6kog6YuwiAiRasgfpGOhvOMRpwnm9zV3avqaqEI7S1B4VUl688NmwiVd0Zv6U3yuU2uyOc8Sb0wFKaQAcREydK-xNEwDTXzbsAewl3dXMA6lROQDn5ZOumVbAcZVRw1_z8DwGlsLdho_WwXHiDR_fcnFKZAXm1Jf8wJmQgT6EnmRrOIBROLv0e1uaW78nnvLKL7aWUyLr_VUlOb66AiHw0WnDUbVsDKn1nemMF2_Q",
 };

package/src/components/pages/Dashboard/dashboardUtils.js

@@ -39,28 +39,8 @@ export const getCategories = async (user, company) => {
   const response = await axios.get(
     `${process.env.REACT_APP_CATEGORY_ENDPOINT}${query}`
   );
-  const categories = JSON.parse(response.data.body)?.data;
-  const categoriesKeys = Object.keys(categories || {});
-  const subCategories = categoriesKeys?.map(
-    (key) => categories[key].sub_category
-  );
-  const finalArray = [];
-  let index = 0;
-  subCategories?.forEach((element) => {
-    element &&
-      Object.keys(element || {}).forEach((key) => {
-        const subCategory = element[key]?.sub_category || {};
-        const subOptions = [];
-        Object.keys(subCategory)?.forEach((subKey) => {
-          subOptions.push({
-            id: subCategory[subKey].id_category,
-            name: subKey,
-          });
-        });
-        finalArray.push({ id: index++, name: key, subOptions });
-      });
-  });
-  finalArray.sort((a, b) => a.name.localeCompare(b.name));
+  const categories = JSON.parse(response.data.body)?.data || {};
+  const finalArray = getCategoriesRecursive(categories);
   return finalArray;
 };
 
@@ -71,3 +51,19 @@ export const formatDate = (date) => {
   const day = newDate.getDate();
   return `${year}/${month}/${day}`;
 };
+
+const getCategoriesRecursive = (object) => {
+  const keys = Object.keys(object);
+  return keys.map((key, index) => {
+    const { sub_category } = object[key];
+    if (sub_category) {
+      return {
+        id: index,
+        name: key,
+        subOptions: getCategoriesRecursive(sub_category),
+      };
+    } else {
+      return { id: object[key].id_category, name: key };
+    }
+  });
+};