Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public async Task<SyncJobResult> TriggerFwHeadlessSync()
}

[JSInvokable]
public Task<DateTimeOffset?> GetLatestCommitDate()
public Task<DateTimeOffset?> GetLatestSyncedCommitDate()
{
return syncRepository.GetLatestCommitDate();
return syncRepository.GetLatestSyncedCommitDate();
}

[JSInvokable]
Expand Down
4 changes: 2 additions & 2 deletions backend/FwLite/LcmCrdt.Tests/Data/SyncRepositoryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ public async Task DisposeAsync()
}

[Fact]
public async Task GetLatestCommitDate_WhenNoCommits_ReturnsNull()
public async Task GetLatestSyncedCommitDate_WhenNoCommits_ReturnsNull()
{
var latestCommitDate = await _syncRepository.GetLatestCommitDate();
var latestCommitDate = await _syncRepository.GetLatestSyncedCommitDate();
latestCommitDate.Should().BeNull();
}
}
2 changes: 1 addition & 1 deletion backend/FwLite/LcmCrdt/Data/SyncRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ WHERE json_extract(Metadata, '$.ExtraMetadata.SyncDate') IS NULL
}
}

public async Task<DateTimeOffset?> GetLatestCommitDate()
public async Task<DateTimeOffset?> GetLatestSyncedCommitDate()
{
try
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface ISyncServiceJsInvokable
getSyncStatus() : Promise<IProjectSyncStatus>;
triggerFwHeadlessSync() : Promise<ISyncJobResult>;
countPendingCrdtCommits() : Promise<IPendingCommits>;
getLatestCommitDate() : Promise<string>;
getLatestSyncedCommitDate() : Promise<string>;
executeSync(skipNotifications: boolean) : Promise<ISyncResults>;
getCurrentServer() : Promise<ILexboxServer>;
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/viewer/src/lib/services/sync-status-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ export class SyncStatusService {

}

getLatestCommitDate() {
return this.syncStatusApi.getLatestCommitDate();
getLatestSyncedCommitDate() {
return this.syncStatusApi.getLatestSyncedCommitDate();
}

getCurrentServer() {
Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -588,12 +588,15 @@ msgstr "in {0}"
msgid "Keep going"
msgstr "Keep going"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr "Last change: #"

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr "Last sync: #"

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr "Length:"
Expand Down Expand Up @@ -630,6 +633,7 @@ msgstr "Loading Dictionaries..."
msgid "loading..."
msgstr "loading..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "Local"
Expand All @@ -639,6 +643,7 @@ msgid "Local only"
msgstr "Local only"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr "Login"

Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,15 @@ msgstr ""
msgid "Keep going"
msgstr "Continuar"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr ""

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr "Longitud:"
Expand Down Expand Up @@ -635,6 +638,7 @@ msgstr "Cargando diccionarios..."
msgid "loading..."
msgstr "cargando..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "Local"
Expand All @@ -644,6 +648,7 @@ msgid "Local only"
msgstr "Sólo local"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr "Inicio de sesión"

Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,15 @@ msgstr ""
msgid "Keep going"
msgstr "Continuez"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr ""

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr "Longueur :"
Expand Down Expand Up @@ -635,6 +638,7 @@ msgstr "Chargement des dictionnaires..."
msgid "loading..."
msgstr "chargement..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "Locale"
Expand All @@ -644,6 +648,7 @@ msgid "Local only"
msgstr "Uniquement au niveau local"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr "Connexion"

Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/id.po
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,15 @@ msgstr ""
msgid "Keep going"
msgstr "Teruskan."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr ""

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr "Panjang:"
Expand Down Expand Up @@ -635,6 +638,7 @@ msgstr "Memuat Kamus..."
msgid "loading..."
msgstr "Loading..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "Lokal"
Expand All @@ -644,6 +648,7 @@ msgid "Local only"
msgstr "Hanya lokal"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr "Masuk"

Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/ko.po
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,15 @@ msgstr ""
msgid "Keep going"
msgstr "계속 진행"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr ""

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr "길이:"
Expand Down Expand Up @@ -635,6 +638,7 @@ msgstr "사전 로드 중..."
msgid "loading..."
msgstr "로딩 중..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "로컬"
Expand All @@ -644,6 +648,7 @@ msgid "Local only"
msgstr "로컬 전용"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr "로그인"

Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/ms.po
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,15 @@ msgstr ""
msgid "Keep going"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr ""

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr "Panjang:"
Expand Down Expand Up @@ -635,6 +638,7 @@ msgstr "Memuatkan Kamus..."
msgid "loading..."
msgstr "memuat..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "Tempatan"
Expand All @@ -644,6 +648,7 @@ msgid "Local only"
msgstr "Tempatan sahaja"

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr "Log masuk"

Expand Down
7 changes: 6 additions & 1 deletion frontend/viewer/src/locales/sw.po
Original file line number Diff line number Diff line change
Expand Up @@ -593,12 +593,15 @@ msgstr ""
msgid "Keep going"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Last change: #"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
msgid "Last sync: #"
msgstr ""

#: src/lib/components/audio/audio-editor.svelte
msgid "Length:"
msgstr ""
Expand Down Expand Up @@ -635,6 +638,7 @@ msgstr ""
msgid "loading..."
msgstr "inashughulikia..."

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/home/HomeView.svelte
msgid "Local"
msgstr "Mitaa"
Expand All @@ -644,6 +648,7 @@ msgid "Local only"
msgstr ""

#: src/project/sync/SyncStatusPrimitive.svelte
#: src/project/sync/FwLiteToFwMergeDetails.svelte
msgid "Login"
msgstr ""

Expand Down
10 changes: 5 additions & 5 deletions frontend/viewer/src/project/SyncDialog.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{ key: SYNC_DIALOG_QUERY_PARAM, replaceOnDefaultValue: true, allowBack: true },
false,
);
let latestCommitDate = $state<string>();
let latestSyncedCommitDate = $state<string>();

watch(() => openQueryParam.current, (newValue) => {
if (newValue) void onOpen();
Expand All @@ -46,15 +46,15 @@
await Promise.all([
service.getLocalStatus().then(s => localStatus = s),
service.getStatus().then(s => remoteStatus = s),
service.getLatestCommitDate().then(s => latestCommitDate = s),
service.getLatestSyncedCommitDate().then(s => latestSyncedCommitDate = s),
service.getCurrentServer().then(s => server = s),
]);
}

function onClose(): void {
localStatus = undefined;
remoteStatus = undefined;
latestCommitDate = undefined;
latestSyncedCommitDate = undefined;
}

async function syncLexboxToFlex() {
Expand Down Expand Up @@ -104,7 +104,7 @@
await Promise.all([
service.getLocalStatus().then(s => localStatus = s),
service.getStatus().then(s => remoteStatus = s),
service.getLatestCommitDate().then(s => latestCommitDate = s),
service.getLatestSyncedCommitDate().then(s => latestSyncedCommitDate = s),
]);
}

Expand All @@ -127,7 +127,7 @@
{server}
projectCode={projectContext.projectData?.code}
serverId={projectContext.projectData?.serverId}
{latestCommitDate}
latestSyncedCommitDate={latestSyncedCommitDate}
canSyncLexboxToFlex={features?.write}
{syncLexboxToFlex}
{syncLexboxToLocal}
Expand Down
Loading
Loading