Merge pull request #141 from unfoldingWord/feature-888-superdav42-only-create-on-save

Do not create user branch when working with new file

Author: jincypjose

coverage/shields.json

@@ -1 +1 @@
-{"message":"45.96%","label":"Integration Tests","schemaVersion":1}
+{"message":"45.85%","label":"Integration Tests","schemaVersion":1}

src/components/file/helpers.js

@@ -48,8 +48,12 @@ export const getContentFromFile = async (file) => {
   } = file;
   let _content;
 
-  if (content && encoding === 'base64') {
-    _content = decodeBase64ToUtf8(content);
+  if (content) {
+    if ('base64' === encoding) {
+      _content = decodeBase64ToUtf8(content);
+    } else {
+      _content = content;
+    }
   } else if (!content && download_url) {
     _content = await get({ url: download_url, noCache: true });
   } else if (!content && git_url) {

src/core/gitea-api/repos/contents/contents.ts

@@ -40,6 +40,7 @@ interface ContentObject {
   sha: string;
   content: string;
   html_url: string;
+  name: string;
 }
 
 export const payload = ({
@@ -205,11 +206,15 @@ export const ensureContent = async ({
         throw new Error('File does not exist in default branch');
       }
 
-    } catch { // try to create the file if it doesn't exist in default or new branch
-      // if branch does not exist yet, it will be created here.
-      contentObject = await createContent({
-        config, owner, repo, branch, filepath, content, message, author,
-      });
+    } catch {
+      // create contentObject directly when unconnected to branch or repo.
+      contentObject = {
+        name: filepath.slice(filepath.lastIndexOf('/')+1),
+        content: content || '',
+        path: filepath,
+        sha: 'new',
+        html_url: '',
+      }
     }
   }