solara 0.2.0 → 0.2.1

data/solara/lib/core/dashboard/component/AliasesBottomSheet.js

@@ -90,26 +90,28 @@ class AliasesBottomSheet extends HTMLElement {
         this.overlay.onclick = () => this.hide();
     }
 
-    show(aliases, brand) {
+    show(aliases, brandKey) {
         const commonAliasesList = this.shadowRoot.getElementById('commonAliasesList');
         const brandAliasesList = this.shadowRoot.getElementById('brandAliasesList');
 
         commonAliasesList.innerHTML = '';
         brandAliasesList.innerHTML = '';
 
+        const pattern = /alias|='[^']*'/g;
+
         aliases.aliases.common_aliases.forEach(alias => {
             const li = document.createElement('li');
-            li.textContent = alias;
+            li.textContent = alias.replace(pattern, '').trim();
             commonAliasesList.appendChild(li);
         });
 
-        const brandAliases = aliases.aliases.brand_aliases[brand.key] || [];
+        const brandAliases = aliases.aliases.brand_aliases[brandKey] || [];
+
         brandAliases.forEach(alias => {
             const li = document.createElement('li');
-            li.textContent = alias;
+            li.textContent = alias.replace(pattern, '').trim();
             brandAliasesList.appendChild(li);
         });
-
         this.aliasesBottomSheet.style.display = 'block';
         this.overlay.style.display = 'block';
 

data/solara/lib/core/dashboard/dashboard_manager.rb

@@ -1,6 +1,8 @@
 class DashboardManager
 
     def start(brand_key = nil, port = 8000)
+        return if SolaraEnvironment.is_test
+        
         Solara.logger.header("Solara Dashboard #{brand_key.nil? || brand_key.empty? ? "" : "for #{brand_key}"}")
         if brand_key.nil? || brand_key.empty?
             open("brands/brands.html?source=local", port)

data/solara/lib/core/dashboard/dashboard_server.rb

@@ -1,5 +1,4 @@
 Dir[File.expand_path('handler/*.rb', __dir__)].each { |file| require_relative file }
-Dir[File.expand_path('../.solara/core/brands/*.rb')].each { |file| require_relative file }
 Dir[File.expand_path('platform/android/*.rb', __dir__)].each { |file| require_relative file }
 Dir[File.expand_path('scripts/*.rb', __dir__)].each { |file| require_relative file }
 
@@ -65,10 +64,9 @@ class DashboardServer
         return if @router.nil?
 
         @router.register_handler(RedirectHandler)
-        @router.register_handler(BrandSectionHandler)
         @router.register_handler(SwitchToBrandHandler)
         @router.register_handler(CurrentBrandHandler)
-        @router.register_handler(BrandConfigurationsHandler)
+        @router.register_handler(BrandDetailsHandler)
         @router.register_handler(BrandsHandler)
         @router.register_handler(EditSectionHandler)
         @router.register_handler(OnboardBrandHandler)

data/solara/lib/core/dashboard/handler/brand_alisases_handler.rb

@@ -3,17 +3,10 @@ class BrandAliasesHandler < BaseHandler
         @server.mount_proc('/brand/aliases') do |req, res|
             if req.request_method == 'GET'
                 begin
-                    query = CGI.parse(req.query_string)
-                    brand_key = query['brand_key']&.first
+                    aliases = get_brand_aliases
+                    res.status = 200
+                    res.body = JSON.generate({ success: true, aliases: aliases })
 
-                    if brand_key
-                        aliases = get_brand_aliases(brand_key)
-                        res.status = 200
-                        res.body = JSON.generate({ success: true, aliases: aliases })
-                    else
-                        res.status = 400
-                        res.body = JSON.generate({ success: false, error: 'Missing brand_key parameter' })
-                    end
                 rescue StandardError => e
                     handle_error(res, e, "Error fetching brand aliases")
                 end
@@ -24,7 +17,7 @@ class BrandAliasesHandler < BaseHandler
         end
     end
 
-    def get_brand_aliases(brand_key)
+    def get_brand_aliases
         AliasGeneratorManager.aliases_json
     rescue StandardError => e
         Solara.logger.failure("Error getting brand aliases: #{e.message}")

data/solara/lib/core/dashboard/handler/brand_configurations_manager.rb

@@ -11,37 +11,37 @@ class BrandConfigurationsManager
     def templates
         [
             {
-                key: 'theme',
-                name: 'Theme Configuration',
-                input_type: 'color',
-                path: FilePath.brand_theme(@brand_key)
-            },
-            {
-                key: 'brand_config',
+                key: 'brand_config.json',
                 name: 'Brand Configuration',
                 input_type: 'text',
                 path: FilePath.brand_config(@brand_key)
             },
             {
-                key: 'android_config',
+                key: 'theme.json',
+                name: 'Theme Configuration',
+                input_type: 'color',
+                path: FilePath.brand_theme(@brand_key)
+            },
+            {
+                key: 'android_config.json',
                 name: 'Android Platform Configuration',
                 input_type: 'text',
                 path: FilePath.android_brand_config(@brand_key)
             },
             {
-                key: 'android_signing',
+                key: 'android_signing.json',
                 name: 'Android Signing',
                 input_type: 'text',
                 path: FilePath.brand_signing(@brand_key, Platform::Android)
             },
             {
-                key: 'ios_config',
+                key: 'ios_config.json',
                 name: 'iOS Platform Configuration',
                 input_type: 'text',
                 path: FilePath.ios_config(@brand_key)
             },
             {
-                key: 'ios_signing',
+                key: 'ios_signing.json',
                 name: 'iOS Signing',
                 input_type: 'text',
                 path: FilePath.brand_signing(@brand_key, Platform::IOS)

data/solara/lib/core/dashboard/handler/{brand_configurations_handler.rb → brand_details_handler.rb}

@@ -1,15 +1,15 @@
-class BrandConfigurationsHandler < BaseHandler
+class BrandDetailsHandler < BaseHandler
     def mount
-        @server.mount_proc('/configurations') do |req, res|
+        @server.mount_proc('/brand/details') do |req, res|
             begin
                 query = CGI.parse(req.query_string)
                 brand_key = query['brand_key']&.first
 
                 response_data = BrandsManager.instance.brand_with_configurations(brand_key)
-                res.body = JSON.generate({ success: true, message: "Configurations response", result: response_data })
+                res.body = JSON.generate({ success: true, message: "Brand details response", result: response_data })
                 res['Content-Type'] = 'application/json'
             rescue StandardError => e
-                handle_error(res, e, "Error in brand configurations handler")
+                handle_error(res, e, "Error in brand details handler")
             end
         end
     end

data/solara/lib/core/dashboard/handler/brands_handler.rb

@@ -1,6 +1,6 @@
 class BrandsHandler < BaseHandler
     def mount
-        @server.mount_proc('/brands.json') do |req, res|
+        @server.mount_proc('/brands/all') do |req, res|
             begin
                 brands_list = BrandsManager.instance.brands_list
                 json = JSON.generate(brands_list)

data/solara/lib/core/dashboard/handler/edit_section_handler.rb

@@ -31,8 +31,13 @@ class EditSectionHandler < BaseHandler
         template = BrandConfigurationsManager.new(brand_key).template_with_key(key)
 
         path = template[:path]
+        
         if File.exist?(path)
-            File.write(path, JSON.pretty_generate(data))
+            if key === 'InfoPlist.xcstrings'
+                InfoPListStringCatalogManager.new(FilePath.brand_infoplist_string_catalog(brand_key)).update(data)
+            else
+                File.write(path, JSON.pretty_generate(data))
+            end
             Solara.logger.debug("Updated Config for #{path}: #{data}")
         else
             raise "Config file not found: #{path}"
@@ -42,14 +47,9 @@ class EditSectionHandler < BaseHandler
         raise
     end
 
-    def update_theme(path, data)
-        json = JSON.parse(File.read(path))
-        json['colors'] = data
-        File.write(path, JSON.pretty_generate(json))
-    end
-
     def set_current_brand_content_changed(brand_key, changed)
         BrandsManager.instance.set_current_brand_content_changed(brand_key, changed)
     end
 
-end
+end
+

data/solara/lib/core/doctor/brand_doctor.rb

@@ -1,35 +1,6 @@
 Dir.glob("#{__dir__}/*.rb").each { |file| require file }
-Dir.glob("#{__dir__}/../../.solara/core/brands/*.rb").each { |file| require file }
 Dir.glob("#{__dir__}/validator/template/*.rb").each { |file| require file }
 
-class Issue < StandardError
-    ERROR = 'ERROR'
-    WARNING = 'WARNING'
-
-    attr_reader :type, :error
-
-    def initialize(type, error)
-        @type = type
-        @error = error
-    end
-
-    def to_s
-        "#{@type}: #{@error}"
-    end
-
-    def <=>(other)
-        [type, error] <=> [other.type, other.error]
-    end
-
-    def self.error(error)
-        Issue.new(ERROR, error)
-    end
-
-    def self.warning(error)
-        Issue.new(WARNING, error)
-    end
-end
-
 class BrandDoctor
     def initialize
     end
@@ -37,6 +8,7 @@ class BrandDoctor
     def visit(brand_keys = [], print_logs: true)
         keys = brand_keys.empty? ? BrandsManager.instance.brands_list.map { |brand| brand['key'] } : brand_keys
         issues = []
+        has_template_errors = false
 
         keys.each do |brand_key|
             validator = TemplateValidator.new(FilePath.brand(brand_key), FilePath.template_validation_config)
@@ -45,15 +17,16 @@ class BrandDoctor
             errors.each { |error|
                 issues << Issue.error(error)
             }
+            has_template_errors = true unless issues.select { |issue| issue.type == Issue::ERROR }.empty?
         end
 
         # Validate settings only if all validations so far are passed to avoid files issues
-        if issues.select { |issue| issue.type == Issue::ERROR }.empty?
+        unless has_template_errors
             issues += BrandSettingsValidatorManager.new.validate
         end
 
         if print_logs && !issues.empty?
-            Solara.logger.title("Healt Check Result")
+            Solara.logger.title("Health Check Result")
 
             issues.sort!.each { |issue|
                 case issue.type
@@ -92,3 +65,30 @@ class BrandDoctor
     end
 end
 
+class Issue < StandardError
+    ERROR = 'ERROR'
+    WARNING = 'WARNING'
+
+    attr_reader :type, :error
+
+    def initialize(type, error)
+        @type = type
+        @error = error
+    end
+
+    def to_s
+        "#{@type}: #{@error}"
+    end
+
+    def <=>(other)
+        [type, error] <=> [other.type, other.error]
+    end
+
+    def self.error(error)
+        Issue.new(ERROR, error)
+    end
+
+    def self.warning(error)
+        Issue.new(WARNING, error)
+    end
+end

data/solara/lib/core/doctor/doctor_manager.rb

@@ -1,7 +1,6 @@
 Dir.glob("#{__dir__}/*.rb").each { |file| require file }
 Dir.glob("#{__dir__}/validator/*.rb").each { |file| require file }
 Dir.glob("#{__dir__}/brand/*.rb").each { |file| require file }
-Dir.glob("#{__dir__}/../../.solara/core/brands/*.rb").each { |file| require file }
 
 class DoctorManager
     def initialize

data/solara/lib/core/doctor/project_doctor.rb

@@ -1,5 +1,4 @@
 Dir.glob("#{__dir__}/*.rb").each { |file| require file }
-Dir.glob("#{__dir__}/../../.solara/core/brands/*.rb").each { |file| require file }
 
 class ProjectDoctor
     def visit

data/solara/lib/core/doctor/schema/platform/android/android_config.json

@@ -1,15 +1,11 @@
 {
   "type": "object",
   "required": [
-    "brandName",
     "applicationId",
     "versionName",
     "versionCode"
   ],
   "properties": {
-    "brandName": {
-      "type": "string"
-    },
     "applicationId": {
       "type": "string"
     },

data/solara/lib/core/doctor/schema/platform/ios/InfoPlist.xcstrings

@@ -0,0 +1,15 @@
+{
+  "type": "object",
+  "properties": {
+    "sourceLanguage": {
+      "type": "string"
+    },
+    "strings": {
+      "type": "object"
+    },
+    "version": {
+      "type": "string"
+    }
+  },
+  "required": ["sourceLanguage", "strings", "version"]
+}

data/solara/lib/core/doctor/schema/platform/ios/ios_config.json

@@ -1,10 +1,6 @@
 {
   "type": "object",
   "properties": {
-    "PRODUCT_NAME": {
-      "type": "string",
-      "description": "The name of the product."
-    },
     "PRODUCT_BUNDLE_IDENTIFIER": {
       "type": "string",
       "description": "The bundle identifier of the product."
@@ -19,7 +15,6 @@
     }
   },
   "required": [
-    "PRODUCT_NAME",
     "PRODUCT_BUNDLE_IDENTIFIER",
     "MARKETING_VERSION",
     "BUNDLE_VERSION"

data/solara/lib/core/doctor/schema/platform/shared/brand_config.json

@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "brandName": {
+    "type": "string"
+  },
+  "required": [
+    "brandName"
+  ]
+}

data/solara/lib/core/doctor/schema/platform/shared/theme.json

@@ -3,8 +3,7 @@
   "properties": {
     "colors": {
       "type": "object",
-      "properties": {
-      },
+      "properties": {},
       "required": []
     },
     "typography": {
@@ -13,36 +12,122 @@
         "fontFamily": {
           "type": "object",
           "properties": {
+            "regular": {
+              "type": "string"
+            },
+            "medium": {
+              "type": "string"
+            },
+            "bold": {
+              "type": "string"
+            }
           },
-          "required": []
+          "required": [
+            "regular",
+            "medium",
+            "bold"
+          ]
         },
         "fontSize": {
           "type": "object",
           "properties": {
+            "small": {
+              "type": "number"
+            },
+            "medium": {
+              "type": "number"
+            },
+            "large": {
+              "type": "number"
+            },
+            "extraLarge": {
+              "type": "number"
+            }
           },
-          "required": []
+          "required": [
+            "small",
+            "medium",
+            "large",
+            "extraLarge"
+          ]
         }
       },
-      "required": ["fontFamily", "fontSize"]
+      "required": [
+        "fontFamily",
+        "fontSize"
+      ]
     },
     "spacing": {
       "type": "object",
       "properties": {
+        "small": {
+          "type": "number"
+        },
+        "medium": {
+          "type": "number"
+        },
+        "large": {
+          "type": "number"
+        },
+        "extraLarge": {
+          "type": "number"
+        }
       },
-      "required": []
+      "required": [
+        "small",
+        "medium",
+        "large",
+        "extraLarge"
+      ]
     },
     "borderRadius": {
       "type": "object",
       "properties": {
+        "small": {
+          "type": "number"
+        },
+        "medium": {
+          "type": "number"
+        },
+        "large": {
+          "type": "number"
+        }
       },
-      "required": []
+      "required": [
+        "small",
+        "medium",
+        "large"
+      ]
     },
     "elevation": {
       "type": "object",
       "properties": {
+        "none": {
+          "type": "number"
+        },
+        "low": {
+          "type": "number"
+        },
+        "medium": {
+          "type": "number"
+        },
+        "high": {
+          "type": "number"
+        }
       },
-      "required": []
+      "required": [
+        "none",
+        "low",
+        "medium",
+        "high"
+      ]
     }
   },
-  "required": ["colors", "typography", "spacing", "borderRadius", "elevation"]
+  "required": [
+    "colors",
+    "typography",
+    "spacing",
+    "borderRadius",
+    "elevation"
+  ]
 }

data/solara/lib/core/doctor/validator/brand_settings_validator.rb

@@ -25,6 +25,12 @@ class BrandSettingsValidator
 
         brands.each do |brand|
             brand_key = brand['key']
+
+             unless File.exist?(FilePath.brand(brand_key))
+                 Solara.logger.fatal("#{brand_key} not found in #{FilePath.brands}")
+                 next
+             end
+
             property_value = fetch_json_property(property_name, FilePath.public_send(file_path_method, brand_key))
 
             if property_value.to_s.strip.empty?

data/solara/lib/core/doctor/validator/brand_settings_validator_manager.rb

@@ -8,7 +8,8 @@ class BrandSettingsValidatorManager
         issues = ios_config
         issues += ios_signing
         issues += android_config
-        issues + android_signing
+        issues += android_signing
+        issues + brand_config
     end
 
     def ios_config
@@ -17,16 +18,6 @@ class BrandSettingsValidatorManager
             :ios_config,
             issue_type: Issue::ERROR)
 
-        issues += @validator.validate_single_property(
-            'PRODUCT_NAME',
-            :ios_config,
-            issue_type: Issue::ERROR)
-
-        issues += @validator.validate_property_duplicates(
-            'PRODUCT_NAME',
-            :ios_config,
-            issue_type: Issue::WARNING)
-
         issues += @validator.validate_single_property(
             'PRODUCT_BUNDLE_IDENTIFIER',
             :ios_config,
@@ -58,16 +49,6 @@ class BrandSettingsValidatorManager
             :android_config,
             issue_type: Issue::ERROR)
 
-        issues += @validator.validate_single_property(
-            'brandName',
-            :android_config,
-            issue_type: Issue::ERROR)
-
-        issues += @validator.validate_property_duplicates(
-            'brandName',
-            :android_config,
-            issue_type: Issue::WARNING)
-
         issues += @validator.validate_single_property(
             'applicationId',
             :android_config,
@@ -79,4 +60,11 @@ class BrandSettingsValidatorManager
             issue_type: Issue::ERROR)
     end
 
+    def brand_config
+         @validator.validate_single_property(
+            'brandName',
+            :brand_config,
+            issue_type: Issue::ERROR)
+    end
+
 end

data/solara/lib/core/doctor/validator/template/android_template_validation_config.yml

@@ -2,10 +2,17 @@ structure:
     android:
         type: directory
         contents:
-            assets:
-                type: directory
             res:
                 type: directory
+                contents:
+                    values:
+                        type: directory
+                        contents:
+                            strings.xml:
+                                type: file
+                                validations:
+                                    - type: content_includes
+                                      value: <string name="app_name">
             android_config.json:
                 type: file
                 validations:
@@ -21,8 +28,6 @@ structure:
     ios:
         type: directory
         contents:
-            assets:
-                type: directory
             ios_config.json:
                 type: file
                 validations:
@@ -35,6 +40,17 @@ structure:
                     - type: valid_json
                     - type: json_schema
                       schema_path: platform/ios/ios_signing.json
+            InfoPlist.xcstrings:
+                type: file
+                validations:
+                    - type: valid_json
+                    - type: json_schema
+                      schema_path: platform/ios/InfoPlist.xcstrings
+            xcassets:
+                type: directory
+                contents:
+                    AppIcon.appiconset:
+                        type: directory
     shared:
         type: directory
         contents:
@@ -42,6 +58,8 @@ structure:
                 type: file
                 validations:
                     - type: valid_json
+                    - type: json_schema
+                      schema_path: platform/shared/brand_config.json
             theme.json:
                 type: file
                 validations: