Merge pull request #101 from unfoldingWord/feature-mannycolon-218

LGTM

Author: PhotoNomad0

coverage/shields.json

@@ -1 +1 @@
-{"message":"47.31%","label":"Integration Tests","schemaVersion":1}
+{"message":"46.38%","label":"Integration Tests","schemaVersion":1}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitea-react-toolkit",
-  "version": "1.9.3",
+  "version": "1.10.0-rc.20",
   "license": "MIT",
   "description": "A Gitea API React Toolkit Component Library",
   "homepage": "https://gitea-react-toolkit.netlify.com/",

src/components/file/index.js

@@ -1,4 +1,5 @@
 export { default as FileCard } from './FileCard';
 export { default as FileForm } from './FileForm';
 export { default as useFile } from './useFile';
+export { default as useEdit } from './useEdit';
 export * from './File.context';

src/components/file/useEdit.js

@@ -0,0 +1,78 @@
+import { useState } from 'react';
+import { updateContent } from '../..';
+
+export default function useEdit({
+  sha,
+  repo,
+  owner,
+  token,
+  config,
+  branch,
+  author,
+  content,
+  message,
+  filepath,
+}) {
+  const [{ isEditing, isError, error, editResponse }, setState] = useState({
+    editResponse: null,
+    isEditing: false,
+    isError: false,
+    error: null,
+  })
+  const { name: tokenid } = token || {}
+  const _message = message || `Edit '${filepath}' using '${tokenid}'`;
+
+  async function onSaveEdit(_branch) {
+    try {
+      if (content) {
+        setState((prevState) => ({
+          ...prevState,
+          editResponse: null,
+          isEditing: true,
+          isError: false,
+        }))
+  
+        const response = await updateContent({
+          sha,
+          repo,
+          owner,
+          config,
+          author,
+          content,
+          filepath,
+          message: _message,
+          // Use branch passed to function or branch passed to custom hook. 
+          branch: _branch || branch,
+        });
+  
+        setState((prevState) => ({
+          ...prevState,
+          editResponse: response,
+        }))
+        return true
+      } else {
+        console.warn('Content value is empty')
+      }
+    } catch (error) {
+      setState((prevState) => ({
+        ...prevState,
+        isError: true,
+        error,
+      }))
+      return false
+    } finally {
+      setState((prevState) => ({
+        ...prevState,
+        isEditing: false,
+      }))
+    }
+  }
+
+  return {
+    error,
+    isError,
+    isEditing,
+    onSaveEdit,
+    editResponse,
+  }
+}

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

@@ -130,7 +130,9 @@ export const updateContent = async ({
         url, payload: _payload, config,
       });
       contentObject = response.content;
-    } catch {
+    } catch (e) {
+      console.warn('Branch doesnt exists. Thus, creating new branch', e);
+
       const _payload = payload({
         new_branch: branch, content, message, author, sha,
       });

yarn.lock

@@ -4381,9 +4381,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
-  version "1.0.30001204"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz#256c85709a348ec4d175e847a3b515c66e79f2aa"
-  integrity sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==
+  version "1.0.30001245"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"
+  integrity sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==
 
 capture-exit@^2.0.0:
   version "2.0.0"