git gateway support for media library, branch config

decaporg · Sep 19, 2017 · a7444e3 · a7444e3
1 parent 289c296
commit a7444e3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/actions/mediaLibrary.js b/src/actions/mediaLibrary.js
@@ -32,7 +32,7 @@ export function insertMedia(mediaPath) {
   return { type: MEDIA_INSERT, payload: { mediaPath } };
 }
 
-export function loadMedia(delay = 0, query) {
+export function loadMedia({ delay = 0, query }) {
   return (dispatch, getState) => {
     const state = getState();
     const backend = currentBackend(state.config);
@@ -94,7 +94,7 @@ export function deleteMedia(file) {
       return provider.delete(file.id)
         .then(() => {
           dispatch(mediaDeleted());
-          return dispatch(loadMedia(500));
+          return dispatch(loadMedia({ delay: 500 }));
         })
         .catch(error => {
           console.error(error);
@@ -110,7 +110,7 @@ export function deleteMedia(file) {
     return backend.deleteMedia(file.path)
       .then(() => {
         dispatch(mediaDeleted());
-        return dispatch(loadMedia(500));
+        return dispatch(loadMedia({ delay: 500 }));
       })
       .catch(error => {
         console.error(error);

diff --git a/src/backends/git-gateway/API.js b/src/backends/git-gateway/API.js
@@ -1,4 +1,5 @@
 import GithubAPI from "../github/API";
+import { APIError } from "../../valueObjects/errors";
 
 export default class API extends GithubAPI {
   constructor(config) {
@@ -43,15 +44,20 @@ export default class API extends GithubAPI {
 
   request(path, options = {}) {
     const url = this.urlFor(path, options);
+    let responseStatus;
     return this.getRequestHeaders(options.headers || {})
     .then(headers => fetch(url, { ...options, headers }))
     .then((response) => {
+      responseStatus = response.status;
       const contentType = response.headers.get("Content-Type");
       if (contentType && contentType.match(/json/)) {
         return this.parseJsonResponse(response);
       }
 
       return response.text();
+    })
+    .catch(error => {
+      throw new APIError(error.message, responseStatus, 'Git Gateway');
     });
   }
 

diff --git a/src/components/MediaLibrary/MediaLibrary.js b/src/components/MediaLibrary/MediaLibrary.js
@@ -26,7 +26,7 @@ class MediaLibrary extends React.Component {
 
   componentDidMount() {
     const { dispatch, closeMediaLibrary } = this.props;
-    dispatch(loadMedia(0, this.state.query));
+    dispatch(loadMedia({ query: this.state.query }));
   }
 
   componentWillReceiveProps(nextProps) {
@@ -113,7 +113,7 @@ class MediaLibrary extends React.Component {
     const files = [...fileList];
     const file = files[0];
     return dispatch(persistMedia(file, privateUpload))
-      .then(() => dispatch(0, loadMedia(this.state.query)));
+      .then(() => dispatch(loadMedia({ query: this.state.query })));
   };
 
   handleInsert = () => {
@@ -140,7 +140,7 @@ class MediaLibrary extends React.Component {
 
   handleSearchKeyDown = (event, dynamicSearch) => {
     if (event.key === 'Enter' && dynamicSearch) {
-      this.props.dispatch(loadMedia(0, this.state.query));
+      this.props.dispatch(loadMedia({ query: this.state.query }));
     }
   };