Revert "ref(project_creation): Add project deletion to the go back bu…

…tton (#49844)" This reverts commit 0c64498. Co-authored-by: matejminar <9060071+matejminar@users.noreply.github.com>
getsentry · May 31, 2023 · fda9548 · fda9548
1 parent 8c1d30f
commit fda9548
Show file tree

Hide file tree

Showing 14 changed files with 257 additions and 471 deletions.
diff --git a/static/app/actionCreators/projects.tsx b/static/app/actionCreators/projects.tsx
@@ -342,7 +342,7 @@ export function removeProject({
 }: {
   api: Client;
   orgSlug: string;
-  origin: 'onboarding' | 'settings' | 'getting_started';
+  origin: 'onboarding' | 'settings';
   projectSlug: Project['slug'];
 }) {
   return api.requestPromise(`/projects/${orgSlug}/${projectSlug}/`, {

diff --git a/static/app/components/onboarding/gettingStartedDoc.tsx b/static/app/components/onboarding/gettingStartedDoc.tsx
diff --git a/static/app/onboardingDocs/javascript/react.tsx b/static/app/onboardingDocs/javascript/react.tsx
diff --git a/static/app/routes.tsx b/static/app/routes.tsx
@@ -1020,6 +1020,27 @@ function buildRoutes() {
         path="new/"
         component={make(() => import('sentry/views/projectInstall/newProject'))}
       />
+      <Route
+        path=":projectId/getting-started/"
+        component={make(() => import('sentry/views/projectInstall/gettingStarted'))}
+      >
+        <IndexRoute
+          component={make(async () => {
+            const {ProjectInstallOverview} = await import(
+              'sentry/views/projectInstall/overview'
+            );
+            return {
+              default: ProjectInstallOverview,
+            };
+          })}
+        />
+        <Route
+          path=":platform/"
+          component={make(
+            () => import('sentry/views/projectInstall/platformOrIntegration')
+          )}
+        />
+      </Route>
       <Route
         path=":projectId/"
         component={make(() => import('sentry/views/projectDetail'))}
@@ -1028,38 +1049,22 @@ function buildRoutes() {
         path=":projectId/events/:eventId/"
         component={errorHandler(ProjectEventRedirect)}
       />
-      <Route
-        path=":projectId/getting-started/"
-        component={make(
-          () => import('sentry/views/projectInstall/platformOrIntegration')
-        )}
-      />
     </Fragment>
   );
   const projectsRoutes = (
     <Fragment>
       {usingCustomerDomain && (
         <Route
           path="/projects/"
-          component={make(async () => {
-            const {Projects} = await import('sentry/views/projects/');
-            return {
-              default: Projects,
-            };
-          })}
+          component={withDomainRequired(NoOp)}
           key="orgless-projects-route"
         >
           {projectsChildRoutes}
         </Route>
       )}
       <Route
         path="/organizations/:orgId/projects/"
-        component={make(async () => {
-          const {Projects} = await import('sentry/views/projects/');
-          return {
-            default: Projects,
-          };
-        })}
+        component={withDomainRedirect(NoOp)}
         key="org-projects"
       >
         {projectsChildRoutes}
@@ -1991,28 +1996,48 @@ function buildRoutes() {
     </Route>
   );
 
+  const gettingStartedChildRoutes = (
+    <Fragment>
+      <IndexRoute
+        component={make(async () => {
+          const {ProjectInstallOverview} = await import(
+            'sentry/views/projectInstall/overview'
+          );
+          return {
+            default: ProjectInstallOverview,
+          };
+        })}
+      />
+      <Route
+        path=":platform/"
+        component={make(
+          () => import('sentry/views/projectInstall/platformOrIntegration')
+        )}
+      />
+    </Fragment>
+  );
   const gettingStartedRoutes = (
     <Fragment>
       {usingCustomerDomain && (
-        <Fragment>
-          <Redirect
-            from="/getting-started/:projectId/"
-            to="/projects/:projectId/getting-started/"
-          />
-          <Redirect
-            from="/getting-started/:projectId/:platform/"
-            to="/projects/:projectId/getting-started/"
-          />
-        </Fragment>
+        <Route
+          path="/getting-started/:projectId/"
+          component={withDomainRequired(
+            make(() => import('sentry/views/projectInstall/gettingStarted'))
+          )}
+          key="orgless-getting-started-route"
+        >
+          {gettingStartedChildRoutes}
+        </Route>
       )}
-      <Redirect
-        from="/:orgId/:projectId/getting-started/"
-        to="/organizations/:orgId/projects/:projectId/getting-started/"
-      />
-      <Redirect
-        from="/:orgId/:projectId/getting-started/:platform/"
-        to="/organizations/:orgId/projects/:projectId/getting-started/"
-      />
+      <Route
+        path="/:orgId/:projectId/getting-started/"
+        component={withDomainRedirect(
+          make(() => import('sentry/views/projectInstall/gettingStarted'))
+        )}
+        key="org-getting-started"
+      >
+        {gettingStartedChildRoutes}
+      </Route>
     </Fragment>
   );
 
@@ -2161,8 +2186,8 @@ function buildRoutes() {
       {performanceRoutes}
       {starfishRoutes}
       {profilingRoutes}
-      {gettingStartedRoutes}
       {adminManageRoutes}
+      {gettingStartedRoutes}
       {legacyOrganizationRootRoutes}
       {legacyOrgRedirects}
     </Route>
@@ -2255,6 +2280,14 @@ function buildRoutes() {
           from="integrations/:providerKey/"
           to="/settings/:orgId/projects/:projectId/integrations/:providerKey/"
         />
+        <Redirect
+          from="/settings/projects/:projectId/install/"
+          to="/getting-started/:projectId/"
+        />
+        <Redirect
+          from="/settings/projects/:projectId/install/:platform/"
+          to="/getting-started/:projectId/:platform/"
+        />
       </Route>
       <Redirect from=":projectId/group/:groupId/" to="issues/:groupId/" />
       <Redirect

diff --git a/static/app/types/project.tsx b/static/app/types/project.tsx
@@ -38,15 +38,12 @@ export type Project = {
   isBookmarked: boolean;
   isInternal: boolean;
   isMember: boolean;
-  name: string;
   organization: Organization;
   plugins: Plugin[];
-
   processingIssues: number;
   relayPiiConfig: string;
 
   subjectTemplate: string;
-  team: Team;
   teams: Team[];
   builtinSymbolSources?: string[];
   dynamicSamplingRules?: DynamicSamplingRule[] | null;

diff --git a/static/app/utils/analytics/projectCreationAnalyticsEvents.tsx b/static/app/utils/analytics/projectCreationAnalyticsEvents.tsx
@@ -1,16 +1,4 @@
 export type ProjectCreationEventParameters = {
-  'project_creation.back_button_clicked': {};
-  'project_creation.data_removal_modal_confirm_button_clicked': {
-    platform: string;
-    project_id: string;
-  };
-  'project_creation.data_removal_modal_dismissed': {platform: string; project_id: string};
-  'project_creation.data_removal_modal_rendered': {platform: string; project_id: string};
-  'project_creation.data_removed': {
-    date_created: string;
-    platform: string;
-    project_id: string;
-  };
   'project_creation.select_framework_modal_close_button_clicked': {
     platform: string;
   };
@@ -38,12 +26,4 @@ export const projectCreationEventMap: Record<
     'Project Creation: Framework Modal Rendered',
   'project_creation.select_framework_modal_skip_button_clicked':
     'Project Creation: Framework Modal Skip Button Clicked',
-  'project_creation.data_removal_modal_dismissed':
-    'Project Creation: Data Removal Modal Dismissed',
-  'project_creation.data_removal_modal_confirm_button_clicked':
-    'Project Creation: Data Removal Modal Confirm Button Clicked',
-  'project_creation.data_removal_modal_rendered':
-    'Project Creation: Data Removal Modal Rendered',
-  'project_creation.data_removed': 'Project Creation: Data Removed',
-  'project_creation.back_button_clicked': 'Project Creation: Back Button Clicked',
 };