diff --git a/.github/helpers/src/issue-checker.ts b/.github/helpers/src/issue-checker.ts index 070020eca..095b84225 100644 --- a/.github/helpers/src/issue-checker.ts +++ b/.github/helpers/src/issue-checker.ts @@ -52,7 +52,7 @@ async function checkIssues(client: Octo, pr: number) { id number title - timelineItems(first: 100, itemTypes: [CONNECTED_EVENT]) { + timelineItems(first: 100, itemTypes: [CONNECTED_EVENT, CROSS_REFERENCED_EVENT]) { __typename ... on PullRequestTimelineItemsConnection{ totalCount diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9102add5..ec90410fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: CI +name: 🔨CI on: push: branches: diff --git a/.github/workflows/pr-issue-check.yml b/.github/workflows/pr-issue-check.yml index 6c94bded7..b5a4d33c3 100644 --- a/.github/workflows/pr-issue-check.yml +++ b/.github/workflows/pr-issue-check.yml @@ -1,4 +1,4 @@ -name: Verify linked issue +name: 👮Verify linked issue # This action works with pull requests and pushes permissions: @@ -18,7 +18,7 @@ permissions: statuses: read, } on: - workflow_dispatch: + pull_request: jobs: issue-check: diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 8aab9dd19..2f8007b92 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -1,25 +1,25 @@ -name: Prettify +name: 💄Prettify # This action works with pull requests and pushes on: - pull_request: - push: - branches: - - main + pull_request: + push: + branches: + - main jobs: - prettier: - runs-on: ubuntu-latest + prettier: + runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - # Make sure the actual branch is checked out when running on pull requests - ref: ${{ github.head_ref }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + # Make sure the actual branch is checked out when running on pull requests + ref: ${{ github.head_ref }} - - name: Prettify code - uses: creyD/prettier_action@v4.3 - with: - # This part is also where you can pass other options, for example: - prettier_options: --write **/*.{js,md,ts,tsx} + - name: Prettify code + uses: creyD/prettier_action@v4.3 + with: + # This part is also where you can pass other options, for example: + prettier_options: --write **/*.{js,md,ts,tsx} diff --git a/packages/garden/package.json b/packages/garden/package.json index 54cc7e526..4216893aa 100644 --- a/packages/garden/package.json +++ b/packages/garden/package.json @@ -1,6 +1,6 @@ { "name": "@equinor/workspace-garden", - "version": "6.0.3", + "version": "7.0.0", "type": "module", "sideEffects": false, "license": "MIT", diff --git a/packages/garden/src/lib/components/GroupingSelector/GroupingSelector.tsx b/packages/garden/src/lib/components/GroupingSelector/GroupingSelector.tsx index b9c78a6e9..359d8a532 100644 --- a/packages/garden/src/lib/components/GroupingSelector/GroupingSelector.tsx +++ b/packages/garden/src/lib/components/GroupingSelector/GroupingSelector.tsx @@ -1,6 +1,5 @@ import { Autocomplete, CircularProgress, Divider, EdsProvider, Label, Radio } from '@equinor/eds-core-react'; import { Fragment, startTransition, useRef } from 'react'; -import { GroupingOption } from '../../types'; import { RadioButtonWrapper, RadioCategoryWrapper, @@ -83,18 +82,22 @@ export function GroupingSelector({ option.groupingKey)} + options={gardenMetaQuery.data.allGroupingOptions} label={'Group by'} + optionLabel={(s) => s?.displayName ?? s?.groupingKey ?? ''} hideClearButton multiple={false} - selectedOptions={[groupingKeys[0]]} - onOptionsChange={(changes) => handleGardenKeyChange(changes.selectedItems[0])} + selectedOptions={[gardenMetaQuery.data.allGroupingOptions.find((s) => s.groupingKey == groupingKeys[0])]} + onOptionsChange={(changes) => handleGardenKeyChange(changes.selectedItems[0]?.groupingKey)} /> handleExistingSelectionChange(changes.selectedItems[0])} + selectedOptions={[ + gardenMetaQuery.data.allGroupingOptions.find((s) => s.groupingKey === groupingKeys.at(1)), + ]} + optionLabel={(s) => s?.displayName ?? s?.groupingKey ?? ''} + onOptionsChange={(changes) => handleExistingSelectionChange(changes.selectedItems[0]?.groupingKey)} /> diff --git a/packages/garden/src/lib/types/index.ts b/packages/garden/src/lib/types/index.ts index 3126047d1..1dcea6fcc 100644 --- a/packages/garden/src/lib/types/index.ts +++ b/packages/garden/src/lib/types/index.ts @@ -14,7 +14,7 @@ export type GardenMeta = { columnCount: number; rowCount: number; allGroupingOptions: GroupingOption[]; - validGroupingOptions: string[]; + validGroupingOptions: GroupingOption[]; columnWidth?: number; }; @@ -55,6 +55,7 @@ export type GardenHeaderGroup = { export type GroupingOption = { groupingKey: string; + displayName: string; timeInterval: string[] | null; dateVariant: string[] | null; }; diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json index 547903bbb..24fae85c9 100644 --- a/packages/workspace-fusion/package.json +++ b/packages/workspace-fusion/package.json @@ -1,6 +1,6 @@ { "name": "@equinor/workspace-fusion", - "version": "6.1.2", + "version": "7.0.0", "type": "module", "sideEffects": false, "license": "MIT", @@ -18,6 +18,40 @@ "files": [ "dist" ], + "typesVersions": { + ">=4.2": { + ".": [ + "dist/types/index" + ], + "garden": [ + "dist/types/lib/integrations/garden/index" + ], + "grid": [ + "dist/types/lib/integrations/grid/index" + ], + "power-bi": [ + "dist/types/lib/integrations/power-bi/index" + ], + "filter": [ + "dist/types/lib/integrations/filter/index" + ], + "status-bar": [ + "dist/types/lib/integrations/status-bar/index" + ], + "sidesheet": [ + "dist/types/lib/integrations/sidesheet/index" + ], + "grid-module": [ + "dist/types/modules/grid/index" + ], + "power-bi-module": [ + "dist/types/modules/power-bi/index" + ], + "garden-module": [ + "dist/types/modules/garden/index" + ] + } + }, "exports": { ".": { "require": "./dist/index.cjs", @@ -106,6 +140,5 @@ "type": "git", "url": "git+https://github.com/equinor/fusion-workspace.git", "directory": "packages/workspace-fusion" - }, - "gitHead": "6407f12589214b96228ab87d32a211f7c1cd6ba4" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cfbce761c..8634c34ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5944,13 +5944,6 @@ packages: requiresBuild: true optional: true - /fsevents@2.3.3: - resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - requiresBuild: true - optional: true - /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}