i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-03 09:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(proxy-nodes): 统一缩进并移除未使用的 confirmWarning 引用

Browse Source
This commit is contained in:
fawney19
2026-04-19 13:46:21 +08:00
parent 7007d7a556
commit 97cd877ce5
3 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/aether-gateway/src/handlers/admin/system/proxy_nodes.rs
View File

@@ -1499,8 +1499,9 @@ async fn dispatch_proxy_node_upgrade_targets(
summary.eligible_total = summary.eligible_total.saturating_add(1); summary.eligible_total = summary.eligible_total.saturating_add(1);
let current_version = let current_version = aether_data::repository::proxy_nodes::proxy_reported_version(
aether_data::repository::proxy_nodes::proxy_reported_version(node.proxy_metadata.as_ref()); node.proxy_metadata.as_ref(),
);
let pending_target = aether_data::repository::proxy_nodes::remote_config_upgrade_target( let pending_target = aether_data::repository::proxy_nodes::remote_config_upgrade_target(
node.remote_config.as_ref(), node.remote_config.as_ref(),
); );

5
apps/aether-gateway/src/tests/control/admin/proxy_nodes.rs
View File

@@ -1516,7 +1516,10 @@ async fn gateway_still_dispatches_upgrade_targets_to_draining_proxy_nodes() {
.expect("json body should parse"); .expect("json body should parse");
assert_eq!(upgrade_payload["eligible_total"], 2); assert_eq!(upgrade_payload["eligible_total"], 2);
assert_eq!(upgrade_payload["updated"], 2); assert_eq!(upgrade_payload["updated"], 2);
assert_eq!(upgrade_payload["node_ids"], json!(["node-alpha", "node-zeta"])); assert_eq!(
upgrade_payload["node_ids"],
json!(["node-alpha", "node-zeta"])
);
let list_response_after_upgrade = client let list_response_after_upgrade = client
.get(format!( .get(format!(

102
frontend/src/views/admin/ProxyNodes.vue
View File

@@ -35,36 +35,36 @@
/> />
</div> </div>
</div> </div>
<div class="flex flex-wrap items-center gap-2"> <div class="flex flex-wrap items-center gap-2">
<div class="relative min-w-0 basis-full"> <div class="relative min-w-0 basis-full">
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground z-10 pointer-events-none" /> <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground z-10 pointer-events-none" />
<Input <Input
v-model="searchQuery" v-model="searchQuery"
type="text" type="text"
placeholder="搜索..." placeholder="搜索..."
class="w-full pl-8 pr-3 h-8 text-sm bg-background/50 border-border/60" class="w-full pl-8 pr-3 h-8 text-sm bg-background/50 border-border/60"
/> />
</div> </div>
<div class="min-w-0 flex-1"> <div class="min-w-0 flex-1">
<Select v-model="filterStatus"> <Select v-model="filterStatus">
<SelectTrigger class="w-full h-8 text-xs border-border/60"> <SelectTrigger class="w-full h-8 text-xs border-border/60">
<SelectValue placeholder="状态" /> <SelectValue placeholder="状态" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="all"> <SelectItem value="all">
全部 全部
</SelectItem> </SelectItem>
<SelectItem value="online"> <SelectItem value="online">
在线 在线
</SelectItem> </SelectItem>
<SelectItem value="offline"> <SelectItem value="offline">
离线 离线
</SelectItem> </SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>
</div> </div>
</div> </div>
<!-- 桌面端 --> <!-- 桌面端 -->
<div class="hidden sm:flex items-center justify-between gap-4"> <div class="hidden sm:flex items-center justify-between gap-4">
@@ -81,26 +81,26 @@
class="w-48 pl-8 pr-3 h-8 text-sm bg-background/50 border-border/60" class="w-48 pl-8 pr-3 h-8 text-sm bg-background/50 border-border/60"
/> />
</div> </div>
<div class="h-4 w-px bg-border" /> <div class="h-4 w-px bg-border" />
<Select v-model="filterStatus"> <Select v-model="filterStatus">
<SelectTrigger class="w-28 h-8 text-xs border-border/60"> <SelectTrigger class="w-28 h-8 text-xs border-border/60">
<SelectValue placeholder="全部状态" /> <SelectValue placeholder="全部状态" />
</SelectTrigger> </SelectTrigger>
<SelectContent> <SelectContent>
<SelectItem value="all"> <SelectItem value="all">
全部状态 全部状态
</SelectItem> </SelectItem>
<SelectItem value="online"> <SelectItem value="online">
在线 在线
</SelectItem> </SelectItem>
<SelectItem value="offline"> <SelectItem value="offline">
离线 离线
</SelectItem> </SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
<div class="h-4 w-px bg-border" /> <div class="h-4 w-px bg-border" />
<Button <Button
variant="outline" variant="outline"
size="sm" size="sm"
class="h-8 text-xs" class="h-8 text-xs"
@click="showBatchUpgradeDialog = true" @click="showBatchUpgradeDialog = true"
@@ -813,7 +813,7 @@ import { formatRegion } from '@/utils/region'
import HardwareTooltip from './components/HardwareTooltip.vue' import HardwareTooltip from './components/HardwareTooltip.vue'
const { success, error: toastError } = useToast() const { success, error: toastError } = useToast()
const { confirmDanger, confirmWarning } = useConfirm() const { confirmDanger } = useConfirm()
const store = useProxyNodesStore() const store = useProxyNodesStore()
const searchQuery = ref('') const searchQuery = ref('')