Browse Source

ref(ui): Remove LightWeightNoProjectMessage (#28988)

Matej Minar 3 years ago
parent
commit
c9cae71427

+ 0 - 27
static/app/components/lightWeightNoProjectMessage.tsx

@@ -1,27 +0,0 @@
-import NoProjectMessage from 'app/components/noProjectMessage';
-import {Organization, Project} from 'app/types';
-import withProjects from 'app/utils/withProjects';
-
-type Props = {
-  organization: Organization;
-  projects: Project[];
-  loadingProjects: boolean;
-};
-
-function LightWeightNoProjectMessage({
-  organization,
-  projects,
-  loadingProjects,
-  ...props
-}: Props) {
-  return (
-    <NoProjectMessage
-      {...props}
-      organization={organization}
-      projects={projects}
-      loadingProjects={!('projects' in organization) && loadingProjects}
-    />
-  );
-}
-
-export default withProjects(LightWeightNoProjectMessage);

+ 6 - 3
static/app/components/noProjectMessage.tsx

@@ -11,15 +11,16 @@ import {t} from 'app/locale';
 import ConfigStore from 'app/stores/configStore';
 import space from 'app/styles/space';
 import {Organization, Project} from 'app/types';
+import withProjects from 'app/utils/withProjects';
 
 type Props = React.PropsWithChildren<{
   organization: Organization;
-  projects?: Project[];
-  loadingProjects?: boolean;
+  projects: Project[];
+  loadingProjects: boolean;
   superuserNeedsToBeProjectMember?: boolean;
 }>;
 
-export default function NoProjectMessage({
+function NoProjectMessage({
   children,
   organization,
   projects,
@@ -127,3 +128,5 @@ const Content = styled(Flex)`
 const Actions = styled(ButtonBar)`
   width: fit-content;
 `;
+
+export default withProjects(NoProjectMessage);

+ 5 - 5
static/app/views/dashboardsV2/detail.tsx

@@ -13,7 +13,7 @@ import {Client} from 'app/api';
 import Breadcrumbs from 'app/components/breadcrumbs';
 import HookOrDefault from 'app/components/hookOrDefault';
 import * as Layout from 'app/components/layouts/thirds';
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import GlobalSelectionHeader from 'app/components/organizations/globalSelectionHeader';
 import {t} from 'app/locale';
 import {PageContent} from 'app/styles/organization';
@@ -403,7 +403,7 @@ class DashboardDetail extends Component<Props, State> {
         }}
       >
         <PageContent>
-          <LightWeightNoProjectMessage organization={organization}>
+          <NoProjectMessage organization={organization}>
             <StyledPageHeader>
               <DashboardTitle
                 dashboard={modifiedDashboard ?? dashboard}
@@ -431,7 +431,7 @@ class DashboardDetail extends Component<Props, State> {
               router={router}
               location={location}
             />
-          </LightWeightNoProjectMessage>
+          </NoProjectMessage>
         </PageContent>
       </GlobalSelectionHeader>
     );
@@ -455,7 +455,7 @@ class DashboardDetail extends Component<Props, State> {
           },
         }}
       >
-        <LightWeightNoProjectMessage organization={organization}>
+        <NoProjectMessage organization={organization}>
           <Layout.Header>
             <Layout.HeaderContent>
               <Breadcrumbs
@@ -510,7 +510,7 @@ class DashboardDetail extends Component<Props, State> {
               />
             </Layout.Main>
           </Layout.Body>
-        </LightWeightNoProjectMessage>
+        </NoProjectMessage>
       </GlobalSelectionHeader>
     );
   }

+ 3 - 3
static/app/views/dashboardsV2/manage/index.tsx

@@ -7,7 +7,7 @@ import Feature from 'app/components/acl/feature';
 import Alert from 'app/components/alert';
 import Button from 'app/components/button';
 import DropdownControl, {DropdownItem} from 'app/components/dropdownControl';
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import SearchBar from 'app/components/searchBar';
 import SentryDocumentTitle from 'app/components/sentryDocumentTitle';
 import {IconAdd} from 'app/icons';
@@ -191,7 +191,7 @@ class ManageDashboards extends AsyncView<Props, State> {
       >
         <SentryDocumentTitle title={t('Dashboards')} orgSlug={organization.slug}>
           <StyledPageContent>
-            <LightWeightNoProjectMessage organization={organization}>
+            <NoProjectMessage organization={organization}>
               <PageContent>
                 <StyledPageHeader>
                   {t('Dashboards')}
@@ -210,7 +210,7 @@ class ManageDashboards extends AsyncView<Props, State> {
                 {this.renderActions()}
                 {this.renderDashboards()}
               </PageContent>
-            </LightWeightNoProjectMessage>
+            </NoProjectMessage>
           </StyledPageContent>
         </SentryDocumentTitle>
       </Feature>

+ 3 - 3
static/app/views/eventsV2/eventDetails/index.tsx

@@ -2,7 +2,7 @@ import {Component} from 'react';
 import {RouteComponentProps} from 'react-router';
 import styled from '@emotion/styled';
 
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import SentryDocumentTitle from 'app/components/sentryDocumentTitle';
 import {t} from 'app/locale';
 import {PageContent} from 'app/styles/organization';
@@ -53,7 +53,7 @@ class EventDetails extends Component<Props> {
         projectSlug={projectSlug}
       >
         <StyledPageContent>
-          <LightWeightNoProjectMessage organization={organization}>
+          <NoProjectMessage organization={organization}>
             <EventDetailsContent
               organization={organization}
               location={location}
@@ -63,7 +63,7 @@ class EventDetails extends Component<Props> {
               router={router}
               route={route}
             />
-          </LightWeightNoProjectMessage>
+          </NoProjectMessage>
         </StyledPageContent>
       </SentryDocumentTitle>
     );

+ 3 - 3
static/app/views/eventsV2/landing.tsx

@@ -10,7 +10,7 @@ import GuideAnchor from 'app/components/assistant/guideAnchor';
 import AsyncComponent from 'app/components/asyncComponent';
 import Button from 'app/components/button';
 import DropdownControl, {DropdownItem} from 'app/components/dropdownControl';
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import SearchBar from 'app/components/searchBar';
 import SentryDocumentTitle from 'app/components/sentryDocumentTitle';
 import Switch from 'app/components/switchButton';
@@ -290,7 +290,7 @@ class DiscoverLanding extends AsyncComponent<Props, State> {
       >
         <SentryDocumentTitle title={t('Discover')} orgSlug={organization.slug}>
           <StyledPageContent>
-            <LightWeightNoProjectMessage organization={organization}>
+            <NoProjectMessage organization={organization}>
               <PageContent>
                 <StyledPageHeader>
                   <GuideAnchor target="discover_landing_header">
@@ -315,7 +315,7 @@ class DiscoverLanding extends AsyncComponent<Props, State> {
                 {this.renderActions()}
                 {this.renderComponent()}
               </PageContent>
-            </LightWeightNoProjectMessage>
+            </NoProjectMessage>
           </StyledPageContent>
         </SentryDocumentTitle>
       </Feature>

+ 3 - 3
static/app/views/eventsV2/results.tsx

@@ -17,7 +17,7 @@ import Confirm from 'app/components/confirm';
 import {CreateAlertFromViewButton} from 'app/components/createAlertButton';
 import SearchBar from 'app/components/events/searchBar';
 import * as Layout from 'app/components/layouts/thirds';
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import GlobalSelectionHeader from 'app/components/organizations/globalSelectionHeader';
 import {getParams} from 'app/components/organizations/globalSelectionHeader/getParams';
 import SentryDocumentTitle from 'app/components/sentryDocumentTitle';
@@ -461,7 +461,7 @@ class Results extends React.Component<Props, State> {
     return (
       <SentryDocumentTitle title={title} orgSlug={organization.slug}>
         <StyledPageContent>
-          <LightWeightNoProjectMessage organization={organization}>
+          <NoProjectMessage organization={organization}>
             <ResultsHeader
               errorCode={errorCode}
               organization={organization}
@@ -533,7 +533,7 @@ class Results extends React.Component<Props, State> {
                 {this.setOpenFunction}
               </Confirm>
             </Layout.Body>
-          </LightWeightNoProjectMessage>
+          </NoProjectMessage>
         </StyledPageContent>
       </SentryDocumentTitle>
     );

+ 2 - 4
static/app/views/issueList/container.tsx

@@ -1,7 +1,7 @@
 import {Component} from 'react';
 import DocumentTitle from 'react-document-title';
 
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import GlobalSelectionHeader from 'app/components/organizations/globalSelectionHeader';
 import {Organization} from 'app/types';
 import withOrganization from 'app/utils/withOrganization';
@@ -21,9 +21,7 @@ class IssueListContainer extends Component<Props> {
     return (
       <DocumentTitle title={this.getTitle()}>
         <GlobalSelectionHeader>
-          <LightWeightNoProjectMessage organization={organization}>
-            {children}
-          </LightWeightNoProjectMessage>
+          <NoProjectMessage organization={organization}>{children}</NoProjectMessage>
         </GlobalSelectionHeader>
       </DocumentTitle>
     );

+ 3 - 3
static/app/views/performance/compare/index.tsx

@@ -4,9 +4,9 @@ import styled from '@emotion/styled';
 import * as Sentry from '@sentry/react';
 
 import NotFound from 'app/components/errors/notFound';
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
 import LoadingError from 'app/components/loadingError';
 import LoadingIndicator from 'app/components/loadingIndicator';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import SentryDocumentTitle from 'app/components/sentryDocumentTitle';
 import {t} from 'app/locale';
 import {PageContent} from 'app/styles/organization';
@@ -125,9 +125,9 @@ class TransactionComparisonPage extends React.PureComponent<Props> {
       >
         <React.Fragment>
           <StyledPageContent>
-            <LightWeightNoProjectMessage organization={organization}>
+            <NoProjectMessage organization={organization}>
               {this.renderComparison({baselineEventSlug, regressionEventSlug})}
-            </LightWeightNoProjectMessage>
+            </NoProjectMessage>
           </StyledPageContent>
         </React.Fragment>
       </SentryDocumentTitle>

+ 3 - 3
static/app/views/performance/content.tsx

@@ -9,7 +9,7 @@ import Feature from 'app/components/acl/feature';
 import Alert from 'app/components/alert';
 import Button from 'app/components/button';
 import GlobalSdkUpdateAlert from 'app/components/globalSdkUpdateAlert';
-import LightWeightNoProjectMessage from 'app/components/lightWeightNoProjectMessage';
+import NoProjectMessage from 'app/components/noProjectMessage';
 import GlobalSelectionHeader from 'app/components/organizations/globalSelectionHeader';
 import PageHeading from 'app/components/pageHeading';
 import SentryDocumentTitle from 'app/components/sentryDocumentTitle';
@@ -211,7 +211,7 @@ class PerformanceContent extends Component<Props, State> {
 
     return (
       <PageContent>
-        <LightWeightNoProjectMessage organization={organization}>
+        <NoProjectMessage organization={organization}>
           <PageHeader>
             <PageHeading>{t('Performance')}</PageHeading>
             {!showOnboarding && (
@@ -248,7 +248,7 @@ class PerformanceContent extends Component<Props, State> {
               handleSearch={this.handleSearch}
             />
           )}
-        </LightWeightNoProjectMessage>
+        </NoProjectMessage>
       </PageContent>
     );
   }

Some files were not shown because too many files changed in this diff