feat: add display name to grouping keys

.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

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: CI
+name: 🔨CI
 on:
   push:
     branches:

.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:

.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}

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",

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<TContext>({
           <Autocomplete
             ref={selectorRef}
             key={groupingKeys[0]}
-            options={gardenMetaQuery.data.allGroupingOptions.map((option: GroupingOption) => 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)}
           />
           <Autocomplete
             options={gardenMetaQuery.data.validGroupingOptions}
             label={'Then Group by'}
-            selectedOptions={[groupingKeys.at(1)]}
-            onOptionsChange={(changes) => 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)}
           />
         </StyledAutoCompleteWrapper>
 

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;
 };

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"
+  }
 }