Merged in hotfix/2026-01-13 (pull request #2813)

Hotfix/2026 01 13 into master-AIO
This commit is contained in:
Dave Richer
2026-01-13 20:52:00 +00:00
3 changed files with 34 additions and 6 deletions

View File

@@ -67,6 +67,7 @@ export function JobsDocumentsLocalGallery({
src: val.thumbnail, src: val.thumbnail,
height: val.thumbnailHeight, height: val.thumbnailHeight,
width: val.thumbnailWidth, width: val.thumbnailWidth,
tags: [{ value: val.filename, title: val.filename }],
...(val.optimized && { src: val.optimized, fullsize: val.src }) ...(val.optimized && { src: val.optimized, fullsize: val.src })
}); });
if (val.optimized) optimized = true; if (val.optimized) optimized = true;

View File

@@ -1,4 +1,5 @@
import { Checkbox } from "antd"; import { Checkbox } from "antd";
import { Tag } from "antd";
import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { useCallback, useEffect, useMemo, useRef, useState } from "react";
/** /**
@@ -187,6 +188,30 @@ export function LocalMediaGrid({
transition: "opacity .25s ease" transition: "opacity .25s ease"
}} }}
/> />
{img.tags && img.tags.length > 0 && (
<div
style={{
position: "absolute",
bottom: 0,
left: 0,
right: 0,
padding: "2px 6px",
borderRadius: "0 0 4px 4px",
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
display: "flex",
flexWrap: "wrap",
gap: "4px"
}}
>
{img.tags.map((tag, tagIdx) => (
<Tag key={tagIdx} variant="outlined" color="gold" style={{ opacity: 0.8 }}>
{tag.value || tag.title}
</Tag>
))}
</div>
)}
</> </>
); );
})()} })()}

View File

@@ -45,7 +45,7 @@ exports.default = async (req, res) => {
exports.refresh = async (oauthClient, req) => { exports.refresh = async (oauthClient, req) => {
try { try {
// logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null); logger.log("qbo-token-refresh", "DEBUG", req.user.email, null, null);
const authResponse = await oauthClient.refresh(); const authResponse = await oauthClient.refresh();
await client.request(queries.SET_QBO_AUTH, { await client.request(queries.SET_QBO_AUTH, {
email: req.user.email, email: req.user.email,
@@ -59,10 +59,12 @@ exports.refresh = async (oauthClient, req) => {
}; };
exports.setNewRefreshToken = async (email, apiResponse) => { exports.setNewRefreshToken = async (email, apiResponse) => {
//logger.log("qbo-token-updated", "DEBUG", email, null, null); // Deprecated - tokens are now auto-updated in the oauthClient and the token isn't pushed back from QBO API calls anymore
await client.request(queries.SET_QBO_AUTH, { // logger.log("qbo-token-updated", "DEBUG", email, null, {apiResponse: apiResponse});
email,
qbo_auth: { ...apiResponse.token, createdAt: Date.now() } // await client.request(queries.SET_QBO_AUTH, {
}); // email,
// qbo_auth: { ...apiResponse.token, createdAt: Date.now() }
// });
}; };