gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-23 11:45:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5532 from gitbutlerapp/fix-checks-poll

Browse Source 
Fix stale checks results
This commit is contained in:
Kiril Videlov 2024-11-13 10:23:15 +01:00 committed by GitHub
commit cdce2fdaf2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/desktop/src/lib/branch/SeriesHeader.svelte
View File

@ -31,13 +31,15 @@
import PopoverActionsContainer from '@gitbutler/ui/popoverActions/PopoverActionsContainer.svelte';
import PopoverActionsItem from '@gitbutler/ui/popoverActions/PopoverActionsItem.svelte';
import { tick } from 'svelte';
import type { Writable } from 'svelte/store';
interface Props {
currentSeries: PatchSeries;
isTopSeries: boolean;
lastPush: Writable<Date | undefined>;
}
const { currentSeries, isTopSeries }: Props = $props();
const { currentSeries, isTopSeries, lastPush }: Props = $props();
let descriptionVisible = $state(!!currentSeries.description);
@ -84,9 +86,20 @@
const prMonitor = $derived(prNumber ? $prService?.prMonitor(prNumber) : undefined);
const pr = $derived(prMonitor?.pr);
const checksMonitor = $derived(
$pr?.sourceBranch ? $forge?.checksMonitor($pr.sourceBranch) : undefined
);
const sourceBranch = $derived($pr?.sourceBranch); // Deduplication.
const checksMonitor = $derived(sourceBranch ? $forge?.checksMonitor(sourceBranch) : undefined);
// Trigger refresh of pull request status and checks when branch(es) are pushed.
$effect(() => {
if ($lastPush) {
updateStatusAndChecks();
}
});
function updateStatusAndChecks() {
prMonitor?.refresh();
checksMonitor?.update();
}
const projectService = getContext(ProjectService);
const cloudEnabled = projectService.cloudEnabled;

30
apps/desktop/src/lib/stack/CurrentSeries.svelte
View File

@ -1,10 +1,5 @@
<script lang="ts">
import { getColorFromBranchType } from '$lib/branch/stackingUtils';
import { getForge } from '$lib/forge/interface/forge';
import { createForgeChecksMonitorStore } from '$lib/forge/interface/forgeChecksMonitor';
import { getForgeListingService } from '$lib/forge/interface/forgeListingService';
import { createForgePrMonitorStore } from '$lib/forge/interface/forgePrMonitor';
import { getForgePrService } from '$lib/forge/interface/forgePrService';
import type { PatchSeries } from '$lib/vbranches/types';
import type { Snippet } from 'svelte';
@ -15,31 +10,6 @@
const { currentSeries, children }: Props = $props();
// Setup PR Store and Monitor on a per-series basis
const forge = getForge();
const prService = getForgePrService();
// Pretty cumbersome way of getting the PR number, would be great if we can
// make it more concise somehow.
const hostedListingServiceStore = getForgeListingService();
const prStore = $derived($hostedListingServiceStore?.prs);
const prs = $derived(prStore ? $prStore : undefined);
const listedPr = $derived(prs?.find((pr) => pr.sourceBranch === currentSeries.name));
const prNumber = $derived(listedPr?.number);
const prMonitor = $derived(prNumber ? $prService?.prMonitor(prNumber) : undefined);
const pr = $derived(prMonitor?.pr);
const forgePrMonitorStore = createForgePrMonitorStore(undefined);
$effect(() => forgePrMonitorStore.set(prMonitor));
const checksMonitor = $derived(
$pr?.sourceBranch ? $forge?.checksMonitor($pr.sourceBranch) : undefined
);
const forgeChecksMonitorStore = createForgeChecksMonitorStore(undefined);
$effect(() => forgeChecksMonitorStore.set(checksMonitor));
const seriesType = currentSeries.patches[0] ? currentSeries.patches[0].status : 'local';
</script>

6
apps/desktop/src/lib/stack/SeriesList.svelte
View File

@ -14,12 +14,14 @@
import { PatchSeries, type VirtualBranch } from '$lib/vbranches/types';
import { getContext } from '@gitbutler/shared/context';
import EmptyStatePlaceholder from '@gitbutler/ui/EmptyStatePlaceholder.svelte';
import type { Writable } from 'svelte/store';
interface Props {
branch: VirtualBranch;
lastPush: Writable<Date | undefined>;
}
const { branch }: Props = $props();
const { branch, lastPush }: Props = $props();
const branchController = getContext(BranchController);
const hasConflicts = $derived(
@ -57,7 +59,7 @@
<SeriesDividerLine {currentSeries} />
{/if}
<CurrentSeries {currentSeries}>
<SeriesHeader {currentSeries} {isTopSeries} />
<SeriesHeader {currentSeries} {isTopSeries} {lastPush} />
{#if currentSeries.upstreamPatches.length === 0 && currentSeries.patches.length === 0}
<div class="branch-emptystate">

7
apps/desktop/src/lib/stack/Stack.svelte
View File

@ -24,7 +24,7 @@
import Spacer from '@gitbutler/ui/Spacer.svelte';
import lscache from 'lscache';
import { onMount } from 'svelte';
import type { Writable } from 'svelte/store';
import { writable, type Writable } from 'svelte/store';
const {
isLaneCollapsed,
@ -40,6 +40,7 @@
const userSettings = getContextStoreBySymbol<Settings>(SETTINGS);
const defaultBranchWidthRem = persisted<number>(24, 'defaulBranchWidth' + project.id);
const laneWidthKey = 'laneWidth_';
const lastPush = writable<Date | undefined>();
let laneWidth: number | undefined = $state();
@ -94,7 +95,7 @@
try {
await branchController.pushBranch(branch.id, branch.requiresForce);
$listingService?.refresh();
// TODO: Refresh prMonitor and checksMonitor upon push
lastPush.set(new Date());
} finally {
isPushingCommits = false;
}
@ -189,7 +190,7 @@
{/if}
<Spacer dotted />
<div class="lane-branches">
<SeriesList {branch} />
<SeriesList {branch} {lastPush} />
</div>
</div>
</div>