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

feat: ✨ new design for group by #488

Merged
merged 4 commits into from
Oct 10, 2023
Merged

feat: ✨ new design for group by #488

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
593784c
feat: :sparkles: new group by design init
espenkalle Oct 9, 2023
e68bf3a
feat: :sparkles: added slight shadow and animation
espenkalle Oct 10, 2023
e1b3962
refactor: :fire: removed old settings + bump
espenkalle Oct 10, 2023
cab1c14
fix: :bug: resolved
espenkalle Oct 10, 2023
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
15 changes: 8 additions & 7 deletions apps/test-app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<html>
<head>
<script type="module" src="./src/index.tsx" ></script>
</head>
<body>
<div id="root"></div>
</body>
</html>
<head>
<link rel="stylesheet" href="https://cdn.eds.equinor.com/font/equinor-font.css" />
<script type="module" src="./src/index.tsx"></script>
</head>
<body>
<div id="root"></div>
</body>
</html>
16 changes: 15 additions & 1 deletion apps/test-app/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ import { gridModule } from '@equinor/workspace-fusion/grid-module';
import { GroupingOption } from '@equinor/workspace-garden';
import React from 'react';
import { createRoot } from 'react-dom/client';
import { createGlobalStyle } from 'styled-components';

const GlobalStyle = createGlobalStyle`
body {
margin: 0;
padding: 0;
font-family: Equinor;
}
`;
export function App() {
return (
<Workspace<{ id: string }>
Expand Down Expand Up @@ -182,4 +190,10 @@ export function App() {

const container = document.getElementById('root')!;
const root = createRoot(container); // createRoot(container!) if you use TypeScript
root.render(<App />);

root.render(
<>
<GlobalStyle />
<App />
</>
);
2 changes: 1 addition & 1 deletion packages/workspace-fusion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/workspace-fusion",
"version": "5.2.2",
"version": "5.3.2",
"type": "module",
"sideEffects": false,
"license": "MIT",
Expand Down
146 changes: 78 additions & 68 deletions packages/workspace-fusion/src/modules/garden/components/GroupingSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { Autocomplete, Radio } from '@equinor/eds-core-react';
import { Autocomplete, Divider, Radio } from '@equinor/eds-core-react';
import { FilterState } from '@equinor/workspace-filter';
import { GardenDataSource, GroupingOption } from '@equinor/workspace-garden';
import { useQuery } from '@tanstack/react-query';
import { useRef } from 'react';
import styled from 'styled-components';
import { useOutsideClick } from '../../../lib/hooks/useGardenPopoverOutsideClick';

type GroupingSelectorProps = {
dataSource: GardenDataSource<FilterState>;
Expand All @@ -15,9 +14,6 @@ type GroupingSelectorProps = {
dateVariant: string | null;
onChangeTimeInterval: (timeInterval: string | null) => void;
onChangeDateVarient: (dateVariant: string | null) => void;
popoverRef: React.MutableRefObject<HTMLDivElement | null>;
iconRef: React.MutableRefObject<HTMLDivElement | null>;
close: VoidFunction;
};

export function GroupingSelector({
Expand All @@ -29,9 +25,6 @@ export function GroupingSelector({
onChangeTimeInterval,
onChangeDateVarient,
groupingKeys,
iconRef,
popoverRef,
close,
}: GroupingSelectorProps): JSX.Element | null {
const { data } = useQuery(['garden', ...groupingKeys, timeInterval, dateVariant, context], {
refetchOnWindowFocus: false,
Expand All @@ -44,14 +37,6 @@ export function GroupingSelector({

const selectorRef = useRef(null);

useOutsideClick(
() => {
close();
},
popoverRef,
iconRef
);

const setGardenKey = (key: string) => {
const foundGroupingOption = data?.allGroupingOptions.find((option) => option.groupingKey === key);
if (!foundGroupingOption) {
Expand Down Expand Up @@ -88,58 +73,75 @@ export function GroupingSelector({
}

return (
<StyledAutoCompleteWrapper>
<Autocomplete
ref={selectorRef}
key={groupingKeys[0]}
options={data.allGroupingOptions.map((option: GroupingOption) => option.groupingKey)}
label={'Column headers'}
hideClearButton
multiple={false}
selectedOptions={[groupingKeys[0]]}
onOptionsChange={(changes) => handleGardenKeyChange(changes.selectedItems[0])}
/>
{data.allGroupingOptions.map(
(groupingOption) =>
<>
<StyledGroupHeader>Groups</StyledGroupHeader>
<Divider />
<StyledAutoCompleteWrapper>
<Autocomplete
ref={selectorRef}
key={groupingKeys[0]}
options={data.allGroupingOptions.map((option: GroupingOption) => option.groupingKey)}
label={'Group by'}
hideClearButton
multiple={false}
selectedOptions={[groupingKeys[0]]}
onOptionsChange={(changes) => handleGardenKeyChange(changes.selectedItems[0])}
/>
<Autocomplete
options={data.validGroupingOptions}
label={'Then Group by'}
selectedOptions={[groupingKeys.at(1)]}
onOptionsChange={(changes) => handleExistingSelectionChange(changes.selectedItems[0])}
/>
</StyledAutoCompleteWrapper>

{data.allGroupingOptions.map((groupingOption) => {
// Check if dateVariant or timeInterval is defined
const hasDateVariant = !!groupingOption.dateVariant;
const hasTimeInterval = !!groupingOption.timeInterval;

if (!hasDateVariant && !hasTimeInterval) return null;

espenkalle marked this conversation as resolved.
Show resolved Hide resolved
return (
groupingOption.groupingKey === groupingKeys[0] && (
<RadioWrapper>
<RadioCategoryWrapper>
{groupingOption.timeInterval &&
groupingOption.timeInterval.map((dim) => (
<Radio
key={dim}
label={dim}
value={dim}
name="timeInterval"
checked={timeInterval?.trim().toLowerCase() === dim.trim().toLowerCase()}
onChange={(e) => onChangeTimeInterval(e.target.value)}
/>
))}
</RadioCategoryWrapper>
<RadioCategoryWrapper>
{groupingOption.dateVariant &&
groupingOption.dateVariant.map((typ) => (
<Radio
key={typ}
label={typ}
value={typ}
name="dateVariant"
checked={dateVariant?.trim().toLowerCase() === typ.trim().toLowerCase()}
onChange={(e) => onChangeDateVarient(e.target.value)}
/>
))}
</RadioCategoryWrapper>
</RadioWrapper>
<>
<StyledGroupHeader>Views</StyledGroupHeader>
<Divider />
<RadioWrapper>
<StyledSubGroupHeader>Date Fields:</StyledSubGroupHeader>
<RadioCategoryWrapper>
{hasDateVariant &&
groupingOption.dateVariant?.map((typ) => (
<Radio
key={typ}
label={typ}
value={typ}
name="dateVariant"
checked={dateVariant?.trim().toLowerCase() === typ.trim().toLowerCase()}
onChange={(e) => onChangeDateVarient(e.target.value)}
/>
))}
</RadioCategoryWrapper>
<StyledSubGroupHeader>Time Intervals:</StyledSubGroupHeader>
<RadioCategoryWrapper>
{hasTimeInterval &&
groupingOption.timeInterval?.map((dim) => (
<Radio
key={dim}
label={dim}
value={dim}
name="timeInterval"
checked={timeInterval?.trim().toLowerCase() === dim.trim().toLowerCase()}
onChange={(e) => onChangeTimeInterval(e.target.value)}
/>
))}
</RadioCategoryWrapper>
</RadioWrapper>
</>
)
)}

<Autocomplete
options={data.validGroupingOptions}
label={'Group by'}
selectedOptions={[groupingKeys.at(1)]}
onOptionsChange={(changes) => handleExistingSelectionChange(changes.selectedItems[0])}
/>
</StyledAutoCompleteWrapper>
);
})}
</>
);
}

Expand All @@ -150,10 +152,18 @@ export const StyledAutoCompleteWrapper = styled.div`
gap: 1em;
`;

export const StyledGroupHeader = styled.div`
font-weight: 500px;
padding-top: 2rem;
`;
export const StyledSubGroupHeader = styled.div`
padding-left: 1rem;
padding-top: 1rem;
`;
export const RadioWrapper = styled.div`
display: flex;
align-items: center;
flex-direction: row;
align-items: start;
flex-direction: column;
gap: 1em;
`;

Expand Down
115 changes: 0 additions & 115 deletions ...es/workspace-fusion/src/modules/garden/components/workspace-header/GardenViewSettings.tsx
View file
Open in desktop

This file was deleted.

Loading
Loading