From 965dda6226de5eea2ac5233cd43b4f3fbad08bb7 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Nov 2024 12:02:15 +0530 Subject: [PATCH 1/4] chore: loader code refactor --- web/core/components/pages/loaders/page-loader.tsx | 2 +- web/core/components/ui/loader/cycle-module-board-loader.tsx | 2 +- web/core/components/ui/loader/cycle-module-list-loader.tsx | 2 +- .../ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx | 2 +- web/core/components/ui/loader/notification-loader.tsx | 2 +- web/core/components/ui/loader/pages-loader.tsx | 4 ++-- web/core/components/ui/loader/projects-loader.tsx | 2 +- web/core/components/ui/loader/settings/activity.tsx | 2 +- web/core/components/ui/loader/settings/api-token.tsx | 2 +- web/core/components/ui/loader/settings/email.tsx | 2 +- web/core/components/ui/loader/settings/import-and-export.tsx | 2 +- web/core/components/ui/loader/settings/integration.tsx | 2 +- web/core/components/ui/loader/settings/members.tsx | 2 +- web/core/components/ui/loader/view-list-loader.tsx | 2 +- .../components/workspace-notifications/sidebar/loader.tsx | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/core/components/pages/loaders/page-loader.tsx b/web/core/components/pages/loaders/page-loader.tsx index e2e0c09b42f..3e77e020db0 100644 --- a/web/core/components/pages/loaders/page-loader.tsx +++ b/web/core/components/pages/loaders/page-loader.tsx @@ -17,7 +17,7 @@ export const PageLoader: React.FC = (props) => {
- {Array.from(Array(10)).map((i) => ( + {Array.from(Array(10)).map((_, i) => (
diff --git a/web/core/components/ui/loader/cycle-module-board-loader.tsx b/web/core/components/ui/loader/cycle-module-board-loader.tsx index f88719c381a..bd74218ca70 100644 --- a/web/core/components/ui/loader/cycle-module-board-loader.tsx +++ b/web/core/components/ui/loader/cycle-module-board-loader.tsx @@ -2,7 +2,7 @@ export const CycleModuleBoardLayout = () => (
- {[...Array(5)].map((i) => ( + {[...Array(5)].map((_, i) => (
(
- {[...Array(5)].map((i) => ( + {[...Array(5)].map((_, i) => (
(
- {[...Array(6)].map((i, index) => ( + {[...Array(6)].map((_, index) => (
diff --git a/web/core/components/ui/loader/notification-loader.tsx b/web/core/components/ui/loader/notification-loader.tsx index 7485c2c4c39..fc0ffe11efc 100644 --- a/web/core/components/ui/loader/notification-loader.tsx +++ b/web/core/components/ui/loader/notification-loader.tsx @@ -1,6 +1,6 @@ export const NotificationsLoader = () => (
- {[...Array(3)].map((i) => ( + {[...Array(3)].map((_, i) => (
diff --git a/web/core/components/ui/loader/pages-loader.tsx b/web/core/components/ui/loader/pages-loader.tsx index 612c17d888a..b8748a1dee5 100644 --- a/web/core/components/ui/loader/pages-loader.tsx +++ b/web/core/components/ui/loader/pages-loader.tsx @@ -4,12 +4,12 @@ export const PagesLoader = () => (

Pages

- {[...Array(5)].map((i) => ( + {[...Array(5)].map((_, i) => ( ))}
- {[...Array(5)].map((i) => ( + {[...Array(5)].map((_, i) => (
diff --git a/web/core/components/ui/loader/projects-loader.tsx b/web/core/components/ui/loader/projects-loader.tsx index d1a781d6b71..fd4fb4b7a3d 100644 --- a/web/core/components/ui/loader/projects-loader.tsx +++ b/web/core/components/ui/loader/projects-loader.tsx @@ -1,7 +1,7 @@ export const ProjectsLoader = () => (
- {[...Array(3)].map((i) => ( + {[...Array(3)].map((_, i) => (
(
- {[...Array(10)].map((i) => ( + {[...Array(10)].map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/api-token.tsx b/web/core/components/ui/loader/settings/api-token.tsx index e31090bffd9..6282fa59539 100644 --- a/web/core/components/ui/loader/settings/api-token.tsx +++ b/web/core/components/ui/loader/settings/api-token.tsx @@ -5,7 +5,7 @@ export const APITokenSettingsLoader = () => (
- {[...Array(2)].map((i) => ( + {[...Array(2)].map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/email.tsx b/web/core/components/ui/loader/settings/email.tsx index 87634bf090a..e005b08462f 100644 --- a/web/core/components/ui/loader/settings/email.tsx +++ b/web/core/components/ui/loader/settings/email.tsx @@ -8,7 +8,7 @@ export const EmailSettingsLoader = () => (
- {[...Array(4)].map((i) => ( + {[...Array(4)].map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/import-and-export.tsx b/web/core/components/ui/loader/settings/import-and-export.tsx index a3561207d11..e6c95d2cc6b 100644 --- a/web/core/components/ui/loader/settings/import-and-export.tsx +++ b/web/core/components/ui/loader/settings/import-and-export.tsx @@ -1,6 +1,6 @@ export const ImportExportSettingsLoader = () => (
- {[...Array(2)].map((i) => ( + {[...Array(2)].map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/integration.tsx b/web/core/components/ui/loader/settings/integration.tsx index 2260517ee39..c88569c34ff 100644 --- a/web/core/components/ui/loader/settings/integration.tsx +++ b/web/core/components/ui/loader/settings/integration.tsx @@ -1,6 +1,6 @@ export const IntegrationsSettingsLoader = () => (
- {[...Array(2)].map((i) => ( + {[...Array(2)].map((_, i) => (
(
- {[...Array(4)].map((i) => ( + {[...Array(4)].map((_, i) => (
diff --git a/web/core/components/ui/loader/view-list-loader.tsx b/web/core/components/ui/loader/view-list-loader.tsx index 8b59b57a264..68e9b96fd8e 100644 --- a/web/core/components/ui/loader/view-list-loader.tsx +++ b/web/core/components/ui/loader/view-list-loader.tsx @@ -1,6 +1,6 @@ export const ViewListLoader = () => (
- {[...Array(8)].map((i) => ( + {[...Array(8)].map((_, i) => (
diff --git a/web/core/components/workspace-notifications/sidebar/loader.tsx b/web/core/components/workspace-notifications/sidebar/loader.tsx index 9889b221d70..d74096b3a75 100644 --- a/web/core/components/workspace-notifications/sidebar/loader.tsx +++ b/web/core/components/workspace-notifications/sidebar/loader.tsx @@ -1,6 +1,6 @@ export const NotificationsLoader = () => (
- {[...Array(8)].map((i) => ( + {[...Array(8)].map((_, i) => (
From f14065bb6f57711821a15b39f9b20fe907720cd6 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Nov 2024 13:07:07 +0530 Subject: [PATCH 2/4] chore: code refactor --- packages/ui/src/dropdown/common/loader.tsx | 5 +++-- .../projects/(detail)/[projectId]/settings/sidebar.tsx | 3 ++- .../dashboard/widgets/loaders/issues-by-state-group.tsx | 3 ++- .../dashboard/widgets/loaders/overview-stats.tsx | 3 ++- .../dashboard/widgets/loaders/recent-activity.tsx | 3 ++- .../dashboard/widgets/loaders/recent-collaborators.tsx | 3 ++- .../dashboard/widgets/loaders/recent-projects.tsx | 3 ++- web/core/components/issues/workspace-draft/loader.tsx | 3 ++- .../components/ui/loader/cycle-module-board-loader.tsx | 4 +++- .../components/ui/loader/cycle-module-list-loader.tsx | 4 +++- .../ui/loader/layouts/calendar-layout-loader.tsx | 9 +++++---- .../components/ui/loader/layouts/gantt-layout-loader.tsx | 9 +++++---- .../ui/loader/layouts/kanban-layout-loader.tsx | 3 ++- .../components/ui/loader/layouts/list-layout-loader.tsx | 5 +++-- .../ui/loader/layouts/members-layout-loader.tsx | 5 +++-- .../layouts/project-inbox/inbox-sidebar-loader.tsx | 3 ++- .../ui/loader/layouts/spreadsheet-layout-loader.tsx | 7 ++++--- web/core/components/ui/loader/notification-loader.tsx | 4 +++- web/core/components/ui/loader/pages-loader.tsx | 6 ++++-- web/core/components/ui/loader/projects-loader.tsx | 4 +++- web/core/components/ui/loader/settings/activity.tsx | 3 ++- web/core/components/ui/loader/settings/api-token.tsx | 4 +++- web/core/components/ui/loader/settings/email.tsx | 4 +++- .../components/ui/loader/settings/import-and-export.tsx | 4 +++- web/core/components/ui/loader/settings/integration.tsx | 4 +++- web/core/components/ui/loader/settings/members.tsx | 4 +++- web/core/components/ui/loader/view-list-loader.tsx | 4 +++- web/core/components/web-hooks/form/secret-key.tsx | 3 ++- .../workspace-notifications/sidebar/loader.tsx | 4 +++- 29 files changed, 82 insertions(+), 41 deletions(-) diff --git a/packages/ui/src/dropdown/common/loader.tsx b/packages/ui/src/dropdown/common/loader.tsx index 0ec1f053b68..73421b2ae7f 100644 --- a/packages/ui/src/dropdown/common/loader.tsx +++ b/packages/ui/src/dropdown/common/loader.tsx @@ -1,9 +1,10 @@ +import range from "lodash/range"; import React from "react"; export const DropdownOptionsLoader = () => (
- {Array.from({ length: 6 }, (_, i) => ( -
+ {range(6).map((_, index) => ( +
))}
); diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx index c3aa909adb4..1ef0279107e 100644 --- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx +++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx @@ -1,6 +1,7 @@ "use client"; import React from "react"; +import range from "lodash/range"; import { observer } from "mobx-react"; import Link from "next/link"; import { useParams, usePathname } from "next/navigation"; @@ -29,7 +30,7 @@ export const ProjectSettingsSidebar = observer(() => {
SETTINGS - {[...Array(8)].map((index) => ( + {range(8).map((_, index) => ( ))} diff --git a/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx b/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx index d44eb1e26cc..44ce9326416 100644 --- a/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx +++ b/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx @@ -1,5 +1,6 @@ "use client"; +import range from "lodash/range"; // ui import { Loader } from "@plane/ui"; @@ -14,7 +15,7 @@ export const IssuesByStateGroupWidgetLoader = () => (
- {Array.from({ length: 5 }).map((_, index) => ( + {range(5).map((_, index) => ( ))}
diff --git a/web/core/components/dashboard/widgets/loaders/overview-stats.tsx b/web/core/components/dashboard/widgets/loaders/overview-stats.tsx index 2b634792ea4..43cedd348b1 100644 --- a/web/core/components/dashboard/widgets/loaders/overview-stats.tsx +++ b/web/core/components/dashboard/widgets/loaders/overview-stats.tsx @@ -1,11 +1,12 @@ "use client"; +import range from "lodash/range"; // ui import { Loader } from "@plane/ui"; export const OverviewStatsWidgetLoader = () => ( - {Array.from({ length: 4 }).map((_, index) => ( + {range(4).map((_, index) => (
diff --git a/web/core/components/dashboard/widgets/loaders/recent-activity.tsx b/web/core/components/dashboard/widgets/loaders/recent-activity.tsx index 3a280dad70c..9d7d65a0468 100644 --- a/web/core/components/dashboard/widgets/loaders/recent-activity.tsx +++ b/web/core/components/dashboard/widgets/loaders/recent-activity.tsx @@ -1,12 +1,13 @@ "use client"; +import range from "lodash/range"; // ui import { Loader } from "@plane/ui"; export const RecentActivityWidgetLoader = () => ( - {Array.from({ length: 7 }).map((_, index) => ( + {range(7).map((_, index) => (
diff --git a/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx b/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx index 92715fb88ec..9f9217ead49 100644 --- a/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx +++ b/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx @@ -1,11 +1,12 @@ "use client"; +import range from "lodash/range"; // ui import { Loader } from "@plane/ui"; export const RecentCollaboratorsWidgetLoader = () => ( <> - {Array.from({ length: 8 }).map((_, index) => ( + {range(8).map((_, index) => (
diff --git a/web/core/components/dashboard/widgets/loaders/recent-projects.tsx b/web/core/components/dashboard/widgets/loaders/recent-projects.tsx index 8bd652c3b18..4b51284a33f 100644 --- a/web/core/components/dashboard/widgets/loaders/recent-projects.tsx +++ b/web/core/components/dashboard/widgets/loaders/recent-projects.tsx @@ -1,12 +1,13 @@ "use client"; +import range from "lodash/range"; // ui import { Loader } from "@plane/ui"; export const RecentProjectsWidgetLoader = () => ( - {Array.from({ length: 5 }).map((_, index) => ( + {range(5).map((_, index) => (
diff --git a/web/core/components/issues/workspace-draft/loader.tsx b/web/core/components/issues/workspace-draft/loader.tsx index d663a0d035e..fa013a40d79 100644 --- a/web/core/components/issues/workspace-draft/loader.tsx +++ b/web/core/components/issues/workspace-draft/loader.tsx @@ -1,6 +1,7 @@ "use client"; import { FC } from "react"; +import range from "lodash/range"; // components import { ListLoaderItemRow } from "@/components/ui"; @@ -12,7 +13,7 @@ export const WorkspaceDraftIssuesLoader: FC = (prop const { items = 14 } = props; return (
- {[...Array(items)].map((_, index) => ( + {range(items).map((_, index) => ( ))}
diff --git a/web/core/components/ui/loader/cycle-module-board-loader.tsx b/web/core/components/ui/loader/cycle-module-board-loader.tsx index bd74218ca70..b4f878a63af 100644 --- a/web/core/components/ui/loader/cycle-module-board-loader.tsx +++ b/web/core/components/ui/loader/cycle-module-board-loader.tsx @@ -1,8 +1,10 @@ +import range from "lodash/range"; + export const CycleModuleBoardLayout = () => (
- {[...Array(5)].map((_, i) => ( + {range(5).map((_, i) => (
(
- {[...Array(5)].map((_, i) => ( + {range(5).map((_, i) => (
{ const dataCount = getRandomInt(0, 1); - const dataBlocks = Array.from({ length: dataCount }, (_, index) => ( + const dataBlocks = range(dataCount).map((_, index) => ( )); @@ -19,15 +20,15 @@ const CalendarDay = () => { export const CalendarLayoutLoader = () => (
- {[...Array(5)].map((_, index) => ( + {range(5).map((_, index) => ( ))}
- {[...Array(6)].map((_, index) => ( + {range(6).map((_, index) => (
- {[...Array(5)].map((_, index) => ( + {range(5).map((_, index) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx b/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx index bb4cd47e270..9d61a140c98 100644 --- a/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx @@ -1,9 +1,10 @@ +import range from "lodash/range"; import { Row } from "@plane/ui"; import { BLOCK_HEIGHT } from "@/components/gantt-chart/constants"; import { getRandomLength } from "../utils"; export const GanttLayoutLIstItem = () => ( -
+
@@ -23,7 +24,7 @@ export const GanttLayoutLoader = () => (
- {[...Array(6)].map((_, index) => ( + {range(6).map((_, index) => (
@@ -37,13 +38,13 @@ export const GanttLayoutLoader = () => (
- {[...Array(15)].map((_, index) => ( + {range(15).map((_, index) => ( ))}
- {[...Array(6)].map((_, index) => ( + {range(6).map((_, index) => (
)} - {Array.from({ length: cardsInColumn }, (_, cardIndex) => ( + {range(cardsInColumn).map((_, cardIndex) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/list-layout-loader.tsx b/web/core/components/ui/loader/layouts/list-layout-loader.tsx index bcada037068..81ba74ab67c 100644 --- a/web/core/components/ui/loader/layouts/list-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/list-layout-loader.tsx @@ -1,4 +1,5 @@ import { Fragment, forwardRef } from "react"; +import range from "lodash/range"; import { cn } from "@plane/editor"; import { Row } from "@plane/ui"; import { getRandomInt, getRandomLength } from "../utils"; @@ -29,7 +30,7 @@ export const ListLoaderItemRow = forwardRef< />
- {[...Array(defaultPropertyCount)].map((_, index) => ( + {range(defaultPropertyCount).map((_, index) => ( {getRandomInt(1, 2) % 2 === 0 ? ( (
- {[...Array(itemCount)].map((_, index) => ( + {range(itemCount).map((_, index) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/members-layout-loader.tsx b/web/core/components/ui/loader/layouts/members-layout-loader.tsx index ae8363556f4..2a7ac4ccd34 100644 --- a/web/core/components/ui/loader/layouts/members-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/members-layout-loader.tsx @@ -1,11 +1,12 @@ +import range from "lodash/range"; export const MembersLayoutLoader = () => (
- {Array.from({ length: 5 }, (_, columnIndex) => ( + {range(5).map((_, columnIndex) => (
- {Array.from({ length: 2 }, (_, cardIndex) => ( + {range(2).map((_, cardIndex) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx b/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx index e32eb68870a..38d36295d75 100644 --- a/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx +++ b/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx @@ -1,8 +1,9 @@ import React from "react"; +import range from "lodash/range"; export const InboxSidebarLoader = () => (
- {[...Array(6)].map((_, index) => ( + {range(6).map((_, index) => (
diff --git a/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx b/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx index 370f731edc6..2bbc040408e 100644 --- a/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx @@ -1,3 +1,4 @@ +import range from "lodash/range"; import { Row } from "@plane/ui"; import { getRandomLength } from "../utils"; @@ -11,7 +12,7 @@ export const SpreadsheetIssueRowLoader = (props: { columnCount: number }) => ( /> - {[...Array(props.columnCount)].map((_, colIndex) => ( + {range(props.columnCount).map((_, colIndex) => (
@@ -27,7 +28,7 @@ export const SpreadsheetLayoutLoader = () => ( - {[...Array(10)].map((_, index) => ( + {range(10).map((_, index) => ( ( - {[...Array(16)].map((_, rowIndex) => ( + {range(16).map((_, rowIndex) => ( ))} diff --git a/web/core/components/ui/loader/notification-loader.tsx b/web/core/components/ui/loader/notification-loader.tsx index fc0ffe11efc..db91cccf335 100644 --- a/web/core/components/ui/loader/notification-loader.tsx +++ b/web/core/components/ui/loader/notification-loader.tsx @@ -1,6 +1,8 @@ +import range from "lodash/range"; + export const NotificationsLoader = () => (
- {[...Array(3)].map((_, i) => ( + {range(3).map((_, i) => (
diff --git a/web/core/components/ui/loader/pages-loader.tsx b/web/core/components/ui/loader/pages-loader.tsx index b8748a1dee5..d3ba95bd0ec 100644 --- a/web/core/components/ui/loader/pages-loader.tsx +++ b/web/core/components/ui/loader/pages-loader.tsx @@ -1,15 +1,17 @@ +import range from "lodash/range"; + export const PagesLoader = () => (

Pages

- {[...Array(5)].map((_, i) => ( + {range(5).map((_, i) => ( ))}
- {[...Array(5)].map((_, i) => ( + {range(5).map((_, i) => (
diff --git a/web/core/components/ui/loader/projects-loader.tsx b/web/core/components/ui/loader/projects-loader.tsx index fd4fb4b7a3d..996f9d08ec6 100644 --- a/web/core/components/ui/loader/projects-loader.tsx +++ b/web/core/components/ui/loader/projects-loader.tsx @@ -1,7 +1,9 @@ +import range from "lodash/range"; + export const ProjectsLoader = () => (
- {[...Array(3)].map((_, i) => ( + {range(3).map((_, i) => (
(
- {[...Array(10)].map((_, i) => ( + {range(10).map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/api-token.tsx b/web/core/components/ui/loader/settings/api-token.tsx index 6282fa59539..f15e92b440d 100644 --- a/web/core/components/ui/loader/settings/api-token.tsx +++ b/web/core/components/ui/loader/settings/api-token.tsx @@ -1,3 +1,5 @@ +import range from "lodash/range"; + export const APITokenSettingsLoader = () => (
@@ -5,7 +7,7 @@ export const APITokenSettingsLoader = () => (
- {[...Array(2)].map((_, i) => ( + {range(2).map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/email.tsx b/web/core/components/ui/loader/settings/email.tsx index e005b08462f..902309fec7e 100644 --- a/web/core/components/ui/loader/settings/email.tsx +++ b/web/core/components/ui/loader/settings/email.tsx @@ -1,3 +1,5 @@ +import range from "lodash/range"; + export const EmailSettingsLoader = () => (
@@ -8,7 +10,7 @@ export const EmailSettingsLoader = () => (
- {[...Array(4)].map((_, i) => ( + {range(4).map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/import-and-export.tsx b/web/core/components/ui/loader/settings/import-and-export.tsx index e6c95d2cc6b..d7211b6fb9c 100644 --- a/web/core/components/ui/loader/settings/import-and-export.tsx +++ b/web/core/components/ui/loader/settings/import-and-export.tsx @@ -1,6 +1,8 @@ +import range from "lodash/range"; + export const ImportExportSettingsLoader = () => (
- {[...Array(2)].map((_, i) => ( + {range(2).map((_, i) => (
diff --git a/web/core/components/ui/loader/settings/integration.tsx b/web/core/components/ui/loader/settings/integration.tsx index c88569c34ff..279437031a9 100644 --- a/web/core/components/ui/loader/settings/integration.tsx +++ b/web/core/components/ui/loader/settings/integration.tsx @@ -1,6 +1,8 @@ +import range from "lodash/range"; + export const IntegrationsSettingsLoader = () => (
- {[...Array(2)].map((_, i) => ( + {range(2).map((_, i) => (
(
- {[...Array(4)].map((_, i) => ( + {range(4).map((_, i) => (
diff --git a/web/core/components/ui/loader/view-list-loader.tsx b/web/core/components/ui/loader/view-list-loader.tsx index 68e9b96fd8e..7e8dd61bd6a 100644 --- a/web/core/components/ui/loader/view-list-loader.tsx +++ b/web/core/components/ui/loader/view-list-loader.tsx @@ -1,6 +1,8 @@ +import range from "lodash/range"; + export const ViewListLoader = () => (
- {[...Array(8)].map((_, i) => ( + {range(8).map((_, i) => (
diff --git a/web/core/components/web-hooks/form/secret-key.tsx b/web/core/components/web-hooks/form/secret-key.tsx index cbe5ea79986..9b49f4ac6fc 100644 --- a/web/core/components/web-hooks/form/secret-key.tsx +++ b/web/core/components/web-hooks/form/secret-key.tsx @@ -1,6 +1,7 @@ "use client"; import { useState, FC } from "react"; +import range from "lodash/range"; import { observer } from "mobx-react"; import { useParams } from "next/navigation"; // icons @@ -102,7 +103,7 @@ export const WebhookSecretKey: FC = observer((props) => {

{webhookSecretKey}

) : (
- {[...Array(30)].map((_, index) => ( + {range(30).map((_, index) => (
))}
diff --git a/web/core/components/workspace-notifications/sidebar/loader.tsx b/web/core/components/workspace-notifications/sidebar/loader.tsx index d74096b3a75..c8a0e5ce75e 100644 --- a/web/core/components/workspace-notifications/sidebar/loader.tsx +++ b/web/core/components/workspace-notifications/sidebar/loader.tsx @@ -1,6 +1,8 @@ +import range from "lodash/range"; + export const NotificationsLoader = () => (
- {[...Array(8)].map((_, i) => ( + {range(8).map((_, i) => (
From 3588d8df9a9f9c134c597fa84de655fe73d56a71 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Nov 2024 13:08:20 +0530 Subject: [PATCH 3/4] chore: code refactor --- web/core/components/pages/loaders/page-loader.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/core/components/pages/loaders/page-loader.tsx b/web/core/components/pages/loaders/page-loader.tsx index 3e77e020db0..5f8e7e95ffc 100644 --- a/web/core/components/pages/loaders/page-loader.tsx +++ b/web/core/components/pages/loaders/page-loader.tsx @@ -1,5 +1,6 @@ "use client"; +import range from "lodash/range"; import { Loader } from "@plane/ui"; export const PageLoader: React.FC = (props) => { @@ -17,7 +18,7 @@ export const PageLoader: React.FC = (props) => {
- {Array.from(Array(10)).map((_, i) => ( + {range(10).map((_, i) => (
From 5a4a4847ea3910b555647ed2e689c3073c80809e Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Wed, 13 Nov 2024 13:22:02 +0530 Subject: [PATCH 4/4] chore: code refactor --- packages/ui/src/dropdown/common/loader.tsx | 2 +- .../projects/(detail)/[projectId]/settings/sidebar.tsx | 2 +- .../dashboard/widgets/loaders/issues-by-state-group.tsx | 2 +- .../dashboard/widgets/loaders/overview-stats.tsx | 2 +- .../dashboard/widgets/loaders/recent-activity.tsx | 2 +- .../dashboard/widgets/loaders/recent-collaborators.tsx | 2 +- .../dashboard/widgets/loaders/recent-projects.tsx | 2 +- web/core/components/issues/workspace-draft/loader.tsx | 2 +- web/core/components/pages/loaders/page-loader.tsx | 2 +- .../components/ui/loader/cycle-module-board-loader.tsx | 2 +- .../components/ui/loader/cycle-module-list-loader.tsx | 2 +- .../ui/loader/layouts/calendar-layout-loader.tsx | 8 ++++---- .../components/ui/loader/layouts/gantt-layout-loader.tsx | 6 +++--- .../components/ui/loader/layouts/kanban-layout-loader.tsx | 2 +- .../components/ui/loader/layouts/list-layout-loader.tsx | 4 ++-- .../ui/loader/layouts/members-layout-loader.tsx | 4 ++-- .../loader/layouts/project-inbox/inbox-sidebar-loader.tsx | 2 +- .../ui/loader/layouts/spreadsheet-layout-loader.tsx | 6 +++--- web/core/components/ui/loader/notification-loader.tsx | 2 +- web/core/components/ui/loader/pages-loader.tsx | 4 ++-- web/core/components/ui/loader/projects-loader.tsx | 2 +- web/core/components/ui/loader/settings/activity.tsx | 2 +- web/core/components/ui/loader/settings/api-token.tsx | 2 +- web/core/components/ui/loader/settings/email.tsx | 2 +- .../components/ui/loader/settings/import-and-export.tsx | 2 +- web/core/components/ui/loader/settings/integration.tsx | 2 +- web/core/components/ui/loader/settings/members.tsx | 2 +- web/core/components/ui/loader/view-list-loader.tsx | 2 +- web/core/components/web-hooks/form/secret-key.tsx | 2 +- .../components/workspace-notifications/sidebar/loader.tsx | 2 +- 30 files changed, 40 insertions(+), 40 deletions(-) diff --git a/packages/ui/src/dropdown/common/loader.tsx b/packages/ui/src/dropdown/common/loader.tsx index 73421b2ae7f..814ed4805b5 100644 --- a/packages/ui/src/dropdown/common/loader.tsx +++ b/packages/ui/src/dropdown/common/loader.tsx @@ -3,7 +3,7 @@ import React from "react"; export const DropdownOptionsLoader = () => (
- {range(6).map((_, index) => ( + {range(6).map((index) => (
))}
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx index 1ef0279107e..7a352ce0fe5 100644 --- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx +++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/settings/sidebar.tsx @@ -30,7 +30,7 @@ export const ProjectSettingsSidebar = observer(() => {
SETTINGS - {range(8).map((_, index) => ( + {range(8).map((index) => ( ))} diff --git a/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx b/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx index 44ce9326416..099323cce75 100644 --- a/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx +++ b/web/core/components/dashboard/widgets/loaders/issues-by-state-group.tsx @@ -15,7 +15,7 @@ export const IssuesByStateGroupWidgetLoader = () => (
- {range(5).map((_, index) => ( + {range(5).map((index) => ( ))}
diff --git a/web/core/components/dashboard/widgets/loaders/overview-stats.tsx b/web/core/components/dashboard/widgets/loaders/overview-stats.tsx index 43cedd348b1..e780bb39966 100644 --- a/web/core/components/dashboard/widgets/loaders/overview-stats.tsx +++ b/web/core/components/dashboard/widgets/loaders/overview-stats.tsx @@ -6,7 +6,7 @@ import { Loader } from "@plane/ui"; export const OverviewStatsWidgetLoader = () => ( - {range(4).map((_, index) => ( + {range(4).map((index) => (
diff --git a/web/core/components/dashboard/widgets/loaders/recent-activity.tsx b/web/core/components/dashboard/widgets/loaders/recent-activity.tsx index 9d7d65a0468..2df78a15af1 100644 --- a/web/core/components/dashboard/widgets/loaders/recent-activity.tsx +++ b/web/core/components/dashboard/widgets/loaders/recent-activity.tsx @@ -7,7 +7,7 @@ import { Loader } from "@plane/ui"; export const RecentActivityWidgetLoader = () => ( - {range(7).map((_, index) => ( + {range(7).map((index) => (
diff --git a/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx b/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx index 9f9217ead49..2dceaf1320a 100644 --- a/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx +++ b/web/core/components/dashboard/widgets/loaders/recent-collaborators.tsx @@ -6,7 +6,7 @@ import { Loader } from "@plane/ui"; export const RecentCollaboratorsWidgetLoader = () => ( <> - {range(8).map((_, index) => ( + {range(8).map((index) => (
diff --git a/web/core/components/dashboard/widgets/loaders/recent-projects.tsx b/web/core/components/dashboard/widgets/loaders/recent-projects.tsx index 4b51284a33f..38bc7e29a01 100644 --- a/web/core/components/dashboard/widgets/loaders/recent-projects.tsx +++ b/web/core/components/dashboard/widgets/loaders/recent-projects.tsx @@ -7,7 +7,7 @@ import { Loader } from "@plane/ui"; export const RecentProjectsWidgetLoader = () => ( - {range(5).map((_, index) => ( + {range(5).map((index) => (
diff --git a/web/core/components/issues/workspace-draft/loader.tsx b/web/core/components/issues/workspace-draft/loader.tsx index fa013a40d79..56efcea985a 100644 --- a/web/core/components/issues/workspace-draft/loader.tsx +++ b/web/core/components/issues/workspace-draft/loader.tsx @@ -13,7 +13,7 @@ export const WorkspaceDraftIssuesLoader: FC = (prop const { items = 14 } = props; return (
- {range(items).map((_, index) => ( + {range(items).map((index) => ( ))}
diff --git a/web/core/components/pages/loaders/page-loader.tsx b/web/core/components/pages/loaders/page-loader.tsx index 5f8e7e95ffc..974c28f6b8c 100644 --- a/web/core/components/pages/loaders/page-loader.tsx +++ b/web/core/components/pages/loaders/page-loader.tsx @@ -18,7 +18,7 @@ export const PageLoader: React.FC = (props) => {
- {range(10).map((_, i) => ( + {range(10).map((i) => (
diff --git a/web/core/components/ui/loader/cycle-module-board-loader.tsx b/web/core/components/ui/loader/cycle-module-board-loader.tsx index b4f878a63af..62df0e465a5 100644 --- a/web/core/components/ui/loader/cycle-module-board-loader.tsx +++ b/web/core/components/ui/loader/cycle-module-board-loader.tsx @@ -4,7 +4,7 @@ export const CycleModuleBoardLayout = () => (
- {range(5).map((_, i) => ( + {range(5).map((i) => (
(
- {range(5).map((_, i) => ( + {range(5).map((i) => (
{ const dataCount = getRandomInt(0, 1); - const dataBlocks = range(dataCount).map((_, index) => ( + const dataBlocks = range(dataCount).map((index) => ( )); @@ -20,15 +20,15 @@ const CalendarDay = () => { export const CalendarLayoutLoader = () => (
- {range(5).map((_, index) => ( + {range(5).map((index) => ( ))}
- {range(6).map((_, index) => ( + {range(6).map((index) => (
- {range(5).map((_, index) => ( + {range(5).map((index) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx b/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx index 9d61a140c98..50a5ac56aee 100644 --- a/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/gantt-layout-loader.tsx @@ -24,7 +24,7 @@ export const GanttLayoutLoader = () => (
- {range(6).map((_, index) => ( + {range(6).map((index) => (
@@ -38,13 +38,13 @@ export const GanttLayoutLoader = () => (
- {range(15).map((_, index) => ( + {range(15).map((index) => ( ))}
- {range(6).map((_, index) => ( + {range(6).map((index) => (
)} - {range(cardsInColumn).map((_, cardIndex) => ( + {range(cardsInColumn).map((cardIndex) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/list-layout-loader.tsx b/web/core/components/ui/loader/layouts/list-layout-loader.tsx index 81ba74ab67c..65d4d1565a2 100644 --- a/web/core/components/ui/loader/layouts/list-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/list-layout-loader.tsx @@ -30,7 +30,7 @@ export const ListLoaderItemRow = forwardRef< />
- {range(defaultPropertyCount).map((_, index) => ( + {range(defaultPropertyCount).map((index) => ( {getRandomInt(1, 2) % 2 === 0 ? ( (
- {range(itemCount).map((_, index) => ( + {range(itemCount).map((index) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/members-layout-loader.tsx b/web/core/components/ui/loader/layouts/members-layout-loader.tsx index 2a7ac4ccd34..6010d17bf6d 100644 --- a/web/core/components/ui/loader/layouts/members-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/members-layout-loader.tsx @@ -1,12 +1,12 @@ import range from "lodash/range"; export const MembersLayoutLoader = () => (
- {range(5).map((_, columnIndex) => ( + {range(5).map((columnIndex) => (
- {range(2).map((_, cardIndex) => ( + {range(2).map((cardIndex) => ( ))}
diff --git a/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx b/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx index 38d36295d75..0ead51f58e5 100644 --- a/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx +++ b/web/core/components/ui/loader/layouts/project-inbox/inbox-sidebar-loader.tsx @@ -3,7 +3,7 @@ import range from "lodash/range"; export const InboxSidebarLoader = () => (
- {range(6).map((_, index) => ( + {range(6).map((index) => (
diff --git a/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx b/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx index 2bbc040408e..c1b00d0ad37 100644 --- a/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx +++ b/web/core/components/ui/loader/layouts/spreadsheet-layout-loader.tsx @@ -12,7 +12,7 @@ export const SpreadsheetIssueRowLoader = (props: { columnCount: number }) => ( /> - {range(props.columnCount).map((_, colIndex) => ( + {range(props.columnCount).map((colIndex) => (
@@ -28,7 +28,7 @@ export const SpreadsheetLayoutLoader = () => ( - {range(10).map((_, index) => ( + {range(10).map((index) => ( ( - {range(16).map((_, rowIndex) => ( + {range(16).map((rowIndex) => ( ))} diff --git a/web/core/components/ui/loader/notification-loader.tsx b/web/core/components/ui/loader/notification-loader.tsx index db91cccf335..4526e400ddd 100644 --- a/web/core/components/ui/loader/notification-loader.tsx +++ b/web/core/components/ui/loader/notification-loader.tsx @@ -2,7 +2,7 @@ import range from "lodash/range"; export const NotificationsLoader = () => (
- {range(3).map((_, i) => ( + {range(3).map((i) => (
diff --git a/web/core/components/ui/loader/pages-loader.tsx b/web/core/components/ui/loader/pages-loader.tsx index d3ba95bd0ec..296c8727538 100644 --- a/web/core/components/ui/loader/pages-loader.tsx +++ b/web/core/components/ui/loader/pages-loader.tsx @@ -6,12 +6,12 @@ export const PagesLoader = () => (

Pages

- {range(5).map((_, i) => ( + {range(5).map((i) => ( ))}
- {range(5).map((_, i) => ( + {range(5).map((i) => (
diff --git a/web/core/components/ui/loader/projects-loader.tsx b/web/core/components/ui/loader/projects-loader.tsx index 996f9d08ec6..263919cd182 100644 --- a/web/core/components/ui/loader/projects-loader.tsx +++ b/web/core/components/ui/loader/projects-loader.tsx @@ -3,7 +3,7 @@ import range from "lodash/range"; export const ProjectsLoader = () => (
- {range(3).map((_, i) => ( + {range(3).map((i) => (
(
- {range(10).map((_, i) => ( + {range(10).map((i) => (
diff --git a/web/core/components/ui/loader/settings/api-token.tsx b/web/core/components/ui/loader/settings/api-token.tsx index f15e92b440d..ca8f59cda5b 100644 --- a/web/core/components/ui/loader/settings/api-token.tsx +++ b/web/core/components/ui/loader/settings/api-token.tsx @@ -7,7 +7,7 @@ export const APITokenSettingsLoader = () => (
- {range(2).map((_, i) => ( + {range(2).map((i) => (
diff --git a/web/core/components/ui/loader/settings/email.tsx b/web/core/components/ui/loader/settings/email.tsx index 902309fec7e..964a68b0865 100644 --- a/web/core/components/ui/loader/settings/email.tsx +++ b/web/core/components/ui/loader/settings/email.tsx @@ -10,7 +10,7 @@ export const EmailSettingsLoader = () => (
- {range(4).map((_, i) => ( + {range(4).map((i) => (
diff --git a/web/core/components/ui/loader/settings/import-and-export.tsx b/web/core/components/ui/loader/settings/import-and-export.tsx index d7211b6fb9c..eea44c49320 100644 --- a/web/core/components/ui/loader/settings/import-and-export.tsx +++ b/web/core/components/ui/loader/settings/import-and-export.tsx @@ -2,7 +2,7 @@ import range from "lodash/range"; export const ImportExportSettingsLoader = () => (
- {range(2).map((_, i) => ( + {range(2).map((i) => (
diff --git a/web/core/components/ui/loader/settings/integration.tsx b/web/core/components/ui/loader/settings/integration.tsx index 279437031a9..ed425376027 100644 --- a/web/core/components/ui/loader/settings/integration.tsx +++ b/web/core/components/ui/loader/settings/integration.tsx @@ -2,7 +2,7 @@ import range from "lodash/range"; export const IntegrationsSettingsLoader = () => (
- {range(2).map((_, i) => ( + {range(2).map((i) => (
(
- {range(4).map((_, i) => ( + {range(4).map((i) => (
diff --git a/web/core/components/ui/loader/view-list-loader.tsx b/web/core/components/ui/loader/view-list-loader.tsx index 7e8dd61bd6a..71432a5433f 100644 --- a/web/core/components/ui/loader/view-list-loader.tsx +++ b/web/core/components/ui/loader/view-list-loader.tsx @@ -2,7 +2,7 @@ import range from "lodash/range"; export const ViewListLoader = () => (
- {range(8).map((_, i) => ( + {range(8).map((i) => (
diff --git a/web/core/components/web-hooks/form/secret-key.tsx b/web/core/components/web-hooks/form/secret-key.tsx index 9b49f4ac6fc..62815a6e288 100644 --- a/web/core/components/web-hooks/form/secret-key.tsx +++ b/web/core/components/web-hooks/form/secret-key.tsx @@ -103,7 +103,7 @@ export const WebhookSecretKey: FC = observer((props) => {

{webhookSecretKey}

) : (
- {range(30).map((_, index) => ( + {range(30).map((index) => (
))}
diff --git a/web/core/components/workspace-notifications/sidebar/loader.tsx b/web/core/components/workspace-notifications/sidebar/loader.tsx index c8a0e5ce75e..6feca28ccba 100644 --- a/web/core/components/workspace-notifications/sidebar/loader.tsx +++ b/web/core/components/workspace-notifications/sidebar/loader.tsx @@ -2,7 +2,7 @@ import range from "lodash/range"; export const NotificationsLoader = () => (
- {range(8).map((_, i) => ( + {range(8).map((i) => (