Skip to content

Fix push conflict behavior #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eweren merged 2 commits into from
Apr 21, 2026
Merged

Fix push conflict behavior #97

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e45b88
feat: add error handling for unresolved conflicts in Push component
eweren Apr 21, 2026
8fb79f9
feat: implement handling for unresolved conflicts in Push component
eweren Apr 21, 2026
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
35 changes: 33 additions & 2 deletions src/ui/views/Push/Push.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import { useHasNamespacesEnabled } from "../../hooks/useHasNamespacesEnabled";
type SingleStepImportResolvableItemRequest =
components["schemas"]["SingleStepImportResolvableItemRequest"];
type KeyScreenshotDto = components["schemas"]["KeyScreenshotDto"];
type SimpleImportConflictResult =
components["schemas"]["SimpleImportConflictResult"];

export const Push: FunctionalComponent = () => {
const language = useGlobalState((c) => c.config!.language!);
Expand All @@ -46,6 +48,9 @@ export const Push: FunctionalComponent = () => {
const [_loadingStatus, setLoadingStatus] = useState<string | undefined>();
const [changes, setChanges] = useState<KeyChanges>();
const [pushedKeysCount, setPushedKeysCount] = useState<number>(0);
const [unresolvedConflicts, setUnresolvedConflicts] = useState<
SimpleImportConflictResult[]
>([]);
const selectedNodes = useConnectedNodes({ ignoreSelection: false });
const tolgeeConfig = useGlobalState((c) => c.config);
const [uploadedScreenshotCount, setUploadedScreenshotCount] = useState(0);
Expand Down Expand Up @@ -346,16 +351,20 @@ export const Push: FunctionalComponent = () => {
});
});

await updateTranslations.mutateAsync({
const updateResult = await updateTranslations.mutateAsync({
content: {
"application/json": {
keys,
errorOnUnresolvedConflict: false,
overrideMode: "RECOMMENDED",
branch: branch || undefined,
},
},
});

const conflicts = updateResult?.unresolvedConflicts ?? [];
setUnresolvedConflicts(conflicts);

try {
// Add tags to keys
if (
Expand Down Expand Up @@ -454,6 +463,7 @@ export const Push: FunctionalComponent = () => {
setPushedKeysCount(0);
setUploadedScreenshotCount(0);
setErrorMessage(undefined);
setUnresolvedConflicts([]);
};

const isLoading =
Expand Down Expand Up @@ -485,11 +495,32 @@ export const Push: FunctionalComponent = () => {
// Show success screen immediately, don't wait for recompute
<Fragment>
<div>
Successfully updated {pushedKeysCount} key(s)
Successfully updated{" "}
{Math.max(pushedKeysCount - unresolvedConflicts.length, 0)} key(s)
{uploadScreenshots
? ` and uploaded ${uploadedScreenshotCount} screenshot(s).`
: "."}
</div>
{unresolvedConflicts.length > 0 && (
<Fragment>
<VerticalSpace space="medium" />
<Banner icon={<IconWarning32 />}>
<div>
These translations could not be updated because they are
either disabled or already reviewed:
</div>
<VerticalSpace space="small" />
<ul style={{ margin: 0, paddingLeft: 16 }}>
{unresolvedConflicts.map((c, i) => (
<li key={i}>
{c.keyNamespace ? `${c.keyNamespace}:` : ""}
{c.keyName} ({c.language})
</li>
))}
</ul>
</Banner>
</Fragment>
)}
<ActionsBottom>
<Button data-cy="push_ok_button" onClick={handleGoBack}>
OK
Expand Down
Loading