RD-235 Stage customization support minor fixes (#1136)

Author: kubama

app/actions/app.js

@@ -1,6 +1,4 @@
 import log from 'loglevel';
-
-import i18n from 'i18next';
 import * as types from './types';
 import { setAppError, setAppLoading } from './appState';
 import { loadTemplates } from './templates';
@@ -12,13 +10,6 @@ import { loadOrCreateUserAppData } from './userApp';
 import { getLdap, getUserData } from './managers';
 import { getClusterStatus } from './clusterStatus';
 import { NO_TENANTS_ERR } from '../utils/ErrorCodes';
-import LoaderUtils from '../utils/LoaderUtils';
-
-function loadTranslationOverrides() {
-    LoaderUtils.fetchResource('overrides.json', true).then(overrides =>
-        i18n.addResourceBundle('en', 'translation', overrides, true, true)
-    );
-}
 
 export function intialPageLoad() {
     return (dispatch, getState) => {
@@ -41,8 +32,7 @@ export function intialPageLoad() {
                     dispatch(loadWidgetDefinitions()),
                     dispatch(getClientConfig()),
                     dispatch(getClusterStatus()),
-                    dispatch(getLdap()),
-                    loadTranslationOverrides()
+                    dispatch(getLdap())
                 ]);
             })
             .then(() => {

app/app.jsx

@@ -50,6 +50,7 @@ import Interceptor from './utils/Interceptor';
 
 import Routes from './containers/Routes';
 import translation from './translations/en.json';
+import LoaderUtils from './utils/LoaderUtils';
 
 window.$ = $;
 
@@ -84,17 +85,23 @@ export default class app {
         };
 
         widgetDefinitionLoader.init();
-        return ConfigLoader.load().then(result => {
-            const store = configureStore(browserHistory, result);
 
-            createToolbox(store);
+        return Promise.all([
+            ConfigLoader.load().then(result => {
+                const store = configureStore(browserHistory, result);
 
-            StatusPoller.create(store);
-            UserAppDataAutoSaver.create(store);
-            Interceptor.create(store);
+                createToolbox(store);
 
-            return store;
-        });
+                StatusPoller.create(store);
+                UserAppDataAutoSaver.create(store);
+                Interceptor.create(store);
+
+                return store;
+            }),
+            LoaderUtils.fetchResource('overrides.json', true).then(overrides =>
+                i18n.addResourceBundle('en', 'translation', overrides, true, true)
+            )
+        ]).then(results => results[0]);
     }
 
     static start(store) {

backend/app.js

@@ -85,7 +85,7 @@ app.use(
 
 const translationsOverrides = 'overrides.json';
 app.use(`${contextPath}/userData/${translationsOverrides}`, (req, res) =>
-    res.sendfile(getResourcePath(translationsOverrides, true))
+    res.sendFile(getResourcePath(translationsOverrides, true))
 );
 
 app.use(

backend/handler/ArchiveHelper.js

@@ -70,7 +70,7 @@ module.exports = (() => {
 
     function saveDataFromUrl(url, targetDir, req) {
         return new Promise((resolve, reject) => {
-            const HEADERS = { 'User-Agent': 'Cloudify' };
+            const HEADERS = { 'User-Agent': 'Node.js' };
             const archiveUrl = decodeURIComponent(url.trim());
 
             logger.debug('Fetching file from url', archiveUrl);

backend/handler/TemplateHandler.js

@@ -46,7 +46,7 @@ module.exports = (() => {
                     const id = pathlib.basename(templateFile, '.json');
 
                     const name = _.get(pageFileContent, 'name', id);
-                    const updatedBy = _.get(pageFileContent, 'updatedBy', isCustom ? '' : 'Cloudify');
+                    const updatedBy = _.get(pageFileContent, 'updatedBy', isCustom ? '' : 'Manager');
                     const updatedAt = _.get(pageFileContent, 'updatedAt', '');
                     const data = {
                         roles: _.get(pageFileContent, 'roles', []),
@@ -87,7 +87,7 @@ module.exports = (() => {
                     const id = pathlib.basename(pageFile, '.json');
 
                     const name = _.get(pageFileContent, 'name', id);
-                    const updatedBy = _.get(pageFileContent, 'updatedBy', isCustom ? '' : 'Cloudify');
+                    const updatedBy = _.get(pageFileContent, 'updatedBy', isCustom ? '' : 'Manager');
                     const updatedAt = _.get(pageFileContent, 'updatedAt', '');
 
                     return { id, name, custom: isCustom, updatedBy, updatedAt };

backend/routes/Auth.js

@@ -52,7 +52,7 @@ router.post('/login', (req, res) =>
             if (err.error_code === 'unauthorized_error') {
                 res.status(401).send({ message: err.message || 'Invalid credentials', error: err });
             } else if (err.error_code === 'maintenance_mode_active') {
-                res.status(423).send({ message: 'Cloudify Manager is currently in maintenance mode', error: err });
+                res.status(423).send({ message: 'Manager is currently in maintenance mode', error: err });
             } else {
                 res.status(500).send({ message: `Failed to authenticate with manager: ${err.message}`, error: err });
             }

backend/test/handlers/ArchiveHelper.test.js

@@ -0,0 +1,20 @@
+const { saveDataFromUrl } = require('handler/ArchiveHelper');
+const RequestHandler = require('handler/RequestHandler');
+
+jest.mock('handler/RequestHandler', () => ({
+    request: jest.fn((method, url, headers, data, onSuccess, onError) => onError())
+}));
+
+describe('ArchiveHelper', () => {
+    it('fetches extenral data with correct headers', () => {
+        return saveDataFromUrl('').catch(() =>
+            expect(RequestHandler.request).toHaveBeenCalledWith(
+                'GET',
+                expect.any(String),
+                expect.objectContaining({ headers: { 'User-Agent': 'Node.js' } }),
+                expect.anything(),
+                expect.anything()
+            )
+        );
+    });
+});

backend/test/routes/Auth.test.js

@@ -0,0 +1,19 @@
+const request = require('supertest');
+const app = require('app');
+
+jest.mock('handler/AuthHandler', () => ({
+    getToken: () => Promise.reject({ error_code: 'maintenance_mode_active' })
+}));
+
+describe('/auth endpoint', () => {
+    it('handles manager maintenance mode', () => {
+        return new Promise(done => {
+            request(app)
+                .post('/console/auth/login')
+                .then(response => {
+                    expect(response.body.message).toStrictEqual('Manager is currently in maintenance mode');
+                    done();
+                });
+        });
+    });
+});