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

updatedTimestampMs => updatedAt

Browse Source
This commit is contained in:
Nikita Galaiko 2023-12-14 09:38:53 +01:00 committed by GitButler
parent 69e15844d9
commit 3b86f4cf05
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/tauri/src/virtual_branches/virtual.rs
View File

@ -49,7 +49,7 @@ pub struct VirtualBranch {
pub upstream: Option<RemoteBranch>, // the upstream branch where this branch pushes to, if any
pub base_current: bool, // is this vbranch based on the current base branch? if false, this needs to be manually merged with conflicts
pub ownership: Ownership,
pub updated_timestamp_ms: u128,
pub updated_at: u128,
}
// this is the struct that maps to the view `Commit` type in Typescript
@ -830,7 +830,7 @@ pub fn list_virtual_branches(
conflicted: conflicts::is_resolving(project_repository),
base_current,
ownership: branch.ownership.clone(),
updated_timestamp_ms: branch.updated_timestamp_ms,
updated_at: branch.updated_timestamp_ms,
};
branches.push(branch);
}

2
packages/ui/src/lib/branches/types.ts
View File

@ -69,6 +69,6 @@ export class CombinedBranch {
get modifiedAt(): Date | undefined {
if (this.pr) return this.pr.modifiedAt || this.pr.createdAt;
if (this.remoteBranch) return this.remoteBranch.lastCommitTs;
return this.vbranch?.updatedTimestamp;
return this.vbranch?.updatedAt;
}
}

7
packages/ui/src/lib/vbranches/types.ts
View File

@ -61,11 +61,8 @@ export class Branch {
// If the branch has been already applied, then it was either performed cleanly or we generated conflict markers in the diffs.
// (therefore this field is applicable for stashed/unapplied or remote branches, i.e. active == false)
isMergeable!: Promise<boolean>;
updatedTimestampMs!: number;
get updatedTimestamp(): Date {
return new Date(this.updatedTimestampMs);
}
@Transform((obj) => new Date(obj.value))
updatedAt!: Date;
get upstreamName() {
return this.upstream?.name.split('/').slice(-1)[0];