Merge pull request #291 from coderoad/tutorial-id

ensure tutorial has a unique id by owner/repo:branch

Author: ShMcK

package-lock.json

@@ -47,6 +47,7 @@
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.3",
+    "git-url-parse": "^11.1.2",
     "jest": "^25.3.0",
     "jsdom": "^16.2.2",
     "prettier": "^2.0.4",

package.json

@@ -16,18 +16,6 @@ class Editor {
     })
 
     // commands
-    this.activateCommands()
-
-    // setup tasks or views here
-  }
-  public deactivate = (): void => {
-    // cleanup subscriptions/tasks
-    for (const disposable of this.vscodeExt.subscriptions) {
-      disposable.dispose()
-    }
-  }
-
-  private activateCommands = (): void => {
     const commands = createCommands({
       extensionPath: this.vscodeExt.extensionPath,
       // NOTE: local storage must be bound to the vscodeExt.workspaceState
@@ -40,6 +28,12 @@ class Editor {
       this.vscodeExt.subscriptions.push(command)
     }
   }
+  public deactivate = (): void => {
+    // cleanup subscriptions/tasks
+    for (const disposable of this.vscodeExt.subscriptions) {
+      disposable.dispose()
+    }
+  }
 }
 
 export default Editor

src/editor/index.ts

@@ -3,6 +3,7 @@ import * as React from 'react'
 import SelectTutorialForm from './SelectTutorialForm'
 import TutorialOverview from '../../components/TutorialOverview'
 import LoadTutorialSummary from './LoadTutorialSummary'
+import processTutorial from '../../services/tutorial'
 
 const styles = {
   page: {
@@ -39,7 +40,7 @@ const SelectTutorialPage = (props: Props) => {
     setPage('loading')
   }
   const onLoadSummary = (d: TT.Tutorial) => {
-    setData(d)
+    setData(processTutorial(d))
     setPage('summary')
   }
   const onClear = () => {

web-app/src/containers/SelectTutorial/index.tsx

@@ -0,0 +1,15 @@
+import * as TT from 'typings/tutorial'
+// @ts-ignore
+import gitUrlParser from 'git-url-parse'
+
+const processTutorial = (tutorial: TT.Tutorial): TT.Tutorial => {
+  // define tutorial id as the "owner/repo-name"
+  // see docs at https://github.com/IonicaBizau/git-url-parse
+  const { repo } = tutorial.config
+  const { full_name } = gitUrlParser(repo.uri)
+  tutorial.id = `${full_name}:${repo.branch}`
+
+  return tutorial
+}
+
+export default processTutorial