mirror of
https://github.com/fosrl/pangolin.git
synced 2026-08-19 02:32:56 +02:00
add refresh button
This commit is contained in:
@@ -3551,6 +3551,7 @@
|
|||||||
"resourceLauncherDefaultView": "Default",
|
"resourceLauncherDefaultView": "Default",
|
||||||
"resourceLauncherSaveView": "Save View",
|
"resourceLauncherSaveView": "Save View",
|
||||||
"resourceLauncherSaveToCurrentView": "Save to Current View",
|
"resourceLauncherSaveToCurrentView": "Save to Current View",
|
||||||
|
"resourceLauncherResetView": "Reset View",
|
||||||
"resourceLauncherSaveAsNewView": "Save as New View",
|
"resourceLauncherSaveAsNewView": "Save as New View",
|
||||||
"resourceLauncherSaveAsNewViewDescription": "Give this view a name to save your current filters and layout.",
|
"resourceLauncherSaveAsNewViewDescription": "Give this view a name to save your current filters and layout.",
|
||||||
"resourceLauncherSaveForEveryone": "Save for Everyone",
|
"resourceLauncherSaveForEveryone": "Save for Everyone",
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Button } from "@app/components/ui/button";
|
||||||
|
import { useTranslations } from "next-intl";
|
||||||
|
import { RefreshCw } from "lucide-react";
|
||||||
|
|
||||||
|
type LauncherRefreshButtonProps = {
|
||||||
|
onRefresh: () => void;
|
||||||
|
isRefreshing: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function LauncherRefreshButton({
|
||||||
|
onRefresh,
|
||||||
|
isRefreshing
|
||||||
|
}: LauncherRefreshButtonProps) {
|
||||||
|
const t = useTranslations();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
onClick={onRefresh}
|
||||||
|
disabled={isRefreshing}
|
||||||
|
className="shrink-0"
|
||||||
|
>
|
||||||
|
<RefreshCw
|
||||||
|
className={`mr-0 sm:mr-2 h-4 w-4 ${isRefreshing ? "animate-spin" : ""}`}
|
||||||
|
/>
|
||||||
|
<span className="hidden sm:inline">{t("refresh")}</span>
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
DropdownMenuContent,
|
DropdownMenuContent,
|
||||||
DropdownMenuItem,
|
DropdownMenuItem,
|
||||||
|
DropdownMenuSeparator,
|
||||||
DropdownMenuTrigger
|
DropdownMenuTrigger
|
||||||
} from "@app/components/ui/dropdown-menu";
|
} from "@app/components/ui/dropdown-menu";
|
||||||
import { useTranslations } from "next-intl";
|
import { useTranslations } from "next-intl";
|
||||||
@@ -71,6 +72,7 @@ type LauncherSaveViewMenuProps = {
|
|||||||
onSaveAsNew: () => void;
|
onSaveAsNew: () => void;
|
||||||
onSaveForEveryone: () => void;
|
onSaveForEveryone: () => void;
|
||||||
onMakePersonal: () => void;
|
onMakePersonal: () => void;
|
||||||
|
onResetView: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function LauncherSaveViewMenu({
|
export function LauncherSaveViewMenu({
|
||||||
@@ -81,7 +83,8 @@ export function LauncherSaveViewMenu({
|
|||||||
onSaveToCurrent,
|
onSaveToCurrent,
|
||||||
onSaveAsNew,
|
onSaveAsNew,
|
||||||
onSaveForEveryone,
|
onSaveForEveryone,
|
||||||
onMakePersonal
|
onMakePersonal,
|
||||||
|
onResetView
|
||||||
}: LauncherSaveViewMenuProps) {
|
}: LauncherSaveViewMenuProps) {
|
||||||
const t = useTranslations();
|
const t = useTranslations();
|
||||||
|
|
||||||
@@ -97,7 +100,15 @@ export function LauncherSaveViewMenu({
|
|||||||
</Button>
|
</Button>
|
||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent align="end">
|
<DropdownMenuContent align="end">
|
||||||
{!isDefaultView ? (
|
{hasUnsavedChanges ? (
|
||||||
|
<>
|
||||||
|
<DropdownMenuItem onSelect={onResetView}>
|
||||||
|
{t("resourceLauncherResetView")}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
<DropdownMenuSeparator />
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
{!isDefaultView && (isAdmin || !isOrgWideView) ? (
|
||||||
<DropdownMenuItem onSelect={onSaveToCurrent}>
|
<DropdownMenuItem onSelect={onSaveToCurrent}>
|
||||||
{t("resourceLauncherSaveToCurrentView")}
|
{t("resourceLauncherSaveToCurrentView")}
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
|
|||||||
@@ -39,12 +39,20 @@ import { useMutation } from "@tanstack/react-query";
|
|||||||
import { Search } from "lucide-react";
|
import { Search } from "lucide-react";
|
||||||
import { useTranslations } from "next-intl";
|
import { useTranslations } from "next-intl";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
import {
|
||||||
|
useCallback,
|
||||||
|
useEffect,
|
||||||
|
useMemo,
|
||||||
|
useRef,
|
||||||
|
useState,
|
||||||
|
useTransition
|
||||||
|
} from "react";
|
||||||
import { useDebouncedCallback } from "use-debounce";
|
import { useDebouncedCallback } from "use-debounce";
|
||||||
import type { Selectedsite } from "@app/components/site-selector";
|
import type { Selectedsite } from "@app/components/site-selector";
|
||||||
import type { SelectedLabel } from "@app/components/labels-selector";
|
import type { SelectedLabel } from "@app/components/labels-selector";
|
||||||
import { LauncherFilterPopover } from "./LauncherFilterPopover";
|
import { LauncherFilterPopover } from "./LauncherFilterPopover";
|
||||||
import { LauncherGroupList } from "./LauncherGroupList";
|
import { LauncherGroupList } from "./LauncherGroupList";
|
||||||
|
import { LauncherRefreshButton } from "./LauncherRefreshButton";
|
||||||
import { LauncherSettingsMenu } from "./LauncherSettingsMenu";
|
import { LauncherSettingsMenu } from "./LauncherSettingsMenu";
|
||||||
import { LauncherSortButton } from "./LauncherSortButton";
|
import { LauncherSortButton } from "./LauncherSortButton";
|
||||||
import { LauncherSaveViewMenu, LauncherViewTabs } from "./LauncherViewTabs";
|
import { LauncherSaveViewMenu, LauncherViewTabs } from "./LauncherViewTabs";
|
||||||
@@ -83,6 +91,7 @@ export default function ResourceLauncher({
|
|||||||
const api = createApiClient({ env });
|
const api = createApiClient({ env });
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { navigate, isNavigating, searchParams } = useNavigationContext();
|
const { navigate, isNavigating, searchParams } = useNavigationContext();
|
||||||
|
const [isRefreshing, startRefreshTransition] = useTransition();
|
||||||
const hasRestoredLastView = useRef(false);
|
const hasRestoredLastView = useRef(false);
|
||||||
|
|
||||||
const [searchInputResetKey, setSearchInputResetKey] = useState(0);
|
const [searchInputResetKey, setSearchInputResetKey] = useState(0);
|
||||||
@@ -312,8 +321,28 @@ export default function ResourceLauncher({
|
|||||||
});
|
});
|
||||||
}, [navigateToConfig]);
|
}, [navigateToConfig]);
|
||||||
|
|
||||||
|
const handleResetView = useCallback(() => {
|
||||||
|
searchInputRef.current = savedConfig.query;
|
||||||
|
setSearchInputResetKey((key) => key + 1);
|
||||||
|
navigateToConfig(activeViewIdRef.current, savedConfig);
|
||||||
|
}, [navigateToConfig, savedConfig]);
|
||||||
|
|
||||||
|
const refreshData = () => {
|
||||||
|
startRefreshTransition(async () => {
|
||||||
|
try {
|
||||||
|
router.refresh();
|
||||||
|
} catch {
|
||||||
|
toast({
|
||||||
|
title: t("error"),
|
||||||
|
description: t("refreshError"),
|
||||||
|
variant: "destructive"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const handleSaveToCurrent = () => {
|
const handleSaveToCurrent = () => {
|
||||||
if (isDefaultView) {
|
if (isDefaultView || (isOrgWideView && !isAdmin)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
updateViewMutation.mutate({
|
updateViewMutation.mutate({
|
||||||
@@ -408,6 +437,7 @@ export default function ResourceLauncher({
|
|||||||
onSaveAsNew={handleSaveAsNew}
|
onSaveAsNew={handleSaveAsNew}
|
||||||
onSaveForEveryone={handleSaveForEveryone}
|
onSaveForEveryone={handleSaveForEveryone}
|
||||||
onMakePersonal={handleMakePersonal}
|
onMakePersonal={handleMakePersonal}
|
||||||
|
onResetView={handleResetView}
|
||||||
/>
|
/>
|
||||||
<LauncherFilterPopover
|
<LauncherFilterPopover
|
||||||
orgId={orgId}
|
orgId={orgId}
|
||||||
@@ -445,6 +475,10 @@ export default function ResourceLauncher({
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
<LauncherRefreshButton
|
||||||
|
onRefresh={refreshData}
|
||||||
|
isRefreshing={isRefreshing || isNavigating}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user