Merge pull request #5132 from naturalcrit/refactor-metadataEditor

Simplify metadataEditor
This commit is contained in:
Trevor Buckner
2026-10-20 14:34:42 -04:00
committed by GitHub
@@ -2,13 +2,14 @@
import '../uiEditor.less'; import '../uiEditor.less';
import React, { useState } from 'react'; import React, { useState } from 'react';
import _ from 'lodash'; import _ from 'lodash';
import request from '../../utils/request-middleware.js';
import Combobox from '@components/combobox.jsx';
import TagInput from '../tagInput/tagInput.jsx';
import request from '../../utils/request-middleware.js';
import Themes from '@themes/themes.json'; import Themes from '@themes/themes.json';
import validations from './validations.js'; import validations from './validations.js';
import Combobox from '@components/combobox.jsx';
import TagInput from '../tagInput/tagInput.jsx';
import homebreweryThumbnail from '../../thumbnail.png'; import homebreweryThumbnail from '../../thumbnail.png';
const callIfExists = (val, fn, ...args)=>{ const callIfExists = (val, fn, ...args)=>{
@@ -19,32 +20,25 @@ const callIfExists = (val, fn, ...args)=>{
const MetadataEditor = ({ const MetadataEditor = ({
metadata = { metadata = {
editId : null,
shareId : null, shareId : null,
editId : null,
title : '', title : '',
description : '', description : '',
thumbnail : '',
tags : [], tags : [],
published : false,
authors : [],
renderer : 'legacy',
theme : '5ePHB',
lang : 'en', lang : 'en',
renderer : 'legacy',
authors : [],
published : false,
thumbnail : '',
theme : '5ePHB',
}, },
onChange = ()=>{}, onChange = ()=>{},
reportError = ()=>{}, reportError = ()=>{},
...props userThemes = {},
themeBundle = {}
})=>{ })=>{
const [showThumbnail, setShowThumbnail] = useState(true); const [showThumbnail, setShowThumbnail] = useState(true);
const toggleThumbnailDisplay = ()=>{
setShowThumbnail(!showThumbnail);
};
const renderThumbnail = ()=>{
if(!showThumbnail) return;
return <img className='thumbnail-preview' src={metadata.thumbnail || homebreweryThumbnail}></img>;
};
const handleFieldChange = (name, e)=>{ const handleFieldChange = (name, e)=>{
// load validation rules, and check input value against them // load validation rules, and check input value against them
const inputRules = validations[name] ?? []; const inputRules = validations[name] ?? [];
@@ -90,13 +84,11 @@ const MetadataEditor = ({
const handleTheme = (theme)=>{ const handleTheme = (theme)=>{
metadata.renderer = theme.renderer; metadata.renderer = theme.renderer;
metadata.theme = theme.path; metadata.theme = theme.path;
onChange(metadata, 'theme'); onChange(metadata, 'theme');
}; };
const handleThemeWritein = (e)=>{ const handleThemeWritein = (e)=>{
const shareId = e.target.value.split('/').pop(); //Extract just the ID if a URL was pasted in const shareId = e.target.value.split('/').pop(); //Extract just the ID if a URL was pasted in
metadata.theme = shareId; metadata.theme = shareId;
onChange(metadata, 'theme'); onChange(metadata, 'theme');
}; };
const handleLanguage = (languageCode)=>{ const handleLanguage = (languageCode)=>{
@@ -141,18 +133,6 @@ const MetadataEditor = ({
</button>; </button>;
} }
}; };
const renderDelete = ()=>{
if(!metadata.editId) return;
return <div className='field delete'>
<label htmlFor='delete-button'>delete</label>
<div className='value'>
<button id='delete-button' onClick={handleDelete}>
<i className='fas fa-trash-alt' /> delete brew
</button>
</div>
</div>;
};
const renderAuthors = ()=>{ const renderAuthors = ()=>{
const authors = metadata.authors; const authors = metadata.authors;
const isOwner = global.account?.username && global.account?.username === authors[0]; const isOwner = global.account?.username && global.account?.username === authors[0];
@@ -204,7 +184,7 @@ const MetadataEditor = ({
); );
}; };
const renderThemeDropdown = ()=>{ const renderThemeDropdown = ()=>{
const mergedThemes = _.merge(Themes, props.userThemes); const mergedThemes = _.merge(Themes, userThemes);
const listThemes = (renderer)=>{ const listThemes = (renderer)=>{
return _.map(_.values(mergedThemes[renderer]), (theme)=>{ return _.map(_.values(mergedThemes[renderer]), (theme)=>{
@@ -225,7 +205,7 @@ const MetadataEditor = ({
}; };
const currentRenderer = metadata.renderer; const currentRenderer = metadata.renderer;
const currentThemeDisplay = props.themeBundle?.name ? `${props.themeBundle.author ?? currentRenderer} : ${props.themeBundle.name}` : 'No Theme Selected'; const currentThemeDisplay = themeBundle?.name ? `${themeBundle.author ?? currentRenderer} : ${themeBundle.name}` : 'No Theme Selected';
let dropdown; let dropdown;
if(currentRenderer == 'legacy') { if(currentRenderer == 'legacy') {
@@ -296,7 +276,6 @@ const MetadataEditor = ({
}} }}
/> />
</div> </div>
</div>; </div>;
}; };
const renderRenderOptions = ()=>{ const renderRenderOptions = ()=>{
@@ -364,15 +343,14 @@ const MetadataEditor = ({
/> />
<button <button
className='display' className='display'
onClick={toggleThumbnailDisplay} onClick={()=>setShowThumbnail(!showThumbnail)}
aria-label={`${showThumbnail ? 'hide thumbnail' : 'show thumbnail'}`}> aria-label={`${showThumbnail ? 'hide thumbnail' : 'show thumbnail'}`}>
<i className={`fas fa-caret-${showThumbnail ? 'right' : 'left'}`} /> <i className={`fas fa-caret-${showThumbnail ? 'right' : 'left'}`} />
</button> </button>
</div> </div>
</div> </div>
{renderThumbnail()} {showThumbnail && <img className='thumbnail-preview' src={metadata.thumbnail || homebreweryThumbnail}></img>}
</fieldset> </fieldset>
<div className='field tags'> <div className='field tags'>
<label htmlFor='combobox-tags'>Tags</label> <label htmlFor='combobox-tags'>Tags</label>
<div className='value'> <div className='value'>
@@ -388,17 +366,12 @@ const MetadataEditor = ({
/> />
</div> </div>
</div> </div>
{renderLanguageDropdown()} {renderLanguageDropdown()}
{renderThemeDropdown()} {renderThemeDropdown()}
{renderRenderOptions()} {renderRenderOptions()}
<h2>Authors</h2> <h2>Authors</h2>
{renderAuthors()} {renderAuthors()}
<div className='field invitedAuthors'> <div className='field invitedAuthors'>
<label htmlFor='combobox-invited-authors'>Invited authors</label> <label htmlFor='combobox-invited-authors'>Invited authors</label>
<div className='value'> <div className='value'>
@@ -418,7 +391,6 @@ const MetadataEditor = ({
</div> </div>
<h2>Privacy</h2> <h2>Privacy</h2>
<div className='field publish'> <div className='field publish'>
<label htmlFor='publish-button'>publish</label> <label htmlFor='publish-button'>publish</label>
<div className='value'> <div className='value'>
@@ -430,8 +402,14 @@ const MetadataEditor = ({
</small> </small>
</div> </div>
</div> </div>
{metadata.editId && <div className='field delete'>
{renderDelete()} <label htmlFor='delete-button'>delete</label>
<div className='value'>
<button id='delete-button' onClick={handleDelete}>
<i className='fas fa-trash-alt' /> delete brew
</button>
</div>
</div>}
</div> </div>
); );
}; };