[PRD] TCI/Assembla Handshake with SVN/P4

app/adapters/repo.js

@@ -19,16 +19,21 @@ export default V3Adapter.extend({
     const prefix = this.urlPrefix();
 
     if (query) {
-      const { provider, slug, custom } = query;
+      const { provider, slug, serverType, custom } = query;
       const providerPrefix = provider ? `${provider}/` : '';
 
       delete query.provider;
       delete query.slug;
       delete query.custom;
+      delete query.serverType;
 
       // fetch repo by slug
       if (!id && slug) {
-        return `${prefix}/repo/${providerPrefix}${encodeURIComponent(slug)}`;
+        let url = `${prefix}/repo/${providerPrefix}${encodeURIComponent(slug)}`;
+        if (serverType) {
+          url = `${url}?server_type=${serverType}`;
+        }
+        return url;
       }
 
       if (custom && custom.type === 'byOwner') {

app/controllers/repo.js

@@ -16,7 +16,8 @@ export default Controller.extend({
   features: service(),
   updateTimesService: service('updateTimes'),
 
-  queryParams: ['migrationStatus'],
+  queryParams: ['migrationStatus', 'serverType'],
+  serverType: null,
   migrationStatus: null,
 
   jobController: controller('job'),

app/models/repo.js

@@ -426,12 +426,15 @@ Repo.reopenClass({
     });
   },
 
-  fetchBySlug(store, slug, provider = defaultVcsConfig.urlPrefix) {
-    const loadedRepos = store.peekAll('repo').filterBy('provider', provider).filterBy('slug', slug);
+  fetchBySlug(store, slug, provider = defaultVcsConfig.urlPrefix, serverType = undefined) {
+    let loadedRepos = store.peekAll('repo').filterBy('provider', provider).filterBy('slug', slug);
+    if (serverType) {
+      loadedRepos = loadedRepos.filterBy('serverType', serverType);
+    }
     if (!isEmpty(loadedRepos)) {
       return EmberPromise.resolve(loadedRepos.firstObject);
     }
-    return store.queryRecord('repo', { slug, provider });
+    return store.queryRecord('repo', { slug, provider, serverType });
   },
 });
 

app/router.js

@@ -93,6 +93,8 @@ Router.map(function () {
   this.route('legacy-repo-url', { path: '/:owner/:repo/:method' });
   this.route('legacy-repo-url', { path: '/:owner/:repo/:method/:id' });
   this.route('legacy-repo-url', { path: '/:owner/:repo/:method/:id/:view' });
+  this.route('legacy-repo-url', { path: '/:provider/:owner/:repo/:serverType/:method/:id' });
+  this.route('legacy-repo-url', { path: '/:provider/:owner/:repo/:serverType/:method/:id/:view' });
 
   this.route('error404', { path: '/404' });
   this.route('page-not-found', { path: '/*wildcard' });

app/routes/legacy-repo-url.js

@@ -7,19 +7,32 @@ export default Route.extend({
 
   beforeModel(transition) {
     const { params, queryParams } = transition.to;
-    let { owner, repo, method, id, view } = params;
-    let provider, routeName = 'provider', routeModels = [];
+    let { owner, repo, method, id, view, provider, serverType } = params;
+    let vcsConfig, routeName = 'provider', routeModels = [];
 
-    const vcsConfig = vcsConfigByUrlPrefix(owner);
+    if (provider) {
+      vcsConfig = vcsConfigByUrlPrefix(provider);
+    } else {
+      vcsConfig = vcsConfigByUrlPrefix(owner);
+    }
 
     const isLegacyUrl = isEmpty(vcsConfig);
+    const serverTypes = ['git', 'svn', 'perforce'];
+    const isServerTypeUrl = serverTypes.includes(serverType) || serverTypes.includes(id);
+
     if (isLegacyUrl) {
       provider = defaultVcsConfig.urlPrefix;
     } else {
       // params include provider, so swap them accordingly
-      [provider, owner, repo, method, id] = [owner, repo, method, id, view];
+      if (!isServerTypeUrl) {
+        [provider, owner, repo, method, id] = [owner, repo, method, id, view];
+      } else if (serverTypes.includes(id)) {
+        [provider, owner, repo, serverType, method, id, view] = [owner, repo, method, id, view];
+      }
     }
 
+    const newQueryParams = { serverType: serverType, ...queryParams };
+
     routeModels.push(provider);
 
     if (owner) {
@@ -43,7 +56,7 @@ export default Route.extend({
 
     if (this._router.hasRoute(routeName)) {
       transition.abort();
-      this.transitionTo(routeName, ...routeModels, { queryParams });
+      this.transitionTo(routeName, ...routeModels, { queryParams: newQueryParams });
     }
   }
 });

app/routes/repo.js

@@ -52,10 +52,10 @@ export default TravisRoute.extend(ScrollResetMixin, {
     return { provider, owner, name };
   },
 
-  model({ provider, owner, name }) {
+  model({ provider, owner, name, serverType }) {
     const slug = `${owner}/${name}`;
     this.set('slug', slug);
-    return Repo.fetchBySlug(this.store, slug, provider);
+    return Repo.fetchBySlug(this.store, slug, provider, serverType);
   },
 
   beforeModel() {