Merge pull request #230 from dgageot/save-non-default

Save properties with non default values

Author: trungutt

src/extension/ui/src/Registry.ts

@@ -7,7 +7,7 @@ import { ParsedParameters } from "./types/config";
 
 export const getRegistry = async (client: v1.DockerDesktopClient) => {
     const parseRegistry = async () => {
-        const registry = await readFileInPromptsVolume(client, 'registry.yaml')
+        const registry = await readFileInPromptsVolume(client, REGISTRY_YAML)
         if (registry) {
             const value = parse(registry)['registry'] as { [key: string]: { ref: string, config: any } }
             if (!value) {
@@ -18,7 +18,7 @@ export const getRegistry = async (client: v1.DockerDesktopClient) => {
         return {};
     }
     const writeRegistryIfNotExists = async () => {
-        const registry = await readFileInPromptsVolume(client, 'registry.yaml')
+        const registry = await readFileInPromptsVolume(client, REGISTRY_YAML)
         if (!registry) {
             await writeToPromptsVolume(client, REGISTRY_YAML, 'registry: {}')
         }
@@ -95,12 +95,7 @@ export const syncRegistryWithConfig = async (client: v1.DockerDesktopClient, reg
     }
     const oldRegString = JSON.stringify(registry)
     for (const [itemName, itemConfig] of Object.entries(config)) {
-        const registryItem = registry[itemName]
-        if (registryItem && registryItem.config?.[itemName]) {
-            const mergedConfig = mergeDeep(registryItem.config[itemName] || {}, itemConfig)
-            registry[itemName].config = { [itemName]: mergedConfig }
-        }
-        else if (registryItem) {
+        if (registry[itemName]) {
             registry[itemName].config = { [itemName]: itemConfig }
         }
     }

src/extension/ui/src/components/tile/ConfigEditor.tsx

@@ -2,16 +2,16 @@ import { v1 } from '@docker/extension-api-client-types';
 import CheckOutlined from '@mui/icons-material/CheckOutlined';
 import CloseOutlined from '@mui/icons-material/CloseOutlined';
 import {
-  ButtonGroup,
   CircularProgress,
   IconButton,
   Stack,
   TextField,
-  Typography,
+  Typography
 } from '@mui/material';
 import * as JsonSchema from 'json-schema-library';
 import { useEffect, useMemo, useState } from 'react';
 
+import * as JsonSchemaLibrary from "json-schema-library";
 import {
   buildObjectFromFlattenedObject,
   deepFlattenObject,
@@ -50,9 +50,9 @@ const ConfigEditor = ({
     () =>
       configSchema
         ? deepFlattenObject({
-            ...catalogItem.configTemplate,
-            ...existingConfigForItem,
-          })
+          ...catalogItem.configTemplate,
+          ...existingConfigForItem,
+        })
         : {},
     [catalogItem.configTemplate, existingConfigForItem, configSchema]
   );
@@ -101,7 +101,7 @@ const ConfigEditor = ({
                 fullWidth
                 size="small"
                 label={key}
-                value={localConfig[key] || ''}
+                value={localConfig[key]}
                 onChange={(e) =>
                   setLocalConfig({ ...localConfig, [key]: e.target.value })
                 }
@@ -115,12 +115,19 @@ const ConfigEditor = ({
                     <Stack direction="row" spacing={1}>
                       <IconButton
                         size="small"
-                        onClick={() =>
-                          updateExistingConfig(
-                            catalogItem.name,
-                            buildObjectFromFlattenedObject(localConfig)
-                          )
-                        }
+                        onClick={() => {
+                          const newConfig = buildObjectFromFlattenedObject(localConfig);
+
+                          // Remove all attributes which are optional and which have the defautl value
+                          const schema = new JsonSchemaLibrary.Draft2019(catalogItem.config[0]);
+                          const requiredAttributes = (schema.rootSchema.required || []) as string[];
+                          const template = schema.getTemplate({});
+                          const requiredConfig = Object.fromEntries(Object.entries(newConfig).filter(([key, value]) => {
+                            return requiredAttributes.includes(key) || (value !== template[key]);
+                          }));
+
+                          updateExistingConfig(catalogItem.name, requiredConfig)
+                        }}
                         disabled={isSaving}
                       >
                         <CheckOutlined