fix(proposal): quit loading screen when sending proposal fails

zazuko · Oct 28, 2019 · ca2d7b7 · ca2d7b7
1 parent c7ffa09
commit ca2d7b7
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 32 deletions.
diff --git a/api/github/api.js b/api/github/api.js
@@ -2,6 +2,8 @@ const helpersFactory = require('./helpers')
 const octokitFactory = require('@octokit/rest')
 const debug = require('debug')('editor:api')
 
+const __cache = new Map()
+
 module.exports = class GitHubAPIv3 {
   constructor ({ forge, editor, ontology }) {
     debug('new GitHubAPIv3')
@@ -27,26 +29,29 @@ module.exports = class GitHubAPIv3 {
     const { getRefSHA, getFileSHA } = helpersFactory(this.__octokit)
     this.__getRefSHA = getRefSHA
     this.__getFileSHA = getFileSHA
-
-    this.__cache = new Map()
   }
 
   async createBranch () {
     const owner = this.owner
     const repo = this.repo
-    const sha = await this.__getRefSHA({
+    const getRefSHAParams = {
       ref: `heads/${this.branch}`,
       owner,
       repo
-    })
+    }
+    debug('createBranch: getting SHA for ref', getRefSHAParams)
+    const sha = await this.__getRefSHA(getRefSHAParams)
 
     const branchName = (new Date()).toISOString().replace(/:/g, '')
-    await this.__octokit.git.createRef({
+
+    const createRefParams = {
       ref: `refs/heads/${branchName}`,
       sha,
       owner,
       repo
-    })
+    }
+    debug('createBranch: creating ref', createRefParams)
+    await this.__octokit.git.createRef(createRefParams)
 
     return {
       name: branchName
@@ -59,15 +64,15 @@ module.exports = class GitHubAPIv3 {
     const ref = `heads/${branch}`
     const query = { owner, repo, path, ref }
 
-    const cached = this.__cache.get(`${ref}/${path}`)
+    const cached = __cache.get(`${ref}/${path}`)
     const headers = cached ? { 'If-Modified-Since': cached.lastModified } : {}
 
     let content
     try {
       const response = await this.__octokit.repos.getContents({ ...query, headers })
       content = Buffer.from(response.data.content, 'base64').toString()
       const lastModified = response.headers['last-modified']
-      this.__cache.set(`${ref}/${path}`, { lastModified, content })
+      __cache.set(`${ref}/${path}`, { lastModified, content })
     }
     catch (error) {
       // '304 not modified', let's serve cached version

diff --git a/pages/proposal/class.vue b/pages/proposal/class.vue
@@ -275,19 +275,27 @@ export default {
       load: LOAD
     }),
     async sendProposal () {
-      // Send splash screen
-      this.isLoading = true
-      // remove draft status from the json proposalObject
-      this.$vuexSet('class.clss.isDraft', false)
-      // save the changes
-      await this.autosaveDraft()
-      this.stopAutosave()
+      try {
+        // Send splash screen
+        this.isLoading = true
+        // remove draft status from the json proposalObject
+        this.$vuexSet('class.clss.isDraft', false)
+        // save the changes
+        await this.autosaveDraft()
+        this.stopAutosave()
 
-      const token = this.$apolloHelpers.getToken()
-      // create the PR etc
-      await this.submit(token)
-      // submit will commit success or error to the store,
-      // see this page's `watch`ers
+        const token = this.$apolloHelpers.getToken()
+        // create the PR etc
+        await this.submit(token)
+        // submit will commit success or error to the store,
+        // see this page's `watch`ers
+      }
+      catch (err) {
+        this.$vuexSet('class.clss.isDraft', true)
+        // save the changes
+        await this.autosaveDraft()
+        this.isLoading = false
+      }
     },
     stopAutosave () {
       clearInterval(this.saveInterval)

diff --git a/pages/proposal/property.vue b/pages/proposal/property.vue
@@ -273,19 +273,26 @@ export default {
       load: LOAD
     }),
     async sendProposal () {
-      // Send splash screen
-      this.isLoading = true
-      // remove draft status from the json proposalObject
-      this.$vuexSet('prop.prop.isDraft', false)
-      // save the changes
-      await this.autosaveDraft()
-      this.stopAutosave()
+      try {
+        // Send splash screen
+        this.isLoading = true
+        // remove draft status from the json proposalObject
+        this.$vuexSet('prop.prop.isDraft', false)
+        // save the changes
+        await this.autosaveDraft()
+        this.stopAutosave()
 
-      const token = this.$apolloHelpers.getToken()
-      // create the PR etc
-      await this.submit(token)
-      // submit will commit success or error to the store,
-      // see this page's `watch`ers
+        const token = this.$apolloHelpers.getToken()
+        // create the PR etc
+        await this.submit(token)
+        // submit will commit success or error to the store,
+        // see this page's `watch`ers
+      }
+      catch (err) {
+        this.$vuexSet('prop.prop.isDraft', true)
+        await this.autosaveDraft()
+        this.isLoading = false
+      }
     },
     stopAutosave () {
       clearInterval(this.saveInterval)