From 8015f99211809a752017097cff6f613bc2ef4b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 30 Mar 2022 13:17:52 +0200 Subject: [PATCH] :zap: Improve error handling for headers --- packages/cli/src/Server.ts | 7 +++++-- packages/editor-ui/src/views/NodeView.vue | 8 ++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts index e87b36e81f..33a8918d60 100644 --- a/packages/cli/src/Server.ts +++ b/packages/cli/src/Server.ts @@ -29,7 +29,7 @@ /* eslint-disable no-await-in-loop */ import * as express from 'express'; -import { readFileSync } from 'fs'; +import { existsSync, readFileSync } from 'fs'; import { readFile } from 'fs/promises'; import { cloneDeep } from 'lodash'; import { dirname as pathDirname, join as pathJoin, resolve as pathResolve } from 'path'; @@ -1503,10 +1503,13 @@ class App { async (req: express.Request, res: express.Response): Promise => { const packagesPath = pathJoin(__dirname, '..', '..', '..'); const headersPath = pathJoin(packagesPath, 'nodes-base', 'dist', 'nodes', 'headers'); + + if (!existsSync(`${headersPath}.js`)) return; + try { return require(headersPath); } catch (error) { - res.status(500).send('Failed to find headers file'); + res.status(500).send('Failed to load headers file'); } }, ), diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue index 966bba57a7..5c77bdf1fc 100644 --- a/packages/editor-ui/src/views/NodeView.vue +++ b/packages/editor-ui/src/views/NodeView.vue @@ -2742,12 +2742,8 @@ export default mixins( await Promise.all(loadPromises); if (this.defaultLocale !== 'en') { - try { - const headers = await this.restApi().getNodeTranslationHeaders(); - addHeaders(headers, this.defaultLocale); - } catch (_) { - // no headers available - } + const headers = await this.restApi().getNodeTranslationHeaders(); + if (headers) addHeaders(headers, this.defaultLocale); } } catch (error) { this.$showError(