merge main

equinor · Apr 25, 2024 · 0711d3d · 0711d3d
2 parents bcd3932 + 0628564
commit 0711d3d
Show file tree

Hide file tree

Showing 10 changed files with 6,494 additions and 5,108 deletions.
diff --git a/.github/actions/pnpm-setup/action.yaml b/.github/actions/pnpm-setup/action.yaml
@@ -6,12 +6,12 @@ runs:
   steps:
     - uses: pnpm/action-setup@v2.2.4
       with:
-        version: 8.0.0
+        version: 9.0.5
 
     - name: Setup Node.js environment
       uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 20
         cache: 'pnpm'
 
     - name: Install dependencies

diff --git a/Contribution.md → CONTRIBUTING.md b/Contribution.md → CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributions
+# Contributing
 
 ## Table of content
 

diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@
 [![GitHub issues by-label](https://img.shields.io/github/issues/equinor/fusion-workspace/bug?label=%F0%9F%90%9B%20bug%20issues&color=red)](https://github.com/equinor/fusion-workspace/issues?q=is%3Aissue+is%3Aopen+label%3Abug)
 [![GitHub issues](https://img.shields.io/github/issues/equinor/fusion-workspace)](https://github.com/equinor/fusion-workspace/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr-raw/equinor/fusion-workspace)](https://github.com/equinor/fusion-workspace/pulls)
+![SCM Compliance](https://scm-compliance-api.radix.equinor.com/repos/equinor/fusion-workspace/badge)
+![Known Vulnerabilities](https://snyk.io/test/github/equinor/fusion-workspace/badge.svg)
 
 > Fusion Workspace is a library built with a controller-based structure in mind. Core functionality tab navigation, data handling, and allowing you to register controllers that react around page change / config change and data changes.
 

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "first-time-setup": "npm i -g pnpm@8.0.0 turbo && pnpm i",
+    "first-time-setup": "npm i -g pnpm@9.0.5 turbo && pnpm i",
     "build": "turbo run build",
     "test": "turbo run test",
     "documentation": "pnpx astro dev --root ./documentation",
@@ -14,7 +14,7 @@
     "dev": "turbo run dev --filter ./apps/**"
   },
   "private": true,
-  "packageManager": "pnpm@8.0.0",
+  "packageManager": "pnpm@9.0.5",
   "dependencies": {
     "tslib": "^2.3.0"
   },
@@ -28,5 +28,8 @@
     "turbo": "^1.9.3",
     "typescript": "~5.0.2",
     "typescript-plugin-styled-components": "^2.0.0"
+  },
+  "engines": {
+    "node": "20"
   }
 }
diff --git a/packages/garden/package.json b/packages/garden/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-garden",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/garden/src/lib/components/GardenItemContainer/GardenItemContainer.tsx b/packages/garden/src/lib/components/GardenItemContainer/GardenItemContainer.tsx
@@ -83,7 +83,7 @@ export const GardenItemContainer = <TData extends Record<PropertyKey, unknown>,
 
   const expand = useExpand();
 
-  const isColumnExpanded = !!expand.expandedColumns.find((s) => s === virtualColumn.index);
+  const isColumnExpanded = expand.expandedColumns.includes(virtualColumn.index);
 
   const {
     groupingService: { groupingKeys, timeInterval, dateVariant },

diff --git a/packages/power-bi/package.json b/packages/power-bi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-powerbi",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/power-bi/src/lib/components/quickFilterGroup/QuickFilterGroup.tsx b/packages/power-bi/src/lib/components/quickFilterGroup/QuickFilterGroup.tsx
@@ -1,6 +1,7 @@
 import { Icon } from '@equinor/eds-core-react';
 import { tokens } from '@equinor/eds-tokens';
-import { useState, useRef } from 'react';
+import { useRef, useState } from 'react';
+import styled from 'styled-components';
 import { ActiveFilter, PowerBiFilter, PowerBiFilterItem } from '../../types';
 import { getFilterHeaderText } from '../../utils/getFilterHeader';
 import { FilterController } from '../Filter/Filter';
@@ -27,6 +28,7 @@ export const PowerBiFilterGroup = ({
 
   return (
     <>
+      {isOpen && <StyledOverlay onClick={() => setIsOpen(false)} />}
       <StyledFilterGroupWrapper onClick={() => setIsOpen((s) => !s)} ref={anchorEl}>
         <StyledFilterGroupContent>
           <div>
@@ -54,3 +56,13 @@ export const PowerBiFilterGroup = ({
     </>
   );
 };
+
+// Overlay to close the popover when clicking outside it
+const StyledOverlay = styled.div`
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+`;
diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",