From 8a2ba78203eb3353f6376f05a2fb47f4426a1cde Mon Sep 17 00:00:00 2001
From: Andrew <admin@foundryvtt.com>
Date: Mon, 28 Sep 2020 09:21:11 -0700
Subject: [PATCH] Ensure worldbuilding changes are working on legacy
 worldbuilding world and adjust attribute form styling

---
 module/actor-sheet.js | 17 ++++++++---------
 module/actor.js       |  9 +++++++++
 styles/simple.css     | 27 ++++++++++++++-------------
 styles/simple.less    | 31 ++++++++++++++++---------------
 4 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index 831139f..f73829b 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -36,17 +36,16 @@ export class SimpleActorSheet extends ActorSheet {
     data.data.ungroupedAttributes = {};
 
     // Build an array of sorted group keys.
-    let groupKeys = Object.keys(data.data.groups).sort((a, b) => {
-      // Attempt to sort by the label, but fall back to the key.
-      let aSort = data.data.groups[a].label ? data.data.groups[a].label : a;
-      let bSort = data.data.groups[b].label ? data.data.groups[b].label : b;
+    const groups = data.data.groups || {};
+    let groupKeys = Object.keys(groups).sort((a, b) => {
+      let aSort = groups[a].label ?? a;
+      let bSort = groups[b].label ?? b;
       return aSort.localeCompare(bSort);
     });
 
-    // Iterate over the sorted groups to add their attributes..
-    groupKeys.forEach(key => {
-      // Retrieve the group.
-      let group = data.data.attributes[key];
+    // Iterate over the sorted groups to add their attributes.
+    for ( let key of groupKeys ) {
+      let group = data.data.attributes[key] || {};
 
       // Initialize the attributes container for this group.
       if ( !data.data.groups[key]['attributes'] ) data.data.groups[key]['attributes'] = {};
@@ -58,7 +57,7 @@ export class SimpleActorSheet extends ActorSheet {
         group[attr]['isResource'] = group[attr]['dtype'] === 'Resource';
         data.data.groups[key]['attributes'][attr] = group[attr];
       });
-    });
+    }
 
     // Sort the remaining attributes attributes.
     Object.keys(data.data.attributes).filter(a => !groupKeys.includes(a)).sort((a, b) => a.localeCompare(b)).forEach(key => {
diff --git a/module/actor.js b/module/actor.js
index abd86a4..1f6eb5a 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -4,6 +4,15 @@
  */
 export class SimpleActor extends Actor {
 
+  /** @override */
+  prepareData() {
+    super.prepareData();
+    this.data.data.groups = this.data.data.groups || {};
+    this.data.data.attributes = this.data.data.attributes || {};
+  }
+
+  /* -------------------------------------------- */
+
   /** @override */
   getRollData() {
     const data = super.getRollData();
diff --git a/styles/simple.css b/styles/simple.css
index 13bc5a0..7c37aac 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -150,21 +150,15 @@
   position: sticky;
   top: 0;
   left: 0;
-  right: 0;
-  padding: 5px;
+  align-items: center;
+  padding: 0 5px;
   margin: 5px 0;
   background: #cfcdc2;
   border: 1px solid #AAA;
   border-radius: 2px;
-  text-align: center;
+  text-align: left;
   font-weight: bold;
 }
-.worldbuilding .attributes-header .attribute-label {
-  flex: 1.5;
-}
-.worldbuilding .attributes-header .attribute-control {
-  flex: 0 0 20px;
-}
 .worldbuilding .attributes-list {
   list-style: none;
   margin: 0;
@@ -199,20 +193,24 @@
 .worldbuilding .group-header input[type="text"]:focus::placeholder {
   opacity: 1;
 }
+.worldbuilding .group-controls {
+  margin: 5px;
+}
 .worldbuilding .groups-list {
   list-style: none;
   margin: 0;
   padding: 0;
 }
 .worldbuilding .group {
-  margin: 20px 0;
+  margin: 5px 0 0;
   padding: 0;
 }
 .worldbuilding .group-header {
+  align-items: center;
   background: rgba(0, 0, 0, 0.05);
   border: 1px solid #AAA;
   border-radius: 2px;
-  padding: 5px;
+  padding: 2px 5px;
 }
 .worldbuilding .group-key,
 .worldbuilding .group-label {
@@ -224,12 +222,15 @@
   margin-right: 6px;
 }
 .worldbuilding .group-key {
-  flex: 0 0 126px;
   opacity: 0.75;
 }
+.worldbuilding .group-label {
+  flex: 2;
+}
 .worldbuilding .group-dtype {
+  height: 24px;
+  flex: 0 0 116px;
   margin: 0 5px;
-  flex: 0;
 }
 .worldbuilding.sheet.actor {
   min-width: 560px;
diff --git a/styles/simple.less b/styles/simple.less
index 592bb8d..c489d23 100644
--- a/styles/simple.less
+++ b/styles/simple.less
@@ -172,22 +172,14 @@
     position: sticky;
     top: 0;
     left: 0;
-    right: 0;
-    padding: 5px;
+    align-items: center;
+    padding: 0 5px;
     margin: 5px 0;
     background: #cfcdc2;
     border: 1px solid #AAA;
     border-radius: 2px;
-    text-align: center;
+    text-align: left;
     font-weight: bold;
-
-    .attribute-label {
-      flex: 1.5;
-    }
-
-    .attribute-control {
-      flex: 0 0 20px;
-    }
   }
 
   .attributes-list {
@@ -235,6 +227,10 @@
     }
   }
 
+  .group-controls {
+    margin: 5px;
+  }
+
   .groups-list {
     list-style: none;
     margin: 0;
@@ -242,15 +238,16 @@
   }
 
   .group {
-    margin: 20px 0;
+    margin: 5px 0 0;
     padding: 0;
   }
 
   .group-header {
+    align-items: center;
     background: rgba(0, 0, 0, 0.05);
     border: 1px solid #AAA;
     border-radius: 2px;
-    padding: 5px;
+    padding: 2px 5px;
   }
 
   .group-key,
@@ -264,13 +261,17 @@
   }
 
   .group-key {
-    flex: 0 0 126px;
     opacity: 0.75;
   }
 
+  .group-label {
+    flex: 2;
+  }
+
   .group-dtype {
+    height: 24px;
+    flex: 0 0 116px;
     margin: 0 5px;
-    flex: 0;
   }
 }