Display error during thread init

Author: Aiden Keating

Diff for: gitea_client.js

@@ -124,7 +124,7 @@ exports.createRepoForUser = (username, repo) => {
   const normalizedUser = normalizeUser(username);
   return new Promise((resolve, reject) => {
     if (!GITEA_HOST || !GITEA_TOKEN) {
-      return reject(new Error('Gitea not installed'));
+      return reject(new Error('Gitea is not configured. Repositories cannot be created.'));
     }
 
     if (!repo || !repo.repoName) {
@@ -154,4 +154,4 @@ exports.createRepoForUser = (username, repo) => {
           .catch(reject);
       });
   });
-};
+};

Diff for: server.js

@@ -35,19 +35,22 @@ app.post('/initThread', fetchOpenshiftUser, (req, res) => {
 
   // Return success in mock mode without actually creating any repositories
   if (!process.env.OPENSHIFT_HOST) {
-    return res.sendStatus(200);
+    console.warn('OPENSHIFT_HOST not set. Skipping thread initialization.');
+    res.sendStatus(200);
+    return;
   }
 
-  if (repos && repos.length > 0) {
-    return Promise.all(repos.map(repo => giteaClient.createRepoForUser(openshiftUser, repo)))
-      .then(() => res.sendStatus(200))
-      .catch(err => {
-        console.error(`Error creating repositories: ${err}`);
-        return res.sendStatus(500);
-      });
-  } else {
-    return res.sendStatus(200);
+  if (!repos || repos.length === 0) {
+    res.sendStatus(200);
+    return;
   }
+
+  return Promise.all(repos.map(repo => giteaClient.createRepoForUser(openshiftUser, repo)))
+    .then(() => res.sendStatus(200))
+    .catch(err => {
+      console.error(`Error creating repositories: ${err}`);
+      return res.status(500).json({ error: err.message });
+    });
 });
 
 // Dynamic configuration for openshift API calls

Diff for: src/redux/actions/threadActions.js

@@ -1,5 +1,6 @@
 import { threadTypes } from '../constants';
 import { threadServices } from '../../services';
+import { PENDING_ACTION, FULFILLED_ACTION, REJECTED_ACTION } from '../helpers';
 
 const getThread = (language, id) => ({
   type: threadTypes.GET_THREAD,
@@ -16,9 +17,31 @@ const initCustomThread = id => ({
   payload: threadServices.initCustomThread(id)
 });
 
+const initCustomThreadPending = () => ({
+  type: PENDING_ACTION(threadTypes.INIT_THREAD)
+});
+
+const initCustomThreadSuccess = payload => ({
+  type: FULFILLED_ACTION(threadTypes.INIT_THREAD),
+  payload
+});
+
+const initCustomThreadFailure = error => ({
+  type: REJECTED_ACTION(threadTypes.INIT_THREAD),
+  payload: { error }
+});
+
 const updateThreadProgress = (id, progress) => ({
   type: threadTypes.UPDATE_THREAD_PROGRESS,
   payload: threadServices.updateThreadProgress(id, progress)
 });
 
-export { getThread, getCustomThread, initCustomThread, updateThreadProgress };
+export {
+  getThread,
+  getCustomThread,
+  initCustomThread,
+  updateThreadProgress,
+  initCustomThreadSuccess,
+  initCustomThreadFailure,
+  initCustomThreadPending
+};

Diff for: src/redux/reducers/threadReducers.js

@@ -68,8 +68,8 @@ const threadReducers = (state = initialState, action) => {
       return setStateProp(
         'manifest',
         {
-          error: action.error,
-          errorMessage: action.payload.message
+          error: action.payload.error,
+          errorMessage: action.payload.error.message
         },
         {
           state,
@@ -97,7 +97,7 @@ const threadReducers = (state = initialState, action) => {
         {
           pending: false,
           fulfilled: true,
-          data: action.payload.data
+          data: action.payload
         },
         {
           state,

Diff for: src/services/threadServices.js

@@ -15,7 +15,11 @@ const initDeps = response =>
       })
         .then(resp => {
           if (resp.status !== 200) {
-            return reject(new Error('An error occurred while initializing the dependencies'));
+            const errorMsg =
+              resp.response && resp.response.data && resp.response.data.error
+                ? resp.response.data.error
+                : 'An error occurred while initializing the dependencies';
+            return reject(new Error(errorMsg));
           }
           return resolve(response);
         })

Diff for: src/services/walkthroughServices.js

@@ -13,6 +13,11 @@ import {
   routeDef
 } from '../common/openshiftResourceDefinitions';
 import { addWalkthroughService, removeWalkthroughService } from '../redux/actions/walkthroughServiceActions';
+import {
+  initCustomThreadPending,
+  initCustomThreadSuccess,
+  initCustomThreadFailure
+} from '../redux/actions/threadActions';
 
 const DEFAULT_SERVICE_INSTANCE = {
   kind: 'ServiceInstance',
@@ -34,9 +39,11 @@ const prepareCustomWalkthroughNamespace = (dispatch, walkthoughName) => {
   if (window.OPENSHIFT_CONFIG.mockData) {
     return Promise.resolve([]);
   }
+  dispatch(initCustomThreadPending());
   return initCustomThread(walkthoughName)
     .then(res => res.data)
     .then(manifest => {
+      dispatch(initCustomThreadSuccess(manifest));
       currentUser().then(user => {
         const userNamespace = buildValidProjectNamespaceName(user.username, walkthoughName);
         const namespaceObj = namespaceResource(userNamespace);
@@ -67,7 +74,8 @@ const prepareCustomWalkthroughNamespace = (dispatch, walkthoughName) => {
             );
         });
       });
-    });
+    })
+    .catch(e => dispatch(initCustomThreadFailure(e)));
 };
 
 /**