Merge pull request #154 from microsoft/rename-branch-tab

Relocates the rename default branch experience (fixes #153)
2020-07-21 13:39:50 -07:00 · 2020-07-21 13:39:50 -07:00 · 67a3a6cba8
--- a/routes/org/repos.ts
+++ b/routes/org/repos.ts
@ -172,8 +172,7 @@ router.post('/:repoName/delete', asyncHandler(async function (req: ILocalRequest
  return res.redirect(organization.baseUrl);
 }));

-
-router.post('/:repoName/renameDefaultBranch', asyncHandler(AddRepositoryPermissionsToRequest), asyncHandler(async function (req: ILocalRequest, res, next) {
+router.post('/:repoName/defaultBranch', asyncHandler(AddRepositoryPermissionsToRequest), asyncHandler(async function (req: ILocalRequest, res, next) {
  const corporateUsername = req.individualContext.corporateIdentity.username;
  const providers = req.app.settings.providers as IProviders;
  const repoPermissions = req.repoPermissions;
@ -318,11 +317,39 @@ router.get('/:repoName', asyncHandler(AddRepositoryPermissionsToRequest), asyncH
      // outsideCollaborators: outsideCollaborators,
      // reposDataAgeInformation: ageInformation ? ageInformation : undefined,
      fromReposPage,
+      organizationSupportsUpdatesApp,
      // teamBasedPermissions,
      repositoryMetadataEntity,
      releaseReviewObject: sanitizeReviewObject(releaseReviewObject),
      releaseReviewWorkItemId,
+    },
+  });
+}));
+
+router.get('/:repoName/defaultBranch', asyncHandler(AddRepositoryPermissionsToRequest), asyncHandler(async function (req: ILocalRequest, res, next) {
+  const referer = req.headers.referer as string;
+  const fromReposPage = referer && (referer.endsWith('repos') || referer.endsWith('repos/'));
+  const organization = req.organization;
+  const repoPermissions = req.repoPermissions;
+  const repository = req.repository;
+  const repositoryMetadataEntity = req.repositoryMetadata;
+  await repository.getDetails();
+  const title = `${repository.name} - Default Branch Name`;
+  const details = await repository.organization.getDetails();
+  const organizationSupportsUpdatesApp = await organization.supportsUpdatesApp();
+  organization.id = details.id;
+  req.individualContext.webContext.render({
+    view: 'repos/defaultBranch',
+    title,
+    state: {
+      organization,
      organizationSupportsUpdatesApp,
+      repo: decorateRepoForView(repository),
+      reposSubView: 'defaultBranch',
+      repository,
+      fromReposPage,
+      repoPermissions,
+      repositoryMetadataEntity,
    },
  });
 }));
@ -360,7 +387,7 @@ router.get('/:repoName/permissions', asyncHandler(AddRepositoryPermissionsToRequ
      // reposDataAgeInformation: ageInformation ? ageInformation : undefined,
      fromReposPage,
      teamSets: aggregateTeamsToSets(aggregate.teams),
-      repoPermissions: repoPermissions,
+      repoPermissions,
      teamBasedPermissions,
      repositoryMetadataEntity,
    },
--- a/views/includes/corporateRepoMetadata.pug
+++ b/views/includes/corporateRepoMetadata.pug
@ -325,13 +325,8 @@ if currentManagementChain
  .row
    +groupTitle('Current management chain of repo creator')
    .col-md-9: ul.list-unstyled
-      - var counter = 0
      each manager in currentManagementChain
-        if counter == 1
-          li: strong= manager.displayName
-        else
-          li= manager.displayName
-        - ++counter
+        li= manager.displayName
 if repositoryMetadataEntity.initialCorrelationId
  .row
    +groupTitle('Correlation ID')
--- a/views/repos/defaultBranch.pug
+++ b/views/repos/defaultBranch.pug
@ -0,0 +1,88 @@
+//-
+//- Copyright (c) Microsoft.
+//- Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//-
+
+extends ../layout
+
+block content
+
+  //- Services
+  - var languageColor = viewServices.languageColor
+  - var octicon = viewServices.octicon
+  - var fileSize = viewServices.fileSize
+
+  //- Variables
+  - var githubUrl = 'https://github.com/' + repo.full_name
+  - var cloneUrl = repo.clone_url
+  - var sshUrl = repo.ssh_url
+  - var admin = repoPermissions && repoPermissions.allowAdministration
+
+  .container
+    .row: .col-md-12
+        if fromReposPage
+          .nav
+            ul.pager.zero-pad-bottom
+              li.previous
+                a(href='javascript:window.history.back()')
+                  span(aria-hidden=true) &larr;
+                  = ' Back'
+        - var hugeHeading = repo.name.length < 33
+        h1(class={huge: hugeHeading})
+          a(href='https://github.com/' + repo.full_name, target="_blank")= repo.name
+          if repo.private === true
+            | &nbsp;
+            .label.label-warning(class={shrink66: !hugeHeading, shrink50: hugeHeading}) Private
+        h6= repo.full_name.replace('/' + repo.name, '') + ' organization'
+        if repo.description
+          p.lead=repo.description
+
+    include ./pills
+
+    if admin
+      if !organizationSupportsUpdatesApp
+        h4 Default branch rename #[span.label.label-muted PREVIEW]
+        ul.list-inline.list-horizontal-space
+          li
+            | Current default branch name
+            br
+            strong= repo.default_branch
+        p.
+          The #{organization.name} is not configured to allow renames at this time.
+      else
+        //- repo.default_branch !== 'main'
+        h4 Default branch rename #[span.label.label-muted PREVIEW]
+        ul.list-inline.list-horizontal-space
+          li
+            | Current default branch name
+            br
+            strong= repo.default_branch
+        p You have administrative rights to this repo and can choose to rename the default branch.
+        if repo.default_branch == 'main'
+          p: strong You're already using the default branch "main", no action required.
+        p.
+          Easily convert the default branch of this project. Note that there are
+          many potential side effects, including impacting deep URL links, continuous
+          integration and deployment systems, and likely this will require cleanup
+          work.
+        p.
+          This automated default branch rename capability:
+        ul
+          li Creates a new branch based off of the current default branch's latest commit
+          li Reassigns any protected branch settings to the new default branch from the former
+          li Updates any open pull requests against the current default branch for the new branch
+          li Updates the default branch to the new branch
+          li Deletes the current default branch
+        p The automated operation will halt if a major error is detected, but will not revert the changes completely. It will take 20-120 seconds to process. Please anticipate updating this repo to take some time, and resource for this change. This process may timeout if there are a large number of open pull requests.
+        
+        form(method='post', action=repository.baseUrl + 'defaultBranch')
+          p: strong New default branch name
+          input.form-control(name='targetBranchName', type='text', placeholder='The new default branch name to use', value='main')
+          br
+          input.btn.btn-sm(
+            type='submit',
+            name='rename-default-branch'
+            class='btn-danger',
+            value='Rename default branch',
+            onclick='return confirm(\'Are you sure that you want to rename the default branch? Additional work may be required to address any errors or configure systems such as webhooks, continuous integration, etc.\');'
+            title='Select this operation to begin the default branch rename process automatically')
--- a/views/repos/pills.pug
+++ b/views/repos/pills.pug
@ -6,5 +6,6 @@
 .row: .col-md-12(style='margin-bottom: 32px; margin-top: 16px')
  ul.nav.nav-tabs
    li(role='presentation', class={active: !reposSubView || reposSubView === 'default'}): a(href=repository.baseUrl) Overview
+    li(role='presentation', class={active: reposSubView === 'defaultBranch'}): a(href=repository.baseUrl + 'defaultBranch/') Default Branch Name
    li(role='presentation', class={active: reposSubView === 'permissions'}): a(href=repository.baseUrl + 'permissions/') Permissions
    li(role='presentation', class={active: reposSubView === 'history'}): a(href=repository.baseUrl + 'history/') History
--- a/views/repos/repo.pug
+++ b/views/repos/repo.pug
@ -164,13 +164,6 @@ block content
          if repo.homepage
            li: a.btn.btn-sm.btn-muted-more(href=repo.homepage, target='_new', title=repo.homepage) Homepage

-        if !admin && repo.default_branch
-          ul.list-inline.list-horizontal-space
-            li
-              | Default branch name
-              br
-              strong= repo.default_branch
-
        if repo.moment
          //-h2 Timeline
          ul.list-inline.list-horizontal-space
@ -189,56 +182,21 @@ block content
                | Created
                br
                strong= repo.moment.created_at
+            if repo.default_branch
+              li
+                | Default branch
+                br
+                strong= repo.default_branch
+                if repo.default_branch === 'master' && admin
+                  span &nbsp;
+                  a.btn.btn-sm.btn-muted(href=repository.baseUrl + 'defaultBranch') Rename...

-        if admin
-          if !organizationSupportsUpdatesApp
-            p &nbsp;
-            hr
-            h4 Default branch rename #[span.label.label-muted PREVIEW]
-            ul.list-inline.list-horizontal-space
-              li
-                | Current default branch name
-                br
-                strong= repo.default_branch
-            p.
-              The #{organization.name} is not configured to allow renames at this time.
-          else
-            //- repo.default_branch !== 'main'
-            p &nbsp;
-            hr
-            h4 Default branch rename #[span.label.label-muted PREVIEW]
-            ul.list-inline.list-horizontal-space
-              li
-                | Current default branch name
-                br
-                strong= repo.default_branch
-            p You have administrative rights to this repo and can choose to rename the default branch.
-            p.
-              Easily convert the default branch of this project. Note that there are
-              many potential side effects, including impacting deep URL links, continuous
-              integration and deployment systems, and likely this will require cleanup
-              work.
-            p.
-              This automated default branch rename capability:
-            ul
-              li Creates a new branch based off of the current default branch's latest commit
-              li Reassigns any protected branch settings to the new default branch from the former
-              li Updates any open pull requests against the current default branch for the new branch
-              li Updates the default branch to the new branch
-              li Deletes the current default branch
-            p The automated operation will halt if a major error is detected, but will not revert the changes completely. It will take 20-120 seconds to process. Please anticipate updating this repo to take some time, and resource for this change. This process may timeout if there are a large number of open pull requests.
-            
-            form(method='post', action=repository.baseUrl + 'renameDefaultBranch')
-              p: strong New default branch name
-              input.form-control(name='targetBranchName', type='text', placeholder='The new default branch name to use', value='main')
-              br
-              input.btn.btn-sm(
-                type='submit',
-                name='rename-default-branch'
-                class='btn-danger',
-                value='Rename default branch',
-                onclick='return confirm(\'Are you sure that you want to rename the default branch? Additional work may be required to address any errors or configure systems such as webhooks, continuous integration, etc.\');'
-                title='Select this operation to begin the default branch rename process automatically')
+        if organizationSupportsUpdatesApp && repo.default_branch !== 'main' && admin
+          .alert.alert-gray
+            p: small.
+              Guidance regarding inclusivity and the default branch name can be found at 
+              #[a(href='https://aka.ms/github/renaming', target='_new') aka.ms/github/renaming]. This 
+              repo currently has the default branch name #[strong= repo.default_branch].

      .col-md-4
        if admin