Use insertion point for instances

- Previously we were using definition mappings only for direct shape conversions but now they can live in instances

speckle_connector/src/commands/reset_window_location.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'command'
-require_relative '../states/initial_state'
-require_relative '../ui/vue_view'
-require_relative '../actions/initialize_speckle'
-require_relative '../observers/factory'
-
-module SpeckleConnector
-  module Commands
-    # Command to reset Speckle UI window location onto center of SketchUp window.
-    class ResetWindowLocation < Command
-
-      private
-
-      def _run
-        app = self.app
-        vue_view = app.ui_controller.user_interfaces[Ui::SPECKLE_UI_ID]
-        if vue_view
-          vue_view.dialog.reset_dialog_location
-        else
-          puts "Speckle UI didn't initialized!"
-        end
-      end
-    end
-  end
-end

speckle_connector/src/commands/speckle_menu_commands.rb

@@ -3,7 +3,6 @@
 require_relative 'menu_command_handler'
 require_relative 'action_command'
 require_relative 'initialize_speckle'
-require_relative 'reset_window_location'
 require_relative '../actions/one_click_send'
 
 module SpeckleConnector
@@ -11,7 +10,6 @@ module SpeckleConnector
     # Speckle menu commands that adds them to Sketchup menu and toolbar.
     class SpeckleMenuCommands
       CMD_INITIALIZE_SPECKLE = :initialize_speckle
-      CMD_RESET_WINDOW_LOCATION_SPECKLE = :reset_window_location_speckle
       CMD_SEND_TO_SPECKLE = :send_to_speckle
       CMD_RECEIVE_FROM_SPECKLE = :receive_from_speckle
 
@@ -28,9 +26,6 @@ module SpeckleConnector
         commands.add_to_menu!(CMD_INITIALIZE_SPECKLE, speckle_menu)
         commands.add_to_toolbar!(CMD_INITIALIZE_SPECKLE, speckle_toolbar)
 
-        commands[CMD_RESET_WINDOW_LOCATION_SPECKLE] = reset_window_location_command(app)
-        commands.add_to_menu!(CMD_RESET_WINDOW_LOCATION_SPECKLE, speckle_menu)
-
         # commands[CMD_SEND_TO_SPECKLE] = send_command(app)
         # commands.add_to_menu!(CMD_SEND_TO_SPECKLE, speckle_menu)
         # commands.add_to_toolbar!(CMD_SEND_TO_SPECKLE, speckle_toolbar)
@@ -47,17 +42,6 @@ module SpeckleConnector
         cmd
       end
 
-      def self.reset_window_location_command(app)
-        cmd = MenuCommandHandler.sketchup_command(
-          ResetWindowLocation.new(app), 'Reset Window Location'
-        )
-        cmd.tooltip = 'Bring Speckle window onto center of SketchUp window'
-        cmd.status_bar_text = 'Bring Speckle window onto center of SketchUp window'
-        cmd.small_icon  = '../../img/s2logo.png'
-        cmd.large_icon  = '../../img/s2logo.png'
-        cmd
-      end
-
       def self.send_command(app)
         cmd = MenuCommandHandler.sketchup_command(
           ActionCommand.new(app, Actions::OneClickSend), 'Send to Speckle'

speckle_connector/src/ui/dialog.rb

@@ -57,10 +57,6 @@ module SpeckleConnector
         html_dialog.execute_script(data)
       end
 
-      def reset_dialog_location
-        html_dialog.center
-      end
-
       private
 
       # @return [UI::HtmlDialog] the Sketchup interface to dialog

ui/src/App.vue

@@ -101,8 +101,7 @@
             </v-container>
             <create-stream-dialog
                 v-if="accounts().length !== 0"
-                :is-f-e2-terms="preferences && preferences.user && preferences.user.fe2"
-                :is-f-e2="activeAccount().serverInfo.frontend2"
+                :is-f-e2="preferences && preferences.user && preferences.user.fe2"
                 :account-id="activeAccount().userInfo.id"
                 :server-url="activeAccount().serverInfo.url"
             />
@@ -242,8 +241,6 @@ export default {
     switchAccount(account) {
       this.$mixpanel.track('Connector Action', { name: 'Account Select' })
       global.setSelectedAccount(account)
-      // Force pushes to reload page to create ApolloClient from scratch
-      location.reload()
     },
     requestRefresh() {
       sketchup.exec({name: 'reload_accounts', data: {}})

ui/src/components/Mapper.vue

@@ -623,6 +623,8 @@ export default {
           this.selectedLevel = this.levels[0].name
         }
       }
+      console.log(this.selectedFamily, "selectedFamily after")
+      console.log(this.selectedLevel, "selectedLevel after")
     },
     hideOptionalMappingInputs(){
       this.categorySelectionActive = false
@@ -711,11 +713,6 @@ export default {
           }
           this.selectedMethod = this.lastSelectedEntity['definition']['schema']['method']
           this.selectedCategory = this.lastSelectedEntity['definition']['schema']['category']
-          this.selectedFamily = this.lastSelectedEntity['definition']['schema']['family']
-          this.getFamiliesFromSelectedMethod()
-          this.getTypesFromSelectedFamily()
-          this.selectedFamilyType = this.lastSelectedEntity['definition']['schema']['family_type']
-          this.selectedLevel = this.lastSelectedEntity['definition']['schema']['level']
           this.updateMappingInputs()
         }
       }

ui/src/components/dialogs/CreateStreamDialog.vue

@@ -17,13 +17,13 @@
               >
                 mdi-plus-circle
               </v-icon>
-              {{ `Create New ${isFE2Terms ? 'Project': 'Stream'}` }}
+              {{ `Create New ${isFE2 ? 'Project': 'Stream'}` }}
             </v-btn>
           </template>
 
           <v-card>
             <v-card-title class="text-h5">
-              {{ `Create a New ${isFE2Terms ? 'Project' : 'Stream'}` }}
+              {{ `Create a New ${isFE2 ? 'Project' : 'Stream'}` }}
             </v-card-title>
             <v-container class="px-6" pb-0>
               <!--
@@ -56,7 +56,7 @@
                   hide-details
                   dense
                   flat
-                  :placeholder="`${isFE2Terms ? 'Project' : 'Stream'} Name (Optional)`"
+                  :placeholder="`${isFE2 ? 'Project' : 'Stream'} Name (Optional)`"
               />
               <v-text-field
                   v-model="description"
@@ -68,7 +68,7 @@
               />
               <v-switch
                   v-model="privateStream"
-                  :label="`Private ${isFE2Terms ? 'Project' : 'Stream'}`"
+                  :label="`Private ${isFE2 ? 'Project' : 'Stream'}`"
               ></v-switch>
             </v-container>
 
@@ -174,10 +174,6 @@ export default {
     isFE2: {
       type: Boolean,
       default: false
-    },
-    isFE2Terms: {
-      type: Boolean,
-      default: false
     }
   },
   data() {