Removed old workflows (#442)

fix: Make initialization robust when app data directory is missing

.github/workflows/close-issue.yml

@@ -1,78 +0,0 @@
-name: Update issue Status
-
-on:
-  issues:
-    types: [closed]
-
-jobs:
-  update_issue:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get project data
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ORGANIZATION: specklesystems
-          PROJECT_NUMBER: 9
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectNext(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      id
-                      name
-                      settings
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          
-          echo "$PROJECT_ID"
-          echo "$STATUS_FIELD_ID"
-          
-          echo 'DONE_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .settings | fromjson | .options[] | select(.name== "Done") | .id' project_data.json) >> $GITHUB_ENV
-          echo "$DONE_ID"
-
-      - name: Add Issue to project #it's already in the project, but we do this to get its node id!
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $id:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
-          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
-          
-      - name: Update Status
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $status:ID!, $id:ID!, $value:String!) {
-              set_status: updateProjectNextItemField(
-                input: {
-                  projectId: $project
-                  itemId: $id
-                  fieldId: $status
-                  value: $value
-                }
-              ) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f status=$STATUS_FIELD_ID -f id=$ITEM_ID -f value=${{ env.DONE_ID }}
-          

.github/workflows/open-issue.yml

@@ -1,50 +0,0 @@
-name: Move new issues into Project
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  track_issue:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get project data
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ORGANIZATION: specklesystems
-          PROJECT_NUMBER: 9
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectNext(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      id
-                      name
-                      settings
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-     
-      - name: Add Issue to project
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $id:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
-          echo 'ITEM_ID='$item_id >> $GITHUB_ENV

speckle_connector_3/src/accounts/accounts.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'JSON'
+require 'fileutils'
 require_relative '../ext/sqlite3'
 require_relative '../constants/path_constants'
 require_relative '../preferences/preferences'
@@ -12,6 +13,8 @@ module SpeckleConnector3
     def self.load_accounts
       db_path = SPECKLE_ACCOUNTS_DB_PATH
       unless File.exist?(db_path)
+        # Ensure parent directory exists before creating the database file
+        FileUtils.mkdir_p(File.dirname(db_path))
         File.new(SPECKLE_ACCOUNTS_DB_PATH, "w")
         db = Sqlite3::Database.new(SPECKLE_ACCOUNTS_DB_PATH)
         Preferences.create_objects_table(db)
@@ -25,6 +28,40 @@ module SpeckleConnector3
       rows.map { |row| JSON.parse(row[1]) }
     end
 
+    def self.add_account(account_id, account)
+      unless File.exist?(SPECKLE_ACCOUNTS_DB_PATH)
+        # Ensure parent directory exists before creating the database file
+        FileUtils.mkdir_p(File.dirname(SPECKLE_ACCOUNTS_DB_PATH))
+        File.new(SPECKLE_ACCOUNTS_DB_PATH, "w")
+        db = Sqlite3::Database.new(SPECKLE_ACCOUNTS_DB_PATH)
+        create_objects_table(db)
+        db.close
+      end
+      db = Sqlite3::Database.new(SPECKLE_ACCOUNTS_DB_PATH)
+      account_json = JSON.generate(account)
+      sql_query = "INSERT OR REPLACE INTO objects (hash, content) VALUES ('#{account_id}', '#{account_json}')"
+
+      begin
+        db.exec(sql_query)
+        puts "Account with hash #{account_id} has been added/updated."
+      rescue StandardError => e
+        puts "An error occurred while adding the account: #{e}"
+      ensure
+        db.close
+      end
+    end
+
+    # Creates the 'objects' table in the database if it doesn't already exist.
+    # @param db [Sqlite3::Database] the SQLite3 database instance.
+    def self.create_objects_table(db)
+      db.exec <<-SQL
+    CREATE TABLE IF NOT EXISTS objects (
+      hash TEXT PRIMARY KEY,
+      content TEXT
+    );
+  SQL
+    end
+
     def self.remove_account(account_id)
       db_path = SPECKLE_ACCOUNTS_DB_PATH
       unless File.exist?(db_path)

speckle_connector_3/src/actions/account_actions/add_account.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative '../action'
+require_relative '../../accounts/accounts'
+require_relative '../load_saved_streams'
+
+module SpeckleConnector3
+  module Actions
+    # Action to add account to local Account db.
+    class AddAccount < Action
+      # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
+      # @return [States::State] the new updated state object
+      def self.update_state(state, resolve_id, account_id, account)
+        SpeckleConnector3::Accounts.add_account(account_id, account)
+        js_script = "accountsBinding.receiveResponse('#{resolve_id}')"
+        state.with_add_queue_js_command('addAccount', js_script)
+      end
+    end
+  end
+end

speckle_connector_3/src/actions/handle_error.rb

@@ -29,6 +29,7 @@ module SpeckleConnector3
           error: error,
           stackTrace: error.backtrace
         }
+        
         js_error_script = "#{@view_name}.receiveResponse('#{@args.first}', #{host_app_error.to_json})"
         state.with_add_queue_js_command("error_#{@view_name}", js_error_script)
       end

speckle_connector_3/src/actions/initialize_materials.rb

@@ -6,7 +6,7 @@ require_relative '../constants/mat_constants'
 
 module SpeckleConnector3
   module Actions
-    # Action to initialize materials
+    # Action to initialize materials (legacy for diff colors)
     class InitializeMaterials < Action
       # @param state [States::State] the current state of the {App::SpeckleConnectorApp}
       # @return [States::State] the new updated state object

speckle_connector_3/src/actions/load_sketchup_model.rb

@@ -23,8 +23,6 @@ module SpeckleConnector3
         new_sketchup_state = States::SketchupState.new(sketchup_model)
         sketchup_model.rendering_options['DisplaySectionPlanes'] = true
         new_state = state.with(:@sketchup_state => new_sketchup_state)
-        # Init materials again
-        new_state = InitializeMaterials.update_state(new_state)
 
         # Read speckle entities
         #new_speckle_entities = SketchupModel::Reader::SpeckleEntitiesReader.read(sketchup_model.entities)

speckle_connector_3/src/constants/path_constants.rb

@@ -14,7 +14,7 @@ module SpeckleConnector3
                            path = ENV.fetch('APPDATA')
                            Pathname.new(File.join(path, 'Speckle')).cleanpath.to_s
                          when OS_MAC
-                           File.join(Dir.home, '.config/Speckle')
+                           File.join(Dir.home, 'Library/Application Support/Speckle')
                          else
                            raise 'Speckle could not determine your Appdata path'
                          end

speckle_connector_3/src/convertors/base_object_serializer.rb

@@ -109,13 +109,12 @@ module SpeckleConnector3
             next
           end
 
-          # 3.3. Determine prop is dynamically detached or not
+          # 3.3. Check prop needs to split into chunks
+          chunked_detach_match = prop.match(/^@\((\d*)\)/)
+
+          # 3.4. Determine prop is dynamically detached or not
           is_detach_prop = prop[0] == '@'
           is_dynamically_detached = prop[0] == '@' && prop.length > 2 && prop[1] == '@'
-          prop = prop[2..-1] if is_dynamically_detached
-
-          # 3.4. Check prop needs to split into chunks
-          chunked_detach_match = prop.match(/^@\((\d*)\)/)
 
           # 3.5. If split chunk is needed and prop value is array, then run chunking process
           if value.is_a?(Array) && chunked_detach_match
@@ -165,11 +164,18 @@ module SpeckleConnector3
             next
           end
 
+          # 3.6 we cleanup the semantic @ or @@ we used so far for detaching or chunking
+          if is_dynamically_detached
+            prop = prop[2..-1]
+          else
+            prop = prop[1..-1] if is_detach_prop
+          end
+
           child = traverse_value(value, is_detach_prop)
 
           is_base = value.is_a?(Hash) && !value[:speckle_type].nil?
 
-          # 3.6. traverse value according to value is a speckle object or not
+          # 3.7. traverse value according to value is a speckle object or not
           traversed_base[prop] = if is_base
                                    if child[:referencedId] && child[:speckle_type] == 'reference'
                                      is_detach_prop ? detach_helper(child[:referencedId]) : child

speckle_connector_3/src/convertors/to_native_v2.rb

@@ -530,6 +530,8 @@ module SpeckleConnector3
           units = level_data_object['units']
           elevation_raw = level_data_object['elevation']
 
+          next if elevation_raw.nil? || units.nil?
+
           is_exist = @entities_to_fill.grep(Sketchup::SectionPlane).any? { |sp| sp.name == name }
           next if is_exist
 

speckle_connector_3/src/convertors/to_speckle_v2.rb

@@ -105,9 +105,6 @@ module SpeckleConnector3
 
       # @param entity [Sketchup::Entity]
       def entity_has_changed?(entity)
-        # We do not necessarily consider grouped meshes for caching?
-        return false if entity.is_a?(SpeckleObjects::Geometry::GroupedMesh)
-
         speckle_state.changed_entity_persistent_ids.include?(entity.persistent_id.to_s) ||
           speckle_state.changed_entity_ids.include?(entity.entityID.to_s)
       end

speckle_connector_3/src/sketchup_model/definitions/definition_manager.rb

@@ -48,7 +48,9 @@ module SpeckleConnector3
 
           instance_dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
                            .attribute_dictionaries_to_speckle(entity)
-          instance_att = instance_dictionaries.any? ? { dictionaries: instance_dictionaries } : {}
+          definition_dictionaries = SketchupModel::Dictionary::BaseDictionaryHandler
+                                      .attribute_dictionaries_to_speckle(entity.definition)
+          instance_att = instance_dictionaries.any? ? { "Instance Attributes": instance_dictionaries, "Definition Attributes": definition_dictionaries } : {}
 
           instance_proxies[instance_id] = SpeckleObjects::InstanceProxy.new(
             definition_id,
@@ -100,8 +102,8 @@ module SpeckleConnector3
             grouped_meshes = faces.group_by { |face| [face.layer, face.material || face.back_material] }
             grouped_meshes.each do |(layer, mat), faces|
               material_id = mat.nil? ? 'none' : mat.persistent_id.to_s
-              grouped_mesh_id = "#{layer.name} - #{material_id} - #{entity.definition.persistent_id.to_s}"
-              grouped_mesh = SpeckleObjects::Geometry::GroupedMesh.new(faces, layer, mat, grouped_mesh_id)
+              # grouped_mesh_id = "#{layer.name} - #{material_id} - #{entity.definition.persistent_id.to_s}"
+              grouped_mesh = SpeckleObjects::Geometry::GroupedMesh.new(faces, layer, mat)
               flat_atomic_objects[grouped_mesh.persistent_id.to_s] = grouped_mesh
               definition_proxy.add_object_id(grouped_mesh.faces.first.persistent_id.to_s)
             end

speckle_connector_3/src/sketchup_model/utils/view_utils.rb

@@ -25,7 +25,11 @@ module SpeckleConnector3
             sketchup_model.selection.add(entity)
           end
 
-          sketchup_model.active_view.zoom(sketchup_model.selection)
+          if sketchup_model.selection.empty?
+            puts 'No object is selected to highlight'
+          else
+            sketchup_model.active_view.zoom(sketchup_model.selection)
+          end
         end
       end
     end

speckle_connector_3/src/speckle_objects/geometry/grouped_mesh.rb

@@ -28,15 +28,19 @@ module SpeckleConnector3
         # @return [Sketchup::Material] material that faces belong to
         attr_reader :material
 
-        # @return [String] structured id for grouped mesh
+        # @return [String] fake id for grouped mesh
         attr_reader :persistent_id
 
+        # @return [String] fake id for grouped mesh
+        attr_reader :entityID
+
         # @return Hash{String=>Sketchup::Face}
         attr_reader :mesh_groups
 
-        def initialize(faces, layer, material, persistent_id)
+        def initialize(faces, layer, material)
           @faces = faces
-          @persistent_id = persistent_id
+          @persistent_id = faces.first.persistent_id.to_s
+          @entityID = faces.first.persistent_id.to_s
           @layer = layer
           @material = material
           @mesh_groups = {}

speckle_connector_3/src/speckle_objects/other/color.rb

@@ -44,7 +44,7 @@ module SpeckleConnector3
         # @param argb [Numeric] int value of the corresponding color
         # @return [Sketchup::Color] sketchup color
         def self.from_int(argb)
-          Sketchup::Color.new((argb >> 16) & 255, (argb >> 8) & 255, argb & 255, (argb >> 24) & 255)
+          Sketchup::Color.new((argb.to_i >> 16) & 255, (argb.to_i >> 8) & 255, argb.to_i & 255, (argb.to_i >> 24) & 255)
         end
       end
     end

speckle_connector_3/src/ui/bindings/accounts_binding.rb

@@ -2,6 +2,7 @@
 
 require_relative 'binding'
 require_relative '../../actions/account_actions/get_accounts'
+require_relative '../../actions/account_actions/add_account'
 require_relative '../../actions/account_actions/remove_account'
 
 module SpeckleConnector3
@@ -13,6 +14,7 @@ module SpeckleConnector3
       def commands
         @commands ||= {
           getAccounts: Commands::ActionCommand.new(@app, self, Actions::GetAccounts),
+          addAccount: Commands::ActionCommand.new(@app, self, Actions::AddAccount),
           removeAccount: Commands::ActionCommand.new(@app, self, Actions::RemoveAccount)
         }.freeze
       end