Change names, remove names

db/migrate/20180109165402_remove_typo_columns_from_configs.rb

@@ -0,0 +1,7 @@
+class RemoveTypoColumnsFromConfigs < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :firmware_configs, :status_general, :boolean
+    remove_column :web_app_configs, :successs_log, :boolean
+    rename_column :web_app_configs, :weed_detector, :stub_config
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180109070610) do
+ActiveRecord::Schema.define(version: 20180109165402) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -165,7 +165,6 @@ ActiveRecord::Schema.define(version: 20180109070610) do
     t.integer "pin_guard_5_active_state", default: 1
     t.integer "pin_guard_5_pin_nr", default: 0
     t.integer "pin_guard_5_time_out", default: 60
-    t.integer "status_general", default: 0
     t.index ["device_id"], name: "index_firmware_configs_on_device_id"
   end
 
@@ -353,8 +352,7 @@ ActiveRecord::Schema.define(version: 20180109070610) do
     t.integer "info_log", default: 1
     t.integer "fun_log", default: 1
     t.integer "debug_log", default: 1
-    t.integer "successs_log", default: 1
-    t.boolean "weed_detector", default: false
+    t.boolean "stub_config", default: false
     t.index ["device_id"], name: "index_web_app_configs_on_device_id"
   end
 

spec/controllers/api/configs/firmware_configs_controller_spec.rb

@@ -102,7 +102,6 @@ describe Api::FirmwareConfigsController do
         pin_guard_5_active_state:          1,
         pin_guard_5_pin_nr:                0,
         pin_guard_5_time_out:              60,
-        status_general:                    0
       }.to_a.map { |key, value| expect(json[key]).to eq(value) }
 
       { created_at: String, updated_at: String }
@@ -113,7 +112,7 @@ describe Api::FirmwareConfigsController do
   describe '#update' do
     it 'handles update requests' do
       sign_in user
-      body = { pin_guard_5_time_out: 23, status_general: -1 }
+      body = { pin_guard_5_time_out: 23 }
       body.to_a.map { |key, val| expect(device.firmware_config.send(key)).not_to eq(val) }
       put :update, body: body.to_json, params: { format: :json }
       expect(response.status).to eq(200)
@@ -139,11 +138,11 @@ describe Api::FirmwareConfigsController do
     it 'resets everything to the defaults' do
       sign_in user
       old_conf = device.firmware_config
-      old_conf.update_attributes(status_general: 23)
+      old_conf.update_attributes(pin_guard_5_pin_nr: 23)
       delete :destroy, params: {}
       expect(response.status).to eq(200)
       new_conf = device.reload.firmware_config
-      expect(new_conf.status_general).to_not eq(23)
+      expect(new_conf.pin_guard_5_pin_nr).to_not eq(23)
     end
   end
 end

spec/controllers/api/configs/web_app_configs_controller_spec.rb

@@ -41,7 +41,6 @@ describe Api::WebAppConfigsController do
         :info_log              => 1,
         :fun_log               => 1,
         :debug_log             => 1,
-        :successs_log          => 1
       }.to_a.map { |key, value| expect(json[key]).to eq(value) }
 
       { created_at: String, updated_at: String }

webpack/account/labs/__tests__/labs_features_list_data_test.ts

@@ -26,7 +26,7 @@ describe("maybeToggleFeature()", () => {
       name: "Example",
       value: false,
       description: "I stub this.",
-      storageKey: BooleanSetting.weed_detector,
+      storageKey: BooleanSetting.stub_config,
       experimental: true
     };
     const out = maybeToggleFeature(data);
@@ -39,9 +39,9 @@ describe("maybeToggleFeature()", () => {
     (global as any).confirm = () => true;
     const data: LabsFeature = {
       name: "Example1",
-      value: (mockStorj[BooleanSetting.weed_detector] = false),
+      value: (mockStorj[BooleanSetting.stub_config] = false),
       description: "I stub this.",
-      storageKey: BooleanSetting.weed_detector,
+      storageKey: BooleanSetting.stub_config,
       experimental: true
     };
     const out = maybeToggleFeature(data);
@@ -55,9 +55,9 @@ describe("maybeToggleFeature()", () => {
     Object.defineProperty(global, "confirm", conf);
     const output = maybeToggleFeature({
       name: "Example",
-      value: (mockStorj[BooleanSetting.weed_detector] = true),
+      value: (mockStorj[BooleanSetting.stub_config] = true),
       description: "I stub this.",
-      storageKey: BooleanSetting.weed_detector,
+      storageKey: BooleanSetting.stub_config,
       experimental: true
     });
     expect(conf).not.toHaveBeenCalled();
@@ -68,9 +68,9 @@ describe("maybeToggleFeature()", () => {
   it("updates a `LabsFeature` when consent is not required", () => {
     const data: LabsFeature = {
       name: "Example1",
-      value: (mockStorj[BooleanSetting.weed_detector] = false),
+      value: (mockStorj[BooleanSetting.stub_config] = false),
       description: "I stub this.",
-      storageKey: BooleanSetting.weed_detector
+      storageKey: BooleanSetting.stub_config
     };
     const out = maybeToggleFeature(data);
     out ?

webpack/config_storage/firmware_configs.ts

@@ -99,7 +99,6 @@ export interface FirmwareConfig {
   pin_guard_5_active_state: number;
   pin_guard_5_pin_nr: number;
   pin_guard_5_time_out: number;
-  status_general: number;
 }
 
 export type NumberConfigKey = "id"
@@ -192,8 +191,7 @@ export type NumberConfigKey = "id"
     |"pin_guard_4_time_out"
     |"pin_guard_5_active_state"
     |"pin_guard_5_pin_nr"
-    |"pin_guard_5_time_out"
-    |"status_general";
+    |"pin_guard_5_time_out";
 
 export type StringConfigKey = "created_at"
     |"updated_at";

webpack/config_storage/web_app_configs.ts

@@ -37,8 +37,7 @@ export interface WebAppConfig {
   info_log: number;
   fun_log: number;
   debug_log: number;
-  successs_log: number;
-  weed_detector: boolean;
+  stub_config: boolean;
 }
 
 export type NumberConfigKey = "id"
@@ -51,8 +50,7 @@ export type NumberConfigKey = "id"
     |"error_log"
     |"info_log"
     |"fun_log"
-    |"debug_log"
-    |"successs_log";
+    |"debug_log";
 
 export type StringConfigKey = "created_at"
     |"updated_at";
@@ -75,4 +73,4 @@ export type BooleanConfigKey = "confirm_step_deletion"
     |"x_axis_inverted"
     |"y_axis_inverted"
     |"z_axis_inverted"
-    |"weed_detector";
+    |"stub_config";

webpack/session_keys.ts

@@ -13,7 +13,7 @@ export const BooleanSetting: Record<BooleanConfigKey, BooleanConfigKey> = {
   show_farmbot: "show_farmbot",
 
   /** "Labs" feature names. */
-  weed_detector: "weed_detector",
+  stub_config: "stub_config",
   disable_i18n: "disable_i18n",
   confirm_step_deletion: "confirm_step_deletion",
   hide_webcam_widget: "hide_webcam_widget",
@@ -34,7 +34,6 @@ export const NumericSetting: Record<NumberConfigKey, NumberConfigKey> = {
   id: "id",
   info_log: "info_log",
   success_log: "success_log",
-  successs_log: "successs_log",
   warn_log: "warn_log",
   zoom_level: "zoom_level",
 };