Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 🚑 Fix Workspace Filters #611

Merged
merged 5 commits into from
Apr 29, 2024
Merged

🐛 🚑 Fix Workspace Filters #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91ac12e
Bumped dev deps and deps
kjellhaaland Apr 29, 2024
0e6536a
Bumped deps. Fixed astro bump issues
kjellhaaland Apr 29, 2024
0a754d7
Fixed bug with keeping previous data.
kjellhaaland Apr 29, 2024
8a8a967
Fixed hover effect
kjellhaaland Apr 29, 2024
2002059
Bumped package versions
kjellhaaland Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/helpers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"@actions/github": "^6.0.0",
"commander": "^12.0.0",
"markdown-table": "^3.0.3",
"tsx": "^4.7.1"
"tsx": "^4.7.3"
}
}
20 changes: 10 additions & 10 deletions apps/test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@equinor/eds-icons": "^0.17.0",
"@equinor/eds-tokens": "0.9.0",
"@equinor/workspace-fusion": "workspace:^",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13"
},
"peerDependencies": {
Expand All @@ -31,14 +31,14 @@
"styled-components": "^5.3.6"
},
"devDependencies": {
"@types/jest": "27.4.1",
"@types/react": "^18.0.25",
"@types/styled-components": "^5.1.26",
"@vitejs/plugin-react": "^3.1.0",
"@types/jest": "29.5.12",
"@types/react": "^18.3.1",
"@types/styled-components": "^5.1.34",
"@vitejs/plugin-react": "^4.2.1",
"rollup-plugin-inject-process-env": "^1.3.1",
"styled-components": "^5.3.6",
"typescript": "^5.0.2",
"vite": "^4.1.5",
"vite-plugin-cdn-import": "^0.3.5"
"styled-components": "^6.1.8",
"typescript": "^5.4.5",
"vite": "^5.2.10",
"vite-plugin-cdn-import": "^1.0.1"
}
}
26 changes: 13 additions & 13 deletions documentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@
"astro": "astro"
},
"dependencies": {
"@algolia/client-search": "^4.23.2",
"@astrojs/mdx": "^2.2.3",
"@astrojs/preact": "^3.1.2",
"@astrojs/react": "^3.1.0",
"@algolia/client-search": "^4.23.3",
"@astrojs/mdx": "^2.3.1",
"@astrojs/preact": "^3.2.0",
"@astrojs/react": "^3.3.1",
"@docsearch/css": "^3.6.0",
"@docsearch/react": "^3.6.0",
"@equinor/workspace-fusion": "workspace:*",
"@types/node": "^20.12.2",
"astro": "^4.5.13",
"preact": "^10.20.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"@types/node": "^20.12.7",
"astro": "^4.7.0",
"preact": "^10.20.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"react-mermaid3": "^1.0.1",
"styled-components": "^6.1.8"
},
"devDependencies": {
"@types/html-escaper": "^3.0.2",
"@types/react": "^18.0.27",
"@types/react-dom": "^18.0.10",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"html-escaper": "^3.0.3",
"typescript": "^5.0.2"
"typescript": "^5.4.5"
}
}
2 changes: 1 addition & 1 deletion documentation/src/components/Header/Header.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type Props = {
<SkipToContent />
<nav class="nav-wrapper" title="Top Navigation">
<div class="menu-toggle">
<SidebarToggle client:idle />
<SidebarToggle client:idle client:only="preact" />
</div>
<div class="logo flex">
<a href="/fusion-workspace">
Expand Down
2 changes: 1 addition & 1 deletion documentation/src/components/PageContent/PageContent.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const { title, headings } = Astro.props;
<section class="main-section">
<h1 class="content-title" id="overview">{title}</h1>
<nav class="block sm:hidden">
<TableOfContents client:media="(max-width: 50em)" headings={headings} />
<TableOfContents client:media="(max-width: 50em)" headings={headings} client:only="preact" />
</nav>
<slot />
</section>
Expand Down
2 changes: 1 addition & 1 deletion documentation/src/components/RightSidebar/MoreMenu.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import ThemeToggleButton from './ThemeToggleButton';
---

<div style="margin: 2rem 0; text-align: center;">
<ThemeToggleButton client:visible />
<ThemeToggleButton client:visible client:only="preact" />
</div>
2 changes: 1 addition & 1 deletion documentation/src/components/RightSidebar/RightSidebar.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { headings } = Astro.props;

<nav class="sidebar-nav" aria-labelledby="grid-right">
<div class="sidebar-nav-inner">
<TableOfContents client:media="(min-width: 50em)" headings={headings} />
<TableOfContents client:media="(min-width: 50em)" headings={headings} client:only="preact" />
</div>
</nav>

Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
"shipit": "turbo run build && pnpm -r publish",
"pr-shipit": "turbo run build && pnpm --filter ...[origin/main] pr-release",
"dev": "turbo run dev --filter ./apps/**",
"bump-deps": "pnpm up --latest --prod --recursive --interactive"
"bump-deps": "pnpm up --latest --recursive --interactive"
},
"private": true,
"packageManager": "[email protected]",
"dependencies": {
"tslib": "^2.6.2"
},
"devDependencies": {
"@changesets/cli": "^2.26.1",
"@typescript-eslint/eslint-plugin": "~5.24.0",
"@typescript-eslint/parser": "~5.24.0",
"prettier": "^2.6.2",
"tsup": "^8.0.1",
"tsx": "^4.6.2",
"turbo": "^1.9.3",
"typescript": "~5.0.2",
"typescript-plugin-styled-components": "^2.0.0"
"@changesets/cli": "^2.27.1",
"@typescript-eslint/eslint-plugin": "~7.7.1",
"@typescript-eslint/parser": "~7.7.1",
"prettier": "^3.2.5",
"tsup": "^8.0.2",
"tsx": "^4.7.3",
"turbo": "^1.13.3",
"typescript": "~5.4.5",
"typescript-plugin-styled-components": "^3.0.0"
},
"engines": {
"node": "20"
Expand Down
56 changes: 28 additions & 28 deletions packages/ag-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-ag-grid",
"version": "3.0.0",
"version": "3.0.1",
"type": "module",
"private": false,
"sideEffects": false,
Expand Down Expand Up @@ -32,24 +32,24 @@
}
},
"dependencies": {
"@ag-grid-community/client-side-row-model": "31.2.0",
"@ag-grid-community/core": "31.2.0",
"@ag-grid-community/react": "31.2.0",
"@ag-grid-enterprise/column-tool-panel": "31.2.0",
"@ag-grid-enterprise/excel-export": "31.2.0",
"@ag-grid-enterprise/filter-tool-panel": "31.2.0",
"@ag-grid-enterprise/master-detail": "31.2.0",
"@ag-grid-enterprise/menu": "31.2.0",
"@ag-grid-enterprise/multi-filter": "31.2.0",
"@ag-grid-enterprise/range-selection": "31.2.0",
"@ag-grid-enterprise/rich-select": "31.2.0",
"@ag-grid-enterprise/row-grouping": "31.2.0",
"@ag-grid-enterprise/server-side-row-model": "31.2.0",
"@ag-grid-enterprise/set-filter": "31.2.0",
"@ag-grid-enterprise/side-bar": "31.2.0",
"@ag-grid-enterprise/status-bar": "31.2.0",
"@ag-grid-community/client-side-row-model": "31.2.1",
"@ag-grid-community/core": "31.2.1",
"@ag-grid-community/react": "31.2.1",
"@ag-grid-enterprise/column-tool-panel": "31.2.1",
"@ag-grid-enterprise/excel-export": "31.2.1",
"@ag-grid-enterprise/filter-tool-panel": "31.2.1",
"@ag-grid-enterprise/master-detail": "31.2.1",
"@ag-grid-enterprise/menu": "31.2.1",
"@ag-grid-enterprise/multi-filter": "31.2.1",
"@ag-grid-enterprise/range-selection": "31.2.1",
"@ag-grid-enterprise/rich-select": "31.2.1",
"@ag-grid-enterprise/row-grouping": "31.2.1",
"@ag-grid-enterprise/server-side-row-model": "31.2.1",
"@ag-grid-enterprise/set-filter": "31.2.1",
"@ag-grid-enterprise/side-bar": "31.2.1",
"@ag-grid-enterprise/status-bar": "31.2.1",
"@equinor/eds-tokens": "^0.9.0",
"@equinor/fusion-react-ag-grid-styles": "^30.2.0",
"@equinor/fusion-react-ag-grid-styles": "^31.2.1",
"@equinor/fusion-react-styles": "^0.6.2"
},
"peerDependencies": {
Expand All @@ -60,16 +60,16 @@
"styled-components": ">= 5.0.0"
},
"devDependencies": {
"@ag-grid-enterprise/core": "30.2.1",
"@types/jest": "27.4.1",
"@types/react": ">= 16.8.0",
"@types/react-dom": "^18.0.8",
"@types/styled-components": "^5.1.26",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"styled-components": "^5.3.6",
"typescript": "^5.0.2"
"@ag-grid-enterprise/core": "31.2.1",
"@types/jest": "29.5.12",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/styled-components": "^5.1.34",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"styled-components": "^6.1.8",
"typescript": "^5.4.5"
},
"repository": {
"type": "git",
Expand Down
22 changes: 11 additions & 11 deletions packages/filter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-filter",
"version": "4.0.0",
"version": "4.0.1",
"type": "module",
"sideEffects": false,
"license": "MIT",
Expand Down Expand Up @@ -29,7 +29,7 @@
"@equinor/eds-core-react": "^0.28.0",
"@equinor/eds-icons": "^0.18.0",
"@equinor/eds-tokens": "^0.9.0",
"@tanstack/react-query": "^5.28.9",
"@tanstack/react-query": "^5.32.0",
"react-error-boundary": "^4.0.13",
"react-sortablejs": "^6.1.4",
"react-virtual": "^2.10.4",
Expand All @@ -42,15 +42,15 @@
"styled-components": "^5.3.5"
},
"devDependencies": {
"@types/jest": "27.4.1",
"@types/react": ">= 16.8.0",
"@types/sortablejs": "^1.15.0",
"@types/styled-components": "^5.1.26",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"styled-components": "^5.3.6",
"typescript": "^5.0.2"
"@types/jest": "29.5.12",
"@types/react": "^18.3.1",
"@types/sortablejs": "^1.15.8",
"@types/styled-components": "^5.1.34",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"styled-components": "^6.1.8",
"typescript": "^5.4.5"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/filter/src/lib/components/filterItem/filterItem.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const StyledFilterItemWrap = styled.div`
padding-right: 2px;
}
}
:hover {
&:hover {
background-color: ${tokens.colors.interactive.primary__selected_hover.rgba};
}
`;
3 changes: 2 additions & 1 deletion packages/filter/src/lib/context/filterContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { QueryClient, QueryClientProvider, UseQueryResult, useQuery } from '@tanstack/react-query';
import { QueryClient, QueryClientProvider, UseQueryResult, useQuery, keepPreviousData } from '@tanstack/react-query';
import { FilterStylesContext } from '../components/Filter';
import { FilterDataSource, FilterGroup, FilterStateGroup, FilterStyles } from '../types';
import { createContext, PropsWithChildren, ReactNode, useContext, useEffect, useRef, useState } from 'react';
Expand Down Expand Up @@ -74,6 +74,7 @@ export const FilterContextWrapper = ({
queryKey: ['filter-meta', JSON.stringify(filterState)],
queryFn: ({ signal }): Promise<FilterGroup[]> => dataSource.getFilterMeta(filterState, signal),
throwOnError: false,
placeholderData: keepPreviousData,
});

const setFilterStateHandler = (groups: FilterStateGroup[]) =>
Expand Down
24 changes: 12 additions & 12 deletions packages/garden/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-garden",
"version": "8.0.0",
"version": "8.0.1",
"type": "module",
"sideEffects": false,
"license": "MIT",
Expand Down Expand Up @@ -29,8 +29,8 @@
"@equinor/eds-core-react": "0.28.0",
"@equinor/eds-icons": "^0.18.0",
"@equinor/eds-tokens": "0.9.0",
"@tanstack/react-query": "^5.28.9",
"@tanstack/react-query-devtools": "^5.28.10",
"@tanstack/react-query": "^5.32.0",
"@tanstack/react-query-devtools": "^5.32.0",
"react-error-boundary": "^4.0.13",
"react-virtual": "^2.10.4"
},
Expand All @@ -41,15 +41,15 @@
"styled-components": "^5.3.6"
},
"devDependencies": {
"@types/jest": "27.4.1",
"@types/react": ">= 16.8.0",
"@types/react-dom": "^18.0.8",
"@types/styled-components": "^5.1.26",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"styled-components": "^5.3.6",
"typescript": "^5.0.2"
"@types/jest": "29.5.12",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/styled-components": "^5.1.34",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"styled-components": "^6.1.8",
"typescript": "^5.4.5"
},
"repository": {
"type": "git",
Expand Down
24 changes: 12 additions & 12 deletions packages/power-bi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-powerbi",
"version": "3.0.0",
"version": "3.0.1",
"type": "module",
"sideEffects": false,
"license": "MIT",
Expand Down Expand Up @@ -29,8 +29,8 @@
"@equinor/eds-core-react": "^0.28.0",
"@equinor/eds-icons": "^0.18.0",
"@equinor/eds-tokens": "^0.9.0",
"@tanstack/react-query": "^5.28.9",
"markdown-to-jsx": "^7.4.5",
"@tanstack/react-query": "^5.32.0",
"markdown-to-jsx": "^7.4.7",
"powerbi-client": "^2.23.1",
"powerbi-client-react": "^1.4.0",
"react-error-boundary": "^4.0.13",
Expand All @@ -45,15 +45,15 @@
"styled-components": "^5.3.5"
},
"devDependencies": {
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@types/sortablejs": "1",
"@types/styled-components": "^5.1.26",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"styled-components": "^5.3.6",
"typescript": "^5.0.2"
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/sortablejs": "^1.15.8",
"@types/styled-components": "^5.1.34",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-is": "^18.3.1",
"styled-components": "^6.1.8",
"typescript": "^5.4.5"
},
"repository": {
"type": "git",
Expand Down
Loading
Loading