Merge pull request #5474 from alkem-io/develop

Release: Whiteboards, Fixes

Author: valentinyanakiev

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@alkemio/client-web",
-  "version": "0.53.1",
+  "version": "0.53.2",
   "description": "Alkemio client, enabling users to interact with Challenges hosted on the Alkemio platform.",
   "author": "Alkemio Foundation",
   "repository": {
@@ -26,7 +26,7 @@
     "analyze": "source-map-explorer 'build/static/js/*.js'"
   },
   "dependencies": {
-    "@alkemio/excalidraw": "^0.16.1-alkemio-1",
+    "@alkemio/excalidraw": "^0.17.0-alkemio-2",
     "@alkemio/visualization": "0.1.6",
     "@apollo/client": "^3.6.9",
     "@elastic/apm-rum": "^5.12.0",

package.json

@@ -1895,6 +1895,7 @@ export type PlatformLocationsKeySpecifier = (
   | 'impact'
   | 'innovationLibrary'
   | 'inspiration'
+  | 'landing'
   | 'newuser'
   | 'opensource'
   | 'privacy'
@@ -1918,6 +1919,7 @@ export type PlatformLocationsFieldPolicy = {
   impact?: FieldPolicy<any> | FieldReadFunction<any>;
   innovationLibrary?: FieldPolicy<any> | FieldReadFunction<any>;
   inspiration?: FieldPolicy<any> | FieldReadFunction<any>;
+  landing?: FieldPolicy<any> | FieldReadFunction<any>;
   newuser?: FieldPolicy<any> | FieldReadFunction<any>;
   opensource?: FieldPolicy<any> | FieldReadFunction<any>;
   privacy?: FieldPolicy<any> | FieldReadFunction<any>;

src/core/apollo/generated/apollo-helpers.ts

@@ -2687,7 +2687,12 @@ export const SpaceDashboardNavigationProfileFragmentDoc = gql`
     tagset {
       ...TagsetDetails
     }
-    visual(type: CARD) {
+    avatar: visual(type: AVATAR) {
+      id
+      uri
+      alternativeText
+    }
+    cardBanner: visual(type: CARD) {
       id
       uri
       alternativeText
@@ -3083,6 +3088,7 @@ export const ConfigurationFragmentDoc = gql`
     locations {
       environment
       domain
+      landing
       about
       blog
       feedback

src/core/apollo/generated/apollo-hooks.ts

@@ -3639,6 +3639,8 @@ export type PlatformLocations = {
   innovationLibrary: Scalars['String'];
   /** URL to a page about the collaboration tools */
   inspiration: Scalars['String'];
+  /** URL to the landing page of the platform */
+  landing: Scalars['String'];
   /** URL where new users can get onboarding help */
   newuser: Scalars['String'];
   /** URL for the link Opensource in the HomePage of the application */
@@ -26127,7 +26129,10 @@ export type SpaceDashboardNavigationChallengesQuery = {
                   type: TagsetType;
                 }
               | undefined;
-            visual?:
+            avatar?:
+              | { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined }
+              | undefined;
+            cardBanner?:
               | { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined }
               | undefined;
           };
@@ -26185,7 +26190,10 @@ export type SpaceDashboardNavigationOpportunitiesQuery = {
                         type: TagsetType;
                       }
                     | undefined;
-                  visual?:
+                  avatar?:
+                    | { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined }
+                    | undefined;
+                  cardBanner?:
                     | { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined }
                     | undefined;
                 };
@@ -26222,7 +26230,8 @@ export type SpaceDashboardNavigationProfileFragment = {
         type: TagsetType;
       }
     | undefined;
-  visual?: { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined } | undefined;
+  avatar?: { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined } | undefined;
+  cardBanner?: { __typename?: 'Visual'; id: string; uri: string; alternativeText?: string | undefined } | undefined;
 };
 
 export type SpaceDashboardNavigationContextFragment = {
@@ -28501,6 +28510,7 @@ export type ConfigurationQuery = {
         __typename?: 'PlatformLocations';
         environment: string;
         domain: string;
+        landing: string;
         about: string;
         blog: string;
         feedback: string;
@@ -28545,6 +28555,7 @@ export type ConfigurationFragment = {
     __typename?: 'PlatformLocations';
     environment: string;
     domain: string;
+    landing: string;
     about: string;
     blog: string;
     feedback: string;

src/core/apollo/generated/graphql-schema.ts

@@ -1,23 +1,18 @@
 import React from 'react';
 import { Button, ButtonProps, Link } from '@mui/material';
-import { useConfig } from '../../../domain/platform/config/useConfig';
-import { ButtonTypeMap } from '@mui/material/Button/Button';
-import { buildReturnUrlParam } from '../../../main/routing/urlBuilders';
 import { useLocation } from 'react-router-dom';
+import { ButtonTypeMap } from '@mui/material/Button/Button';
+import { buildLoginUrl } from '../../../main/routing/urlBuilders';
 
 const IdentityRouteLink = <D extends React.ElementType = ButtonTypeMap['defaultComponent'], P = {}>({
   children,
   to,
   ...props
 }: ButtonProps<D, P> & { to: string }) => {
-  const config = useConfig();
-
-  const rootUrl = config.authentication?.providers[0].config.issuer;
-
   const { pathname } = useLocation();
 
   return (
-    <Button component={Link} href={`${rootUrl}${to}${buildReturnUrlParam(pathname)}`} {...props}>
+    <Button component={Link} href={buildLoginUrl(pathname)} {...props}>
       {children}
     </Button>
   );