From 8221579b6a8a2c6567cc12748760f88ac3369d0e Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sun, 28 Jul 2024 18:03:25 -0400 Subject: [PATCH] Linting --- .../editor/metadataEditor/metadataEditor.jsx | 2 +- client/homebrew/navbar/error-navitem.jsx | 2 +- server/homebrew.api.js | 2 +- server/homebrew.api.spec.js | 126 +++++++++--------- shared/helpers.js | 16 +-- 5 files changed, 74 insertions(+), 74 deletions(-) diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 944c4d88a..4b48c2617 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -225,7 +225,7 @@ const MetadataEditor = createClass({ dropdown =
{currentTheme.author ?? _.upperFirst(currentRenderer)} : {currentTheme.name}
- + {listThemes(currentRenderer)} ; } diff --git a/client/homebrew/navbar/error-navitem.jsx b/client/homebrew/navbar/error-navitem.jsx index 652959459..5dd5c1eb9 100644 --- a/client/homebrew/navbar/error-navitem.jsx +++ b/client/homebrew/navbar/error-navitem.jsx @@ -111,7 +111,7 @@ const ErrorNavItem = createClass({ Looks like there was a problem retreiving the theme, or a theme that it inherits, for this brew. Verify that brew - {response.body.brewId} still exists! + {response.body.brewId} still exists! ; } diff --git a/server/homebrew.api.js b/server/homebrew.api.js index c8e4996cb..c7484da92 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -272,7 +272,7 @@ const api = { await api.getBrew('share')(req, res, ()=>{}) .catch((err)=>{ if(err.HBErrorCode == '05') - err = {...err, name: 'ThemeLoad Error', message: 'Theme Not Found', HBErrorCode: '09'}; + err = { ...err, name: 'ThemeLoad Error', message: 'Theme Not Found', HBErrorCode: '09' }; throw err; }); diff --git a/server/homebrew.api.spec.js b/server/homebrew.api.spec.js index 273900ee2..679301294 100644 --- a/server/homebrew.api.spec.js +++ b/server/homebrew.api.spec.js @@ -581,118 +581,118 @@ brew`); }); }); - describe('Theme bundle', () => { - it('should return Theme Bundle for a User Theme', async () => { + describe('Theme bundle', ()=>{ + it('should return Theme Bundle for a User Theme', async ()=>{ const brews = { - userThemeAID: { title: 'User Theme A', renderer: 'V3', theme: null, shareId: 'userThemeAID', style: 'User Theme A Style' } + userThemeAID : { title: 'User Theme A', renderer: 'V3', theme: null, shareId: 'userThemeAID', style: 'User Theme A Style' } }; - const toBrewPromise = (brew) => new Promise((res) => res({ toObject: () => brew })); - model.get = jest.fn((getParams) => toBrewPromise(brews[getParams.shareId])); - const req = { params: { renderer: "V3", id: "userThemeAID" }, get: () => { return 'localhost'; }, protocol: 'https' }; + const toBrewPromise = (brew)=>new Promise((res)=>res({ toObject: ()=>brew })); + model.get = jest.fn((getParams)=>toBrewPromise(brews[getParams.shareId])); + const req = { params: { renderer: 'V3', id: 'userThemeAID' }, get: ()=>{ return 'localhost'; }, protocol: 'https' }; await api.getThemeBundle(req, res); expect(res.status).toHaveBeenCalledWith(200); expect(res.send).toHaveBeenCalledWith({ - styles: ["/* From Brew: https://localhost/share/userThemeAID */\n\nUser Theme A Style"], - snippets: [] + styles : ['/* From Brew: https://localhost/share/userThemeAID */\n\nUser Theme A Style'], + snippets : [] }); }); - it('should return Theme Bundle for nested User Themes', async () => { + it('should return Theme Bundle for nested User Themes', async ()=>{ const brews = { - userThemeAID: { title: 'User Theme A', renderer: 'V3', theme: 'userThemeBID', shareId: 'userThemeAID', style: 'User Theme A Style' }, - userThemeBID: { title: 'User Theme B', renderer: 'V3', theme: 'userThemeCID', shareId: 'userThemeBID', style: 'User Theme B Style' }, - userThemeCID: { title: 'User Theme C', renderer: 'V3', theme: null, shareId: 'userThemeCID', style: 'User Theme C Style' } + userThemeAID : { title: 'User Theme A', renderer: 'V3', theme: 'userThemeBID', shareId: 'userThemeAID', style: 'User Theme A Style' }, + userThemeBID : { title: 'User Theme B', renderer: 'V3', theme: 'userThemeCID', shareId: 'userThemeBID', style: 'User Theme B Style' }, + userThemeCID : { title: 'User Theme C', renderer: 'V3', theme: null, shareId: 'userThemeCID', style: 'User Theme C Style' } }; - const toBrewPromise = (brew) => new Promise((res) => res({ toObject: () => brew })); - model.get = jest.fn((getParams) => toBrewPromise(brews[getParams.shareId])); - const req = { params: { renderer: "V3", id: "userThemeAID" }, get: () => { return 'localhost'; }, protocol: 'https' }; + const toBrewPromise = (brew)=>new Promise((res)=>res({ toObject: ()=>brew })); + model.get = jest.fn((getParams)=>toBrewPromise(brews[getParams.shareId])); + const req = { params: { renderer: 'V3', id: 'userThemeAID' }, get: ()=>{ return 'localhost'; }, protocol: 'https' }; await api.getThemeBundle(req, res); expect(res.status).toHaveBeenCalledWith(200); expect(res.send).toHaveBeenCalledWith({ - styles: [ - "/* From Brew: https://localhost/share/userThemeCID */\n\nUser Theme C Style", - "/* From Brew: https://localhost/share/userThemeBID */\n\nUser Theme B Style", - "/* From Brew: https://localhost/share/userThemeAID */\n\nUser Theme A Style" - ], - snippets: [] + styles : [ + '/* From Brew: https://localhost/share/userThemeCID */\n\nUser Theme C Style', + '/* From Brew: https://localhost/share/userThemeBID */\n\nUser Theme B Style', + '/* From Brew: https://localhost/share/userThemeAID */\n\nUser Theme A Style' + ], + snippets : [] }); }); - it('should return Theme Bundle for a Static Theme', async () => { - const req = { params: { renderer: "V3", id: "5ePHB" }, get: () => { return 'localhost'; }, protocol: 'https' }; + it('should return Theme Bundle for a Static Theme', async ()=>{ + const req = { params: { renderer: 'V3', id: '5ePHB' }, get: ()=>{ return 'localhost'; }, protocol: 'https' }; await api.getThemeBundle(req, res); expect(res.status).toHaveBeenCalledWith(200); expect(res.send).toHaveBeenCalledWith({ - styles: [ - `/* From Theme Blank */\n\n@import url("/themes/V3/Blank/style.css");`, - `/* From Theme 5ePHB */\n\n@import url("/themes/V3/5ePHB/style.css");` - ], - snippets: [ - "V3_Blank", - "V3_5ePHB" - ] + styles : [ + `/* From Theme Blank */\n\n@import url("/themes/V3/Blank/style.css");`, + `/* From Theme 5ePHB */\n\n@import url("/themes/V3/5ePHB/style.css");` + ], + snippets : [ + 'V3_Blank', + 'V3_5ePHB' + ] }); }); - it('should return Theme Bundle for nested User and Static Themes together', async () => { + it('should return Theme Bundle for nested User and Static Themes together', async ()=>{ const brews = { - userThemeAID: { title: 'User Theme A', renderer: 'V3', theme: 'userThemeBID', shareId: 'userThemeAID', style: 'User Theme A Style' }, - userThemeBID: { title: 'User Theme B', renderer: 'V3', theme: 'userThemeCID', shareId: 'userThemeBID', style: 'User Theme B Style' }, - userThemeCID: { title: 'User Theme C', renderer: 'V3', theme: '5eDMG', shareId: 'userThemeCID', style: 'User Theme C Style' } + userThemeAID : { title: 'User Theme A', renderer: 'V3', theme: 'userThemeBID', shareId: 'userThemeAID', style: 'User Theme A Style' }, + userThemeBID : { title: 'User Theme B', renderer: 'V3', theme: 'userThemeCID', shareId: 'userThemeBID', style: 'User Theme B Style' }, + userThemeCID : { title: 'User Theme C', renderer: 'V3', theme: '5eDMG', shareId: 'userThemeCID', style: 'User Theme C Style' } }; - const toBrewPromise = (brew) => new Promise((res) => res({ toObject: () => brew })); - model.get = jest.fn((getParams) => toBrewPromise(brews[getParams.shareId])); - const req = { params: { renderer: "V3", id: "userThemeAID" }, get: () => { return 'localhost'; }, protocol: 'https' }; + const toBrewPromise = (brew)=>new Promise((res)=>res({ toObject: ()=>brew })); + model.get = jest.fn((getParams)=>toBrewPromise(brews[getParams.shareId])); + const req = { params: { renderer: 'V3', id: 'userThemeAID' }, get: ()=>{ return 'localhost'; }, protocol: 'https' }; await api.getThemeBundle(req, res); expect(res.status).toHaveBeenCalledWith(200); expect(res.send).toHaveBeenCalledWith({ - styles: [ - `/* From Theme Blank */\n\n@import url("/themes/V3/Blank/style.css");`, - `/* From Theme 5ePHB */\n\n@import url("/themes/V3/5ePHB/style.css");`, - `/* From Theme 5eDMG */\n\n@import url("/themes/V3/5eDMG/style.css");`, - "/* From Brew: https://localhost/share/userThemeCID */\n\nUser Theme C Style", - "/* From Brew: https://localhost/share/userThemeBID */\n\nUser Theme B Style", - "/* From Brew: https://localhost/share/userThemeAID */\n\nUser Theme A Style" - ], - snippets: [ - "V3_Blank", - "V3_5ePHB", - "V3_5eDMG" - ] + styles : [ + `/* From Theme Blank */\n\n@import url("/themes/V3/Blank/style.css");`, + `/* From Theme 5ePHB */\n\n@import url("/themes/V3/5ePHB/style.css");`, + `/* From Theme 5eDMG */\n\n@import url("/themes/V3/5eDMG/style.css");`, + '/* From Brew: https://localhost/share/userThemeCID */\n\nUser Theme C Style', + '/* From Brew: https://localhost/share/userThemeBID */\n\nUser Theme B Style', + '/* From Brew: https://localhost/share/userThemeAID */\n\nUser Theme A Style' + ], + snippets : [ + 'V3_Blank', + 'V3_5ePHB', + 'V3_5eDMG' + ] }); }); it('should fail for an invalid Theme in the chain', async()=>{ const brews = { - userThemeAID: { title: 'User Theme A', renderer: 'V3', theme: 'missingTheme', shareId: 'userThemeAID', style: 'User Theme A Style' }, + userThemeAID : { title: 'User Theme A', renderer: 'V3', theme: 'missingTheme', shareId: 'userThemeAID', style: 'User Theme A Style' }, }; - const toBrewPromise = (brew) => new Promise((res) => res({ toObject: () => brew })); - model.get = jest.fn((getParams) => toBrewPromise(brews[getParams.shareId])); - const req = { params: { renderer: "V3", id: "userThemeAID" }, get: () => { return 'localhost'; }, protocol: 'https' }; + const toBrewPromise = (brew)=>new Promise((res)=>res({ toObject: ()=>brew })); + model.get = jest.fn((getParams)=>toBrewPromise(brews[getParams.shareId])); + const req = { params: { renderer: 'V3', id: 'userThemeAID' }, get: ()=>{ return 'localhost'; }, protocol: 'https' }; - let err + let err; await api.getThemeBundle(req, res) - .catch(e => err = e); + .catch((e)=>err = e); expect(err).toEqual({ - HBErrorCode : "09", - accessType : "share", - brewId : "missingTheme", - message : "Theme Not Found", - name : "ThemeLoad Error", - status : 404}); + HBErrorCode : '09', + accessType : 'share', + brewId : 'missingTheme', + message : 'Theme Not Found', + name : 'ThemeLoad Error', + status : 404 }); }); }); diff --git a/shared/helpers.js b/shared/helpers.js index 90d0004b4..e5c1b7769 100644 --- a/shared/helpers.js +++ b/shared/helpers.js @@ -34,19 +34,19 @@ const printCurrentBrew = ()=>{ } }; -const fetchThemeBundle = async (obj, renderer, theme) => { +const fetchThemeBundle = async (obj, renderer, theme)=>{ const res = await request .get(`/api/theme/${renderer}/${theme}`) - .catch((err) => { - obj.setState({ error: err }); + .catch((err)=>{ + obj.setState({ error: err }); }); - if (!res) return; + if(!res) return; const themeBundle = res.body; - themeBundle.joinedStyles = themeBundle.styles.map((style) => ``).join('\n\n'); - obj.setState((prevState) => ({ - ...prevState, - themeBundle: themeBundle + themeBundle.joinedStyles = themeBundle.styles.map((style)=>``).join('\n\n'); + obj.setState((prevState)=>({ + ...prevState, + themeBundle : themeBundle })); };