PR feedback

Kira-Pilot · Kira-Pilot · commit 82a513ba339b · 2023-10-17T01:25:20.000Z
diff --git a/site/src/components/DeploySettingsLayout/Option.tsx b/site/src/components/DeploySettingsLayout/Option.tsx
@@ -85,28 +85,30 @@ export const OptionValue: FC<OptionValueProps> = (props) => {
   if (typeof children === "object" && !Array.isArray(children)) {
     return (
       <ul css={listStyles}>
-        {Object.entries(children).map(([option, isEnabled]) => (
-          <li key={option} css={optionStyles}>
-            <Box
-              sx={{
-                display: "inline-flex",
-                alignItems: "center",
-              }}
-            >
-              {option}
-              {isEnabled && (
-                <CheckCircleOutlined
-                  sx={{
-                    width: 16,
-                    height: 16,
-                    color: (theme) => theme.palette.success.light,
-                    margin: (theme) => theme.spacing(0, 1),
-                  }}
-                />
-              )}
-            </Box>
-          </li>
-        ))}
+        {Object.entries(children)
+          .sort((a, b) => a[0].localeCompare(b[0]))
+          .map(([option, isEnabled]) => (
+            <li key={option} css={optionStyles}>
+              <Box
+                sx={{
+                  display: "inline-flex",
+                  alignItems: "center",
+                }}
+              >
+                {option}
+                {isEnabled && (
+                  <CheckCircleOutlined
+                    sx={{
+                      width: 16,
+                      height: 16,
+                      color: (theme) => theme.palette.success.light,
+                      margin: (theme) => theme.spacing(0, 1),
+                    }}
+                  />
+                )}
+              </Box>
+            </li>
+          ))}
       </ul>
     );
   }
diff --git a/site/src/components/DeploySettingsLayout/optionValue.ts b/site/src/components/DeploySettingsLayout/optionValue.ts
@@ -31,11 +31,12 @@ export function optionValue(
           {} as Record<string, boolean>,
         );
 
+      if (!experimentMap) {
+        break;
+      }
+
       for (const v of option.value) {
-        if (
-          experimentMap &&
-          Object.prototype.hasOwnProperty.call(experimentMap, v)
-        ) {
+        if (Object.hasOwn(experimentMap, v)) {
           experimentMap[v] = true;
         }
       }
