fix: address command menu review
This commit is contained in:
1 parent
769204ca3b
commit
91b916f015
5 files changed
+13
-7
No files matched your search
@@ -429,7 +429,9 @@ const createSearchEnginesSearchGroup = ({ minimumLength, showEmptyHint, source }
|
|||||||
);
|
);
|
||||||
|
|
||||||
const isLoading = enginesQuery.isLoading || ddgQuery.isLoading;
|
const isLoading = enginesQuery.isLoading || ddgQuery.isLoading;
|
||||||
const isError = enginesQuery.isError || ddgQuery.isError;
|
const isError =
|
||||||
|
(enginesQuery.isError && remoteQuery.enabled) ||
|
||||||
|
(ddgQuery.isError && remoteQuery.enabled && ddgBangs && remoteQuery.query.length >= 1);
|
||||||
|
|
||||||
const engineOptions = (enginesQuery.data ?? []).map(
|
const engineOptions = (enginesQuery.data ?? []).map(
|
||||||
(engine): ExternalOption => ({
|
(engine): ExternalOption => ({
|
||||||
@@ -454,9 +456,10 @@ const createSearchEnginesSearchGroup = ({ minimumLength, showEmptyHint, source }
|
|||||||
const matchedEngine = (enginesQuery.data ?? []).find((engine) => engine.short === bangToken);
|
const matchedEngine = (enginesQuery.data ?? []).find((engine) => engine.short === bangToken);
|
||||||
const matchedDdg = (ddgQuery.data ?? []).find((bang) => bang.t === bangToken);
|
const matchedDdg = (ddgQuery.data ?? []).find((bang) => bang.t === bangToken);
|
||||||
|
|
||||||
const label = matchedEngine?.name ?? matchedDdg?.s;
|
const genericEngine = matchedEngine?.type === "generic" ? matchedEngine : undefined;
|
||||||
const iconUrl = matchedEngine?.iconUrl;
|
const label = genericEngine?.name ?? matchedDdg?.s;
|
||||||
const urlTemplate = matchedEngine?.type === "generic" ? matchedEngine.urlTemplate : matchedDdg?.u;
|
const iconUrl = genericEngine?.iconUrl;
|
||||||
|
const urlTemplate = genericEngine?.urlTemplate ?? matchedDdg?.u;
|
||||||
|
|
||||||
if (label && urlTemplate) {
|
if (label && urlTemplate) {
|
||||||
if (searchText.trim().length > 0) {
|
if (searchText.trim().length > 0) {
|
||||||
|
|||||||
@@ -82,7 +82,9 @@ export const homeSearchEngineGroup = createGroup<GroupItem>({
|
|||||||
return {
|
return {
|
||||||
isLoading:
|
isLoading:
|
||||||
defaultSearchEngineQuery.isLoading || (resultQuery.isLoading && fromIntegrationEnabled) || status === "loading",
|
defaultSearchEngineQuery.isLoading || (resultQuery.isLoading && fromIntegrationEnabled) || status === "loading",
|
||||||
isError: defaultSearchEngineQuery.isError || (resultQuery.isError && fromIntegrationEnabled),
|
isError:
|
||||||
|
(defaultSearchEngineQuery.isError && status !== "loading" && remoteQuery.enabled) ||
|
||||||
|
(resultQuery.isError && fromIntegrationEnabled),
|
||||||
data: remoteQuery.enabled ? createDefaultSearchEntries(defaultSearchEngine, results, session, query, t) : [],
|
data: remoteQuery.enabled ? createDefaultSearchEntries(defaultSearchEngine, results, session, query, t) : [],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export const mediaFallbackGroup = createGroup<MediaFallbackOption>({
|
|||||||
{
|
{
|
||||||
key: "media-fallback",
|
key: "media-fallback",
|
||||||
label: t("search.modePicker.media.fallback", { query: remoteQuery.query }),
|
label: t("search.modePicker.media.fallback", { query: remoteQuery.query }),
|
||||||
description: t("search.mode.media.action.search.disabled.noIntegration"),
|
description: t("search.mode.media.action.search.disabled.signInRequired"),
|
||||||
query: remoteQuery.query,
|
query: remoteQuery.query,
|
||||||
unavailable: true,
|
unavailable: true,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -142,7 +142,7 @@ export const mediaRequestSearchGroup = createGroup<MediaRequestSearchOption>({
|
|||||||
key: "disabled",
|
key: "disabled",
|
||||||
kind: "disabled",
|
kind: "disabled",
|
||||||
label: tMedia("action.search.label"),
|
label: tMedia("action.search.label"),
|
||||||
description: tMedia("action.search.disabled.noIntegration"),
|
description: tMedia("action.search.disabled.signInRequired"),
|
||||||
unavailable: true,
|
unavailable: true,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -7048,6 +7048,7 @@
|
|||||||
"description": "Start typing to search your media request integrations",
|
"description": "Start typing to search your media request integrations",
|
||||||
"disabled": {
|
"disabled": {
|
||||||
"noIntegration": "Add an Overseerr, Jellyseerr, or Seerr integration to enable media search.",
|
"noIntegration": "Add an Overseerr, Jellyseerr, or Seerr integration to enable media search.",
|
||||||
|
"signInRequired": "Sign in to search media request integrations.",
|
||||||
"scoped": "This widget does not have an accessible media request integration."
|
"scoped": "This widget does not have an accessible media request integration."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user