From ac89f428b2824425a0ee9e3106d7d6127c167ac8 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 27 Mar 2025 18:25:56 +1300
Subject: [PATCH] Post merge fixes

---
 client/admin/admin.jsx                      | 6 +++---
 client/admin/lockTools/lockTools.jsx        | 4 ++--
 client/homebrew/utils/request-middleware.js | 4 ++--
 server/admin.api.js                         | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/admin/admin.jsx b/client/admin/admin.jsx
index 025d78abf..f59162e1d 100644
--- a/client/admin/admin.jsx
+++ b/client/admin/admin.jsx
@@ -3,9 +3,9 @@ import React, { useEffect, useState } from 'react';
 const BrewUtils = require('./brewUtils/brewUtils.jsx');
 const NotificationUtils = require('./notificationUtils/notificationUtils.jsx');
 import AuthorUtils from './authorUtils/authorUtils.jsx';
-const LockTools = require('./lockTools/lockTools.jsx');
+import LockTools  from './lockTools/lockTools.jsx';
 
-const tabGroups = ['brew', 'notifications', 'authors'];
+const tabGroups = ['brew', 'notifications', 'authors', 'locks'];
 
 const Admin = ()=>{
 	const [currentTab, setCurrentTab] = useState('brew');
@@ -41,7 +41,7 @@ const Admin = ()=>{
 				{currentTab === 'brew' && <BrewUtils />}
 				{currentTab === 'notifications' && <NotificationUtils />}
 				{currentTab === 'authors' && <AuthorUtils />}
-        {currentTab === 'locks' && <LockTools />}
+        		{currentTab === 'locks' && <LockTools />}
 			</main>
 		</div>
 	);
diff --git a/client/admin/lockTools/lockTools.jsx b/client/admin/lockTools/lockTools.jsx
index b5c94399a..5f8a4ba39 100644
--- a/client/admin/lockTools/lockTools.jsx
+++ b/client/admin/lockTools/lockTools.jsx
@@ -4,7 +4,7 @@ const React = require('react');
 const createClass = require('create-react-class');
 
 // const request = require('superagent');
-const request = require('../../homebrew/utils/request-middleware.js');
+import request from '../../homebrew/utils/request-middleware.js';
 
 const LockTools = createClass({
 	getInitialState : function() {
@@ -226,7 +226,7 @@ const LockTable = createClass({
 										</td>;
 									})}
 									<td className='icon' onClick={()=>{navigator.clipboard.writeText(result.shareId.toString());}}><i className='fa-regular fa-clipboard'></i></td>
-									<td className='icon'><i className='fa-regular fa-circle-right'></i></td>
+									<td className='icon'><a href={`/share/${result.shareId.toString()}`} target='_blank'><i className='fa-regular fa-circle-right'></i></a></td>
 								</tr>;
 							})}
 						</tbody>
diff --git a/client/homebrew/utils/request-middleware.js b/client/homebrew/utils/request-middleware.js
index 22609dadb..deb08d265 100644
--- a/client/homebrew/utils/request-middleware.js
+++ b/client/homebrew/utils/request-middleware.js
@@ -1,8 +1,8 @@
-const version = require('../../../package.json').version;
+import packageJSON from '../../../package.json' with { type: 'json' };
 import request from 'superagent';
 
 
-const addHeader = (request)=>request.set('Homebrewery-Version', version);
+const addHeader = (request)=>request.set('Homebrewery-Version', packageJSON.version);
 
 const requestMiddleware = {
 	get    : (path)=>addHeader(request.get(path)),
diff --git a/server/admin.api.js b/server/admin.api.js
index 3685492d5..96a21c8a7 100644
--- a/server/admin.api.js
+++ b/server/admin.api.js
@@ -305,6 +305,8 @@ router.put('/api/lock/review/remove/:id', mw.adminOnly, async (req, res)=>{
 	} catch (error) {
 		console.error(error);
 		return res.json({ status: 'ERROR', detail: `Unable to remove request for review on brew ID ${req.params.id}`, error });
+	};
+});
 
 // #######################   NOTIFICATIONS