Merge master into hflatval/node-cache

cognitedata · Aug 16, 2023 · bc0bbc4 · bc0bbc4
2 parents 7fe16ad + 776454a
commit bc0bbc4
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 94 deletions.
diff --git a/react-components/package.json b/react-components/package.json
@@ -45,7 +45,7 @@
     "@types/three": "0.155.0",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard-with-typescript": "latest",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.25.2",

diff --git a/react-components/src/components/RevealToolbar/HelpButton.tsx b/react-components/src/components/RevealToolbar/HelpButton.tsx
@@ -2,7 +2,7 @@
  * Copyright 2023 Cognite AS
  */
 
-import { useState, type ReactElement } from 'react';
+import { type ReactElement } from 'react';
 
 import { Button, Dropdown } from '@cognite/cogs.js';
 import styled from 'styled-components';
@@ -11,12 +11,6 @@ import { TouchNavigation } from './Help/TouchNavigation';
 import { KeyboardNavigation } from './Help/KeyboardNavigation';
 
 export const HelpButton = (): ReactElement => {
-  const [, setHelpEnabled] = useState<boolean>(false);
-
-  const showHelp = (): void => {
-    setHelpEnabled((prevState) => !prevState);
-  };
-
   return (
     <Dropdown
       appendTo={document.body}
@@ -28,7 +22,7 @@ export const HelpButton = (): ReactElement => {
         </StyledMenu>
       }
       placement="right">
-      <Button type="ghost" icon="Help" aria-label="help-button" onClick={showHelp} />
+      <Button type="ghost" icon="Help" aria-label="help-button" />
     </Dropdown>
   );
 };

diff --git a/react-components/src/components/RevealToolbar/LayersContainer/elements.ts b/react-components/src/components/RevealToolbar/LayersContainer/elements.ts
@@ -2,17 +2,9 @@
  * Copyright 2023 Cognite AS
  */
 
-import { Checkbox, Chip, Menu } from '@cognite/cogs.js';
+import { Chip, Menu } from '@cognite/cogs.js';
 import styled from 'styled-components';
 
-export const StyledCheckbox = styled(Checkbox)`
-  margin-left: 10px;
-`;
-
-export const StyledMenu = styled(Menu)`
-  padding: 6px;
-`;
-
 export const StyledSubMenu = styled(Menu)`
   padding: 8px;
   overflow-y: auto;

diff --git a/react-components/src/utilities/constants.ts b/react-components/src/utilities/constants.ts
@@ -5,4 +5,3 @@
 export const DEFAULT_QUERY_STALE_TIME = 1000 * 60 * 10; // 10 minutes
 export const METERS_TO_FEET = 3.28084;
 export const FEET_TO_INCHES = 12;
-export const FIDELITY_MULTIPLIER = 3;
diff --git a/react-components/yarn.lock b/react-components/yarn.lock
diff --git a/viewer/package.json b/viewer/package.json
@@ -90,7 +90,7 @@
     "@types/jsdom": "21.1.1",
     "@types/lodash": "4.14.197",
     "@types/mixpanel-browser": "2.47.1",
-    "@types/node": "18.17.4",
+    "@types/node": "18.17.5",
     "@types/random-seed": "0.3.3",
     "@types/skmeans": "0.11.4",
     "@types/stats": "0.16.30",
@@ -101,8 +101,8 @@
     "concurrently": "8.2.0",
     "cross-env": "7.0.3",
     "dat.gui": "0.7.9",
-    "eslint": "8.46.0",
-    "eslint-config-prettier": "8.10.0",
+    "eslint": "8.47.0",
+    "eslint-config-prettier": "9.0.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-jsdoc": "46.4.6",
     "eslint-plugin-lodash": "7.4.0",
@@ -124,7 +124,7 @@
     "nock": "13.3.2",
     "prettier": "3.0.1",
     "process": "0.11.10",
-    "puppeteer": "20.9.0",
+    "puppeteer": "21.0.1",
     "random-seed": "0.3.0",
     "raw-loader": "4.0.2",
     "remove-files-webpack-plugin": "1.5.0",

diff --git a/viewer/yarn.lock b/viewer/yarn.lock