merge: #4050

4050: Ensure secret field order is correct r=nickgerace a=nickgerace ## Description This PR ensures the secret field order is correct by using ordered props. Assets may need to be regenerated from other changes (e.g. props can only be ordered on recent main) in order to see this effect. <img src="https://media3.giphy.com/media/V3v1xkrR1HcR5ymg8z/giphy.gif"/> Co-authored-by: Nick Gerace <[email protected]>
systeminit · Jun 26, 2024 · d278821 · d278821
2 parents 0ba11e4 + 67d5839
commit d278821
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/dal/src/secret/definition_view.rs b/lib/dal/src/secret/definition_view.rs
@@ -66,12 +66,11 @@ impl SecretDefinitionView {
         secret_definition_prop_id: PropId,
     ) -> SecretDefinitionViewResult<Self> {
         // Now, find all the fields of the definition.
-        let field_prop_ids = Prop::direct_child_prop_ids(ctx, secret_definition_prop_id).await?;
+        let field_props = Prop::direct_child_props_ordered(ctx, secret_definition_prop_id).await?;
 
         // Assemble the form data views.
         let mut form_data_views = Vec::new();
-        for field_prop_id in field_prop_ids {
-            let field_prop = Prop::get_by_id_or_error(ctx, field_prop_id).await?;
+        for field_prop in field_props {
             form_data_views.push(SecretFormDataView {
                 name: field_prop.name,
                 kind: field_prop.kind.to_string(),