From 2646ab2dc63683b4d4983fe41af1d898fecfe5a2 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Fri, 16 Apr 2021 11:25:07 +0200 Subject: [PATCH 1/3] When multiple service url, take the first in alphabetical order --- package.json | 2 +- src/js/components/commons/service-card/card-my-service.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 734db81d2..170166085 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "homepage": "https://datalab.sspcloud.fr", "name": "onyxia-ui", - "version": "0.7.47", + "version": "0.7.48", "license": "MIT", "devDependencies": { "@storybook/addon-actions": "^6.1.11", diff --git a/src/js/components/commons/service-card/card-my-service.tsx b/src/js/components/commons/service-card/card-my-service.tsx index 99924d0aa..f0107998c 100644 --- a/src/js/components/commons/service-card/card-my-service.tsx +++ b/src/js/components/commons/service-card/card-my-service.tsx @@ -162,7 +162,7 @@ const getLabel = (label: any) => (how: any) => () => ( ); const getServiceUrl = (service: Service) => - service.urls ? service.urls[0].split(',')[0] : undefined; + service.urls ? service.urls.sort()[0].split(',')[0] : undefined; export default CarteMonService; From bb372925e66459011f8232d73978f8cd81d4af03 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Fri, 16 Apr 2021 11:38:00 +0200 Subject: [PATCH 2/3] Bump version (changelog ignore) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 290b1bab9..bf5b0cdc5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "homepage": "https://datalab.sspcloud.fr", "name": "onyxia-ui", - "version": "0.7.48", + "version": "0.7.49", "license": "MIT", "devDependencies": { "@storybook/addon-actions": "^6.1.11", From cce14298d90332f8363663eac341f8bdc6535285 Mon Sep 17 00:00:00 2001 From: actions Date: Fri, 16 Apr 2021 09:43:54 +0000 Subject: [PATCH 3/3] Update changelog v0.7.49 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb694bce6..58697a80e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### **0.7.49** (2021-04-16) + +- When multiple service url, take the first in alphabetical order +- Account: editable text ok +- Account: Toggle +- Account: Language +- Account S3 init script +- First working draft of working Account row +- Account tabs done + ### **0.7.48** (2021-04-14) - Update package.json