Merge pull request #71 from delegateas/patches/12187-diverse

Patches/12187 diverse

Author: Lucki2g

.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run dev:*)",
+      "Bash(dotnet build:*)",
+      "Bash(npm run build:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

Generator/DTO/Attributes/Attribute.cs

@@ -7,6 +7,7 @@ public abstract class Attribute
     public bool IsStandardFieldModified { get; set; }
     public bool IsCustomAttribute { get; set; }
     public bool IsPrimaryId { get; set; }
+    public bool IsPrimaryName { get; set; }
     public List<AttributeUsage> AttributeUsages { get; set; } = new List<AttributeUsage>();
     public string DisplayName { get; }
     public string SchemaName { get; }
@@ -20,6 +21,7 @@ public abstract class Attribute
     protected Attribute(AttributeMetadata metadata)
     {
         IsPrimaryId = metadata.IsPrimaryId ?? false;
+        IsPrimaryName = metadata.IsPrimaryName ?? false;
         IsCustomAttribute = metadata.IsCustomAttribute ?? false;
         DisplayName = metadata.DisplayName.UserLocalizedLabel?.Label ?? string.Empty;
         SchemaName = metadata.SchemaName;

Generator/DataverseService.cs

@@ -339,7 +339,7 @@ private static Record MakeRecord(
                 .Select(metadata =>
                 {
                     var attr = GetAttribute(metadata, entity, logicalToSchema, attributeUsages, logger);
-                    attr.IsStandardFieldModified = MetadataExtensions.StandardFieldHasChanged(metadata, entity.DisplayName.UserLocalizedLabel?.Label ?? string.Empty);
+                    attr.IsStandardFieldModified = MetadataExtensions.StandardFieldHasChanged(metadata, entity.DisplayName.UserLocalizedLabel?.Label ?? string.Empty, entity.IsCustomEntity ?? false);
                     return attr;
                 })
                 .Where(x => !string.IsNullOrEmpty(x.DisplayName))

Generator/MetadataExtensions.cs

@@ -20,15 +20,25 @@ internal static string PrettyDescription(this string description) =>
             .Replace("\"", @"”")
             .Replace("\n", " ");
 
-    public static bool StandardFieldHasChanged(this AttributeMetadata attribute, string entityDisplayName)
+    public static bool StandardFieldHasChanged(this AttributeMetadata attribute, string entityDisplayName, bool isCustomEntity)
     {
         if (attribute.IsCustomAttribute ?? false) return false;
 
         var languagecode = attribute.DisplayName.UserLocalizedLabel?.LanguageCode;
 
         var fields = GetDefaultFields(entityDisplayName, languagecode);
-        return fields.StandardDescriptionHasChanged(attribute.LogicalName, attribute.Description.UserLocalizedLabel?.Label ?? string.Empty)
+        var hasTextChanged = fields.StandardDescriptionHasChanged(attribute.LogicalName, attribute.Description.UserLocalizedLabel?.Label ?? string.Empty)
             || fields.StandardDisplayNameHasChanged(attribute.LogicalName, attribute.DisplayName.UserLocalizedLabel?.Label ?? string.Empty);
+
+        // Check if options have been added to statecode or statuscode
+        var hasOptionsChanged = attribute switch
+        {
+            StateAttributeMetadata state => StateCodeOptionsHaveChanged(state),
+            StatusAttributeMetadata status => StatusCodeOptionsHaveChanged(status),
+            _ => false
+        };
+
+        return hasTextChanged || hasOptionsChanged;
     }
 
     private static bool StandardDisplayNameHasChanged(this IEnumerable<(string LogicalName, string DisplayName, string Description)> fields, string logicalName, string displayName)
@@ -45,6 +55,16 @@ private static bool StandardDescriptionHasChanged(this IEnumerable<(string Logic
             .Any(f => description.Equals(f.Description));
     }
 
+    private static bool StateCodeOptionsHaveChanged(StateAttributeMetadata state)
+    {
+        return state.OptionSet?.Options?.Count > 2;
+    }
+
+    private static bool StatusCodeOptionsHaveChanged(StatusAttributeMetadata status)
+    {
+        return status.OptionSet?.Options?.Count > 2;
+    }
+
     private static IEnumerable<(string LogicalName, string DisplayName, string Description)> GetDefaultFields(string entityDisplayName, int? languageCode)
     {
         switch (languageCode)