From 4299199947895e18333de539f74730dc90e9739b Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Thu, 6 Jul 2023 16:13:15 -0500
Subject: [PATCH] CTLE-507 Fix api field sorting (make sure they have a label
 too)

---
 .../com/kingsrook/qqq/api/actions/GetTableApiFieldsAction.java | 3 ++-
 .../qqq/api/model/metadata/tables/ApiTableMetaData.java        | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GetTableApiFieldsAction.java b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GetTableApiFieldsAction.java
index 806d8893..f4807b1e 100644
--- a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GetTableApiFieldsAction.java
+++ b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/actions/GetTableApiFieldsAction.java
@@ -73,6 +73,7 @@ public class GetTableApiFieldsAction extends AbstractQActionFunction<GetTableApi
       // get fields on the table which are in this version //
       ///////////////////////////////////////////////////////
       List<QFieldMetaData> fieldList = new ArrayList<>(table.getFields().values());
+      fieldList.sort(Comparator.comparing(QFieldMetaData::getLabel));
       for(QFieldMetaData field : fieldList)
       {
          if(!isExcluded(input.getApiName(), field) && getApiVersionRange(input.getApiName(), field).includes(version))
@@ -92,7 +93,7 @@ public class GetTableApiFieldsAction extends AbstractQActionFunction<GetTableApi
          }
       }
 
-      fieldList.sort(Comparator.comparing(QFieldMetaData::getLabel));
+      fields.sort(Comparator.comparing(QFieldMetaData::getLabel));
 
       return (new GetTableApiFieldsOutput().withFields(fields));
    }
diff --git a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/model/metadata/tables/ApiTableMetaData.java b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/model/metadata/tables/ApiTableMetaData.java
index 0abc4547..0a496b1e 100644
--- a/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/model/metadata/tables/ApiTableMetaData.java
+++ b/qqq-middleware-api/src/main/java/com/kingsrook/qqq/api/model/metadata/tables/ApiTableMetaData.java
@@ -34,6 +34,7 @@ import com.kingsrook.qqq.api.model.APIVersionRange;
 import com.kingsrook.qqq.api.model.metadata.ApiOperation;
 import com.kingsrook.qqq.api.model.metadata.fields.ApiFieldMetaData;
 import com.kingsrook.qqq.api.model.metadata.fields.ApiFieldMetaDataContainer;
+import com.kingsrook.qqq.backend.core.instances.QInstanceEnricher;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
@@ -94,6 +95,7 @@ public class ApiTableMetaData implements ApiOperation.EnabledOperationsProvider
 
          for(QFieldMetaData field : CollectionUtils.nonNullList(removedApiFields))
          {
+            new QInstanceEnricher(null).enrichField(field);
             ApiFieldMetaData apiFieldMetaData = ensureFieldHasApiSupplementalMetaData(apiName, field);
             if(apiFieldMetaData.getInitialVersion() == null)
             {