π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1555] fix: analytics empty state flicker (#4754)
Anmol Singh Bhatia1c558eb6b3fb
diff --git a/web/app/[workspaceSlug]/(projects)/analytics/page.tsx b/web/app/[workspaceSlug]/(projects)/analytics/page.tsxindex 5fd4104eef..240993a24d 100644--- a/web/app/[workspaceSlug]/(projects)/analytics/page.tsx+++ b/web/app/[workspaceSlug]/(projects)/analytics/page.tsx@@ -20,53 +20,58 @@ const AnalyticsPage = observer(() => {// store hooksconst { toggleCreateProjectModal } = useCommandPalette();const { setTrackElement } = useEventTracker();- const { workspaceProjectIds } = useProject();+ const { workspaceProjectIds, loader } = useProject();const { currentWorkspace } = useWorkspace();// derived valuesconst pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Analytics` : undefined;+ // TODO: refactor loader implementationreturn (<><PageHead title={pageTitle} />- {workspaceProjectIds && workspaceProjectIds.length > 0 ? (- <div className="flex h-full flex-col overflow-hidden bg-custom-background-100">- <Tab.Group as={Fragment} defaultIndex={analytics_tab === "custom" ? 1 : 0}>- <Tab.List as="div" className="flex space-x-2 border-b h-[50px] border-custom-border-200 px-0 md:px-5">- {ANALYTICS_TABS.map((tab) => (- <Tab key={tab.key} as={Fragment}>- {({ selected }) => (- <button- className={`text-sm group relative flex items-center gap-1 h-[50px] px-3 cursor-pointer transition-all font-medium outline-none ${- selected ? "text-custom-primary-100 " : "hover:text-custom-text-200"- }`}- >- {tab.title}- <div- className={`border absolute bottom-0 right-0 left-0 rounded-t-md ${selected ? "border-custom-primary-100" : "border-transparent group-hover:border-custom-border-200"}`}- />- </button>- )}- </Tab>- ))}- </Tab.List>- <Tab.Panels as={Fragment}>- <Tab.Panel as={Fragment}>- <ScopeAndDemand fullScreen />- </Tab.Panel>- <Tab.Panel as={Fragment}>- <CustomAnalytics fullScreen />- </Tab.Panel>- </Tab.Panels>- </Tab.Group>- </div>- ) : (- <EmptyState- type={EmptyStateType.WORKSPACE_ANALYTICS}- primaryButtonOnClick={() => {- setTrackElement("Analytics empty state");- toggleCreateProjectModal(true);- }}- />+ {workspaceProjectIds && (+ <>+ {workspaceProjectIds.length > 0 || loader ? (+ <div className="flex h-full flex-col overflow-hidden bg-custom-background-100">+ <Tab.Group as={Fragment} defaultIndex={analytics_tab === "custom" ? 1 : 0}>+ <Tab.List as="div" className="flex space-x-2 border-b h-[50px] border-custom-border-200 px-0 md:px-5">+ {ANALYTICS_TABS.map((tab) => (+ <Tab key={tab.key} as={Fragment}>+ {({ selected }) => (+ <button+ className={`text-sm group relative flex items-center gap-1 h-[50px] px-3 cursor-pointer transition-all font-medium outline-none ${+ selected ? "text-custom-primary-100 " : "hover:text-custom-text-200"+ }`}+ >+ {tab.title}+ <div+ className={`border absolute bottom-0 right-0 left-0 rounded-t-md ${selected ? "border-custom-primary-100" : "border-transparent group-hover:border-custom-border-200"}`}+ />+ </button>+ )}+ </Tab>+ ))}+ </Tab.List>+ <Tab.Panels as={Fragment}>+ <Tab.Panel as={Fragment}>+ <ScopeAndDemand fullScreen />+ </Tab.Panel>+ <Tab.Panel as={Fragment}>+ <CustomAnalytics fullScreen />+ </Tab.Panel>+ </Tab.Panels>+ </Tab.Group>+ </div>+ ) : (+ <EmptyState+ type={EmptyStateType.WORKSPACE_ANALYTICS}+ primaryButtonOnClick={() => {+ setTrackElement("Analytics empty state");+ toggleCreateProjectModal(true);+ }}+ />+ )}+ </>)}</>);