From f6cb0d7310e55d76a43c38acf40827615ee117d6 Mon Sep 17 00:00:00 2001
From: Luca Restagno <59067245+lucarestagno@users.noreply.github.com>
Date: Fri, 2 Jun 2023 10:58:30 +0200
Subject: [PATCH] Fix update_by_pk and delete_by_pk placeholders

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/9375
GitOrigin-RevId: d73bc541f160e6f6f32dfa0f6b19cff730e73099
---
 .../Services/Data/Common/Components/RootFieldEditor.tsx     | 6 +++++-
 .../components/Services/Data/TableModify/ModifyTable.tsx    | 2 +-
 .../src/lib/features/Data/CustomFieldNames/utils.spec.ts    | 4 ++--
 .../src/lib/features/Data/CustomFieldNames/utils.ts         | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/Common/Components/RootFieldEditor.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/Common/Components/RootFieldEditor.tsx
index 5771c6fd543..2289ca7c332 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/Common/Components/RootFieldEditor.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/Common/Components/RootFieldEditor.tsx
@@ -104,6 +104,10 @@ const RootFieldEditor: React.FC<RootFieldEditorProps> = ({
     if (rfType.includes('one')) {
       return `${rfType.replace('one', rootField)}_one`;
     }
+    if (rfType.includes('_by_pk')) {
+      const [type] = rfType.split('_by_pk');
+      return `${type}_${rootField}_by_pk`;
+    }
     if (rfType === 'custom_name') {
       return rootField;
     }
@@ -183,9 +187,9 @@ const RootFieldEditor: React.FC<RootFieldEditorProps> = ({
               {getRootFieldRow('insert_one', insertOneOnChange)}
               {getRootFieldRow('update', updateOnChange)}
               {getRootFieldRow('update_by_pk', updateByPkOnChange)}
+              {getRootFieldRow('update_many', updateManyOnChange)}
               {getRootFieldRow('delete', deleteOnChange)}
               {getRootFieldRow('delete_by_pk', deleteByPkOnChange)}
-              {getRootFieldRow('update_many', updateManyOnChange)}
             </div>
           )}
         </CollapsibleToggle>
diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/TableModify/ModifyTable.tsx b/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/TableModify/ModifyTable.tsx
index 6f6ac1944e3..11395ab4af0 100644
--- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/TableModify/ModifyTable.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/TableModify/ModifyTable.tsx
@@ -320,7 +320,7 @@ export const ModifyTable: React.VFC<ModifyTableProps> = ({
               </div>
             )}
             {isCustomGqlRootSupported && (
-              <div className="w-full sm:w-6/12 mb-md">
+              <div className="w-full sm:w-8/12 mb-md">
                 <RootFields tableSchema={table} />
               </div>
             )}
diff --git a/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.spec.ts b/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.spec.ts
index 6012a479a5b..7739ec6d464 100644
--- a/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.spec.ts
+++ b/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.spec.ts
@@ -58,10 +58,10 @@ describe('getTrackingTableFormPlaceholders', () => {
       insert_one: 'insert_customizeTableName_one (default)',
 
       update: 'update_customizeTableName (default)',
-      update_by_pk: 'update_by_pk_customizeTableName (default)',
+      update_by_pk: 'update_customizeTableName_by_pk (default)',
 
       delete: 'delete_customizeTableName (default)',
-      delete_by_pk: 'delete_by_pk_customizeTableName (default)',
+      delete_by_pk: 'delete_customizeTableName_by_pk (default)',
 
       update_many: 'update_many_customizeTableName (default)',
     };
diff --git a/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.ts b/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.ts
index 978603a1978..5a1b43a2532 100644
--- a/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.ts
+++ b/frontend/libs/console/legacy-ce/src/lib/features/Data/CustomFieldNames/utils.ts
@@ -19,9 +19,9 @@ export const customFieldNamesPlaceholders = (
   insert: `insert_${tableName} (default)`,
   insert_one: `insert_${tableName}_one (default)`,
   update: `update_${tableName} (default)`,
-  update_by_pk: `update_by_pk_${tableName} (default)`,
+  update_by_pk: `update_${tableName}_by_pk (default)`,
   delete: `delete_${tableName} (default)`,
-  delete_by_pk: `delete_by_pk_${tableName} (default)`,
+  delete_by_pk: `delete_${tableName}_by_pk (default)`,
   update_many: `update_many_${tableName} (default)`,
 });