Fix after review

GladysAssistant · Nov 17, 2023 · bb6be08 · bb6be08
1 parent 395caff
commit bb6be08
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 47 deletions.
diff --git a/front/cypress/e2e/routes/scene/Scene.cy.js b/front/cypress/e2e/routes/scene/Scene.cy.js
@@ -1,43 +1,7 @@
 describe('Scene view', () => {
-  before(() => {
-    cy.login();
-    /*
-    const serverUrl = Cypress.env('serverUrl');
-    cy.request({
-      method: 'GET',
-      url: `${serverUrl}/api/v1/room`
-    }).then(res => {
-      const device = {
-        name: 'One device',
-        external_id: 'one-device',
-        selector: 'one-device',
-        room_id: res.body[0].id,
-        features: [
-          {
-            name: 'Multilevel',
-            category: 'light',
-            type: 'temperature',
-            external_id: 'light-temperature',
-            selector: 'light-temperature',
-            read_only: false,
-            keep_history: true,
-            has_feedback: true,
-            min: 0,
-            max: 1
-          }
-        ]
-      };
-      cy.createDevice(device, 'mqtt');
-    });
-     */
-  });
   beforeEach(() => {
     cy.login();
   });
-  after(() => {
-    // Delete all Bluetooth devices
-    //cy.deleteDevices('mqtt');
-  });
   it('Should create new scene', () => {
     cy.visit('/dashboard/scene');
     cy.contains('scene.newButton')

diff --git a/front/src/routes/scene/SceneTagFilter.jsx b/front/src/routes/scene/SceneTagFilter.jsx
@@ -2,7 +2,6 @@ import { Component } from 'preact';
 import cx from 'classnames';
 import { Text } from 'preact-i18n';
 import { MAX_LENGTH_TAG } from './constant';
-import style from './style.css';
 
 class SceneTagFilter extends Component {
   constructor(props) {
@@ -95,7 +94,7 @@ class SceneTagFilter extends Component {
                       id={`tags-filter-${tag.name}`}
                       type="checkbox"
                       className="custom-control-input"
-                      onChange={e => this.selectedTags(tag.name)}
+                      onChange={() => this.selectedTags(tag.name)}
                       checked={tagsStatus[tag.name]}
                     />
                     <label className="custom-control-label" htmlFor={`tags-filter-${tag.name}`}>

diff --git a/front/src/routes/scene/new-scene/NewScenePage.jsx b/front/src/routes/scene/new-scene/NewScenePage.jsx
@@ -42,15 +42,6 @@ const NewScenePage = ({ children, ...props }) => (
                 <Text id="newScene.invalidName" />
               </div>
             </div>
-            <div class="form-footer">
-              <button
-                onClick={props.createScene}
-                class="btn btn-primary btn-block"
-                disabled={props.createSceneStatus === RequestStatus.Getting}
-              >
-                <Text id="newScene.createSceneButton" />
-              </button>
-            </div>
 
             <div class="form-group">
               <label class="form-label">
@@ -85,6 +76,16 @@ const NewScenePage = ({ children, ...props }) => (
                 ))}
               </div>
             </div>
+
+            <div class="form-footer">
+              <button
+                onClick={props.createScene}
+                className="btn btn-primary btn-block"
+                disabled={props.createSceneStatus === RequestStatus.Getting}
+              >
+                <Text id="newScene.createSceneButton" />
+              </button>
+            </div>
           </div>
         </form>
       </div>