[PRD] TCI/Assembla Handshake with SVN/P4 (#2769)

app/components/dashboard-row.js

@@ -1,4 +1,5 @@
 import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { alias, reads } from '@ember/object/computed';
 import { task, timeout } from 'ember-concurrency';
@@ -24,6 +25,21 @@ export default Component.extend({
 
   displayMenuTofu: alias('repo.permissions.create_request'),
 
+  repositoryProvider: computed('repo.provider', function () {
+    return this.repo.provider.capitalize();
+  }),
+
+  repositoryType: computed('repo.serverType', function () {
+    switch (this.repo.serverType) {
+      case 'git':
+        return 'GIT';
+      case 'subversion':
+        return 'SVN';
+      case 'perforce':
+        return 'P4';
+    }
+  }),
+
   openDropup() {
     this.set('dropupIsOpen', true);
   },

app/components/github-apps-repository.js

@@ -22,6 +22,21 @@ export default Component.extend({
   isMatchGithub: match('vcsType', /Github\S+$/),
   isNotMatchGithub: not('isMatchGithub'),
 
+  repositoryProvider: computed('repository.provider', function () {
+    return this.repository.provider.capitalize();
+  }),
+
+  repositoryType: computed('repository.serverType', function () {
+    switch (this.repository.serverType) {
+      case 'git':
+        return 'GIT';
+      case 'subversion':
+        return 'SVN';
+      case 'perforce':
+        return 'P4';
+    }
+  }),
+
   accessSettingsUrl: computed('user.vcsType', 'user.vcsId', function () {
     return this.user && vcsLinks.accessSettingsUrl(this.user.vcsType, { owner: this.user.login });
   }),

app/components/repository-layout.js

@@ -14,6 +14,21 @@ export default Component.extend({
   currentUser: alias('auth.currentUser'),
   userRoMode: reads('currentUser.roMode'),
 
+  repositoryProvider: computed('repo.provider', function () {
+    return this.repo.provider.capitalize();
+  }),
+
+  repositoryType: computed('repo.serverType', function () {
+    switch (this.repo.serverType) {
+      case 'git':
+        return 'GIT';
+      case 'subversion':
+        return 'SVN';
+      case 'perforce':
+        return 'P4';
+    }
+  }),
+
   repoUrl: computed('repo.{ownerName,vcsName,vcsType}', function () {
     const owner = this.get('repo.ownerName');
     const repo = this.get('repo.vcsName');

app/models/repo.js

@@ -50,6 +50,7 @@ const Repo = VcsEntity.extend({
   migrationStatus: attr('string'),
   historyMigrationStatus: attr('string'),
   scanFailedAt: attr('date'),
+  serverType: attr('string', { defaultValue: 'git' }),
 
   currentScan: computed('scanFailedAt', function () {
     let scanFailedAt = this.get('scanFailedAt');

app/models/user.js

@@ -78,8 +78,7 @@ export default Owner.extend({
     this.set('applyFilterRepos', !isOrganization);
     return this.api
       .post(`/user/${this.id}/sync`)
-      .then(() => this.poll(),
-        () => this.set('isSyncing', false));
+      .then(() => this.poll());
   },
 
   schedulePoll() {
@@ -91,7 +90,7 @@ export default Owner.extend({
 
   poll() {
     return this.reload().then(() => {
-      if (!this.isSyncing) {
+      if (this.isSyncing) {
         this.schedulePoll();
       } else {
         this.permissionsService.fetchPermissions.perform();

app/routes/settings.js

@@ -43,6 +43,8 @@ export default TravisRoute.extend({
   fetchSshKey() {
     if (config.endpoints.sshKey) {
       const repo = this.modelFor('repo');
+      if (repo.serverType === 'perforce') return;
+
       const url = `/repos/${repo.get('id')}/key`;
       return this.api.get(url, { travisApiVersion: null }).then((data) => {
         const fingerprint = EmberObject.create({

app/styles/app/layout.scss

@@ -167,3 +167,6 @@ $padding-top: 24px;
     display: none !important;
   }
 }
+.mr-1_2 {
+  margin-right: 1.2rem;
+}

app/styles/app/layouts/profile.scss

@@ -220,13 +220,13 @@ $profile-breakpoint: 600px;
 .profile-repo {
   display: flex;
   position: relative;
-  flex: 1;
+  flex: 0;
   padding: 0.25em 0.5em 0.3em;
   border-radius: 2px;
-  margin-right: 1rem;
 
   .profile-repo-name {
     height: 21px;
+    white-space: nowrap;
     overflow: hidden;
   }
 
@@ -239,6 +239,18 @@ $profile-breakpoint: 600px;
   }
 }
 
+.profile-repo-type {
+  display: flex;
+  flex: 1;
+
+  .profile-repo-type-span {
+    background-color: #d8d8d8;
+    padding: 2px 6px;
+    border-radius: 25%;
+    font-weight: 600;
+  }
+}
+
 .profile-text,
 .profile-additional,
 .profile-betafeatures {

app/templates/components/dashboard-row.hbs

@@ -70,6 +70,16 @@
           {{/if}}
         </p>
       </section>
+      {{#if (eq this.repo.provider 'assembla')}}
+        <section class="dash-last">
+          <h3 class="label">
+            Repo type
+          </h3>
+          <p class="row-content color">
+            {{this.repositoryType}}
+          </p>
+        </section>
+      {{/if}}
       {{#if this.repo.currentBuild}}
         <section class="dash-last {{this.repo.currentBuild.state}}">
           <h3 class="label">

app/templates/components/github-apps-repository.hbs

@@ -13,6 +13,14 @@
     </span>
   {{/if}}
 </LinkTo>
+{{#if (eq this.repository.provider 'assembla')}}
+  <span class="profile-repo-type">
+    <span class="profile-repo-type-span">
+      {{this.repositoryType}}
+      <EmberTooltip @text="{{this.repositoryProvider}} {{this.repositoryType}} Repository" />
+    </span>
+  </span>
+{{/if}}
 {{#if this.hasSettingsPermission}}
   {{#if this.isNotMatchGithub}}
     <TravisSwitch
@@ -60,4 +68,4 @@
       {{/if}}
     </p>
   </div>
-{{/if}}
+{{/if}}

app/templates/components/repository-layout.hbs

@@ -22,6 +22,16 @@
       >
         <SvgImage @name={{vcs-icon this.repo.vcsType}} />
       </ExternalLinkTo>
+      {{#if (eq this.repo.provider 'assembla')}}
+      <div class="mr-1_2 inline-block vertical-align">
+        <span class="profile-repo-type">
+          <span class="profile-repo-type-span">
+            {{this.repositoryType}}
+            <EmberTooltip @text="{{this.repositoryProvider}} {{this.repositoryType}} Repository" />
+          </span>
+        </span>
+      </div>
+      {{/if}}
       <RepoStatusBadge @repo={{this.repo}} @onClick={{action 'toggleStatusBadgeModal'}} />
       <LogScanStatusBadge @repo={{this.repo}} />
     </div>

app/templates/settings.hbs

@@ -235,7 +235,7 @@
     </ul>
     <AddCronJob @repository={{this.model.repository}} />
   </section>
-  {{#if (and (config-get 'endpoints.sshKey') (or this.features.enterpriseVersion this.repo.private))}}
+  {{#if (and (and (config-get 'endpoints.sshKey') (or this.features.enterpriseVersion this.repo.private)) (not (eq this.repo.serverType 'perforce')))}}
     <section class="settings-section" data-test-ssh-key-section>
       <h2 class="small-title">
         SSH Key