Merge pull request #1374 from City-of-Helsinki/release-3.10.1

Release 3.10.1

.github/workflows/development.yml

@@ -64,6 +64,7 @@ jobs:
             packages/react/storybook-static
             packages/react/.lokirc.json
           retention-days: 1
+          include-hidden-files: true
 
   visual-tests:
     needs: build-test
@@ -101,4 +102,5 @@ jobs:
         with:
           name: loki_images_${{ matrix.loki_configuration }}_${{ steps.sanitize_artifact_name.outputs.value }}
           path: .loki/difference/*.*
+          include-hidden-files: true
         if: failure()

.github/workflows/e2e-tests.yml

@@ -49,6 +49,7 @@ jobs:
         with:
           name: e2e_test_report
           path: e2e/report/**
+          include-hidden-files: true
         # if: failure()
 
       - name: Publish Test Results

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.10.1] - Oct, 09, 2024
+
+### React
+
+#### Fixed
+
+- [Logo] Fixed data-testid attribute not being set with native props
+- [Login] Fixed GraphQLModule exports
+
 ## [3.10.0] - Sep, 04, 2024
 
 ### React

e2e/package.json

@@ -2,7 +2,7 @@
   "name": "e2e",
   "private": true,
   "description": "e2e tests using Playwright",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "scripts": {
     "inst": "yarn playwright install",
     "ci": "npx playwright test",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hds-core",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Core styles for the Helsinki Design System",
   "homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "@storybook/manager-webpack5": "^6.5.16",
     "copyfiles": "2.2.0",
     "cssnano": "4.1.10",
-    "hds-design-tokens": "3.10.0",
+    "hds-design-tokens": "3.10.1",
     "postcss": "8.2.15",
     "postcss-cli": "8.3.1",
     "postcss-import": "12.0.1",

packages/design-tokens/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hds-design-tokens",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Design tokens for the Helsinki Design System",
   "homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
   "license": "MIT",

packages/hds-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hds-js",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "Vanilla js for the Helsinki Design System",
   "homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
   "license": "MIT",
@@ -14,7 +14,7 @@
     "http-status-typed": "^1.0.1",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
-    "oidc-client-ts": "^2.2.2"
+    "oidc-client-ts": "^2.4.1"
   },
   "scripts": {
     "prepublishOnly": "cp -r ./lib/. ."

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hds-react",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "description": "React components for the Helsinki Design System",
   "homepage": "https://github.com/City-of-Helsinki/helsinki-design-system#readme",
   "license": "MIT",
@@ -128,7 +128,7 @@
     "@hookform/resolvers": "^2.9.11",
     "@juggle/resize-observer": "3.2.0",
     "@popperjs/core": "2.11.5",
-    "@react-aria/visually-hidden": "3.8.0",
+    "@react-aria/visually-hidden": "3.8.16",
     "@react-spring/web": "9.3.0",
     "@types/cookie": "^0.4.1",
     "@typescript-eslint/parser": "^6.19.0",
@@ -138,13 +138,13 @@
     "date-fns": "2.16.1",
     "downshift": "6.0.6",
     "graphql": "^16.8.1",
-    "hds-core": "3.10.0",
+    "hds-core": "3.10.1",
     "http-status-typed": "^1.0.1",
     "jwt-decode": "^3.1.2",
     "kashe": "1.0.4",
     "lodash": "^4.17.21",
     "memoize-one": "5.2.1",
-    "oidc-client-ts": "^2.2.2",
+    "oidc-client-ts": "^2.4.1",
     "postcss": "^8.4.21",
     "react-hook-form": "^7.43.3",
     "react-merge-refs": "1.1.0",

packages/react/src/components/header/components/headerActionBar/HeaderActionBarNavigationMenu.tsx

@@ -507,9 +507,14 @@ export const HeaderActionBarNavigationMenu = ({
   };
 
   const { isClosingOrOpening } = getState();
+  const canMenuBeHidden = !mobileMenuOpen && !isClosingOrOpening;
   return (
     <div
-      className={classNames(styles.headerNavigationMenu, mobileMenuOpen && styles.mobileMenuOpen)}
+      className={classNames(
+        styles.headerNavigationMenu,
+        mobileMenuOpen && styles.mobileMenuOpen,
+        canMenuBeHidden ? styles.hidden : styles.visible,
+      )}
       id="hds-mobile-menu"
       onTransitionEnd={animationDone}
     >

packages/react/src/components/header/components/headerActionBar/__snapshots__/HeaderActionBarNavigationMenu.test.tsx.snap

@@ -90,7 +90,7 @@ exports[`<HeaderActionBarNavigationMenu /> spec renders the component and menu c
           </div>
         </div>
         <div
-          class="headerNavigationMenu mobileMenuOpen"
+          class="headerNavigationMenu mobileMenuOpen visible"
           id="hds-mobile-menu"
         >
           <div

packages/react/src/components/login/Login.stories.tsx

@@ -35,15 +35,16 @@ import {
   sessionPollerErrors,
   LoginProvider,
   LoginProviderProps,
+  useGraphQL,
+  useGraphQLModule,
+  createGraphQLModule,
 } from './index';
 import { Button } from '../button/Button';
 import { Header } from '../header/Header';
 import { Notification } from '../notification/Notification';
 import { Tabs } from '../tabs/Tabs';
 import { Logo, logoFi } from '../logo';
-import { createGraphQLModule } from './graphQLModule/graphQLModule';
 import { MyProfileQuery } from './graphQLModule/demoData/MyProfileQuery';
-import { useGraphQL, useGraphQLModule } from './graphQLModule/hooks';
 import { LoadingSpinner } from '../loadingSpinner';
 
 type StoryArgs = {

packages/react/src/components/login/index.ts

@@ -12,6 +12,7 @@ export * from './client/hooks';
 export * from './beacon/hooks';
 export * from './apiTokensClient/hooks';
 export * from './sessionPoller/hooks';
+export * from './graphQLModule/hooks';
 
 // vanilla js code
 export * from './index.vanilla-js';

packages/react/src/components/login/testUtils/userTestUtil.ts

@@ -59,6 +59,7 @@ export function createSignInResponse({
     session_state: String(`${Math.random()}${Math.random()}`),
     state: '',
     token_type: 'Bearer',
+    url_state: undefined,
     userState: {},
     expires_in,
     isOpenId: true,

packages/react/src/components/logo/Logo.test.tsx

@@ -28,6 +28,23 @@ describe('<Logo /> spec', () => {
       getElementAttributesMisMatches(element, {
         ...imgProps,
         dataTestId: undefined,
+        'data-testid': imgProps.dataTestId,
+      } as HTMLAttributes<HTMLImageElement>),
+    ).toHaveLength(0);
+  });
+  it('The data-testid works and overrides dataTestId', async () => {
+    const propsWithDataTestId = {
+      'data-testid': 'data-testid',
+      dataTestId: 'dataTestId',
+    };
+    const { getByTestId } = render(
+      <Logo {...propsWithDataTestId} src="dummyPath" alt="logo" title="Helsingin kaupunki" />,
+    );
+    const element = getByTestId(propsWithDataTestId['data-testid']);
+    expect(
+      getElementAttributesMisMatches(element, {
+        ...propsWithDataTestId,
+        dataTestId: undefined,
       } as HTMLAttributes<HTMLImageElement>),
     ).toHaveLength(0);
   });

packages/react/src/components/logo/Logo.tsx

@@ -81,12 +81,12 @@ export type LogoProps = AllElementPropsWithoutRef<'img'> &
 
 export const Logo = ({ alt, className, dataTestId, size = 'full', style, ...rest }: LogoProps) => {
   const props = {
+    'data-testid': dataTestId,
     ...rest,
     alt,
     size,
     className: classNames(styles.logo, size !== 'full' && styles[size], className),
     style,
-    'data-testid': dataTestId,
   };
 
   return <img alt={alt} {...props} />;

release/icon-kit-template-CHANGELOG.txt

@@ -1,4 +1,4 @@
-# Helsinki Design System, Icon kit, version 3.10.0
+# Helsinki Design System, Icon kit, version 3.10.1
 
 ## CHANGELOG
 

site/package.json

@@ -2,7 +2,7 @@
   "name": "site",
   "private": true,
   "description": "Documentation for Helsinki Design System",
-  "version": "3.10.0",
+  "version": "3.10.1",
   "workspaces": {
     "nohoist": [
       "gatsby",
@@ -50,9 +50,9 @@
     "crypto-browserify": "^3.11.0",
     "eslint": "8.56.0",
     "eslint-config-react-app": "^7.0.1",
-    "hds-core": "3.10.0",
-    "hds-design-tokens": "3.10.0",
-    "hds-react": "3.10.0",
+    "hds-core": "3.10.1",
+    "hds-design-tokens": "3.10.1",
+    "hds-react": "3.10.1",
     "inquirer": "7.1.0",
     "postcss": "8",
     "prettier": "2.5.1",