feat: improve push command (updates coming from suggestions) (#185)

Author: stepan662

schema.json

@@ -90,6 +90,12 @@
         "removeOtherKeys": {
           "description": "Remove keys which are not present in the import (within imported namespaces).",
           "type": "boolean"
+        },
+        "errorOnUnresolvedConflict": {
+          "$ref": "#/$defs/errorOnUnresolvedConflict"
+        },
+        "overrideMode": {
+          "$ref": "#/$defs/overrideMode"
         }
       }
     },
@@ -251,6 +257,16 @@
       "type": "string",
       "enum": ["OVERRIDE", "KEEP", "NO_FORCE"]
     },
+    "overrideMode": {
+      "description": "Specifies what is considered non-overridable translation: \n - RECOMMENDED - protected reviewed translations are considered as non-overridable\n - ALL - translations that user has permissions for",
+      "type": "string",
+      "enum": ["ALL", "RECOMMENDED"]
+    },
+    "errorOnUnresolvedConflict": {
+      "description": "Fail the whole import if there are unresolved conflicts in import: \n - yes - fail if any unresolved conflict is present\n no - don't fail and just print unresolved conflicts\n auto - fails when when forceMode=KEEP, otherwise doesn't fail",
+      "type": "string",
+      "enum": ["yes", "no", "auto"]
+    },
     "path": {
       "description": "File glob specifying which files to include.",
       "type": "string"

scripts/tolgee.env

@@ -3,7 +3,7 @@ tolgee.authentication.registrationsAllowed=false
 tolgee.authentication.initialUsername=admin
 tolgee.authentication.initialPassword=admin
 
-tolgee.rateLimits.enabled=false
+tolgee.rate-limits.enabled=false
 
 tolgee.internal.showVersion=true
 tolgee.internal.controllerEnabled=true

src/client/errorFromLoadable.ts

@@ -1,6 +1,8 @@
+import { getUnresolvedConflictsMessage } from '../utils/printFailedKeys.js';
 import { LoadableData } from './TolgeeClient.js';
 
 export const addErrorDetails = (loadable: LoadableData, showBeError = true) => {
+  let additionalInfo = '';
   const items: string[] = [];
   items.push(`status: ${loadable.response.status}`);
   if (showBeError && loadable.error?.code) {
@@ -9,7 +11,18 @@ export const addErrorDetails = (loadable: LoadableData, showBeError = true) => {
   if (loadable.response.status === 403 && loadable.error?.params?.[0]) {
     items.push(`missing scope: ${loadable.error.params[0]}`);
   }
-  return `[${items.join(', ')}]`;
+
+  if (
+    loadable.error?.code === 'conflict_is_not_resolved' &&
+    typeof loadable.error.params?.[0] === 'object'
+  ) {
+    additionalInfo += getUnresolvedConflictsMessage(
+      loadable.error.params as any,
+      true
+    );
+  }
+
+  return `[${items.join(', ')}]${additionalInfo ? '\n' + additionalInfo : ''}`;
 };
 
 export const errorFromLoadable = (loadable: LoadableData) => {