Different style fix

common-ui/components/locale-chooser/use-locales.ts

@@ -21,9 +21,9 @@ export default function useLocales(): UseLocalesResult {
   }
 
   const locales: { locale: Locale; label: string }[] = [
+    { locale: 'en', label: 'In English (EN)' },
     { locale: 'fi', label: 'Suomeksi (FI)' },
     { locale: 'sv', label: 'På svenska (SV)' },
-    { locale: 'en', label: 'In English (EN)' },
   ];
 
   return {

mscr-ui/src/common/components/smart-header/index.tsx

@@ -119,8 +119,9 @@ export default function SmartHeader({
         <HeaderContainer>
           <MarginContainer $breakpoint={breakpoint}>
             <HeaderWrapper $breakpoint={breakpoint}>
+              {renderLogo()}
               {renderHeaderSearch()}
-              {renderDesktopLocaleChooser()}
+              {/*renderDesktopLocaleChooser()*/}
               {renderMobileNavigationToggleButton()}
               {renderDesktopAuthenticationPanel()}
             </HeaderWrapper>
@@ -143,7 +144,7 @@ export default function SmartHeader({
             <div
               style={{ display: 'flex', padding: '20px 20px 0 0', gap: '10px' }}
             >
-              {renderDesktopLocaleChooser()}
+              {/*renderDesktopLocaleChooser()*/}
               {renderMobileNavigationToggleButton()}
               {renderDesktopAuthenticationPanel()}
             </div>

mscr-ui/src/common/components/smart-header/logo.tsx

@@ -13,10 +13,10 @@ export default function Logo() {
       <Link href="/" passHref>
         <SuomiLink href="" aria-label={t('navigate-to-homepage')}>
           <Image
-            src="/logo.svg"
-            width="186"
-            height="32"
-            alt={t('interoperability-logo-title')}
+            src="/supporting_eosc.png"
+            width="180"
+            height="50"
+            alt={'Supporting EOSC'}
           />
         </SuomiLink>
       </Link>

mscr-ui/src/common/interfaces/schema.interface.ts

@@ -18,6 +18,7 @@ export interface Schema {
   revision?: string;
   visibility?: string;
   created?: string;
+  modified: string;
   uri?: string;
   versionLabel?: string;
 }

mscr-ui/src/common/utils/create-getserversideprops.ts

@@ -89,7 +89,6 @@ export function createCommonGetServerSideProps<
           reduxKey: 'fakeableUsers',
           functionKey: 'getFakeableUsers',
         });
-        console.log(fakeableUsers);
         //store.dispatch(
         //   setAdminControls(process.env.ADMIN_CONTROLS_DISABLED === 'true')
         // );

mscr-ui/src/modules/front-page/index.tsx

@@ -21,8 +21,6 @@ export default function FrontPage() {
   const { t, i18n } = useTranslation('common');
   const { isSmall } = useBreakpoints();
   const { urlState } = useUrlState();
-  const { data: serviceCategoriesData, refetch: refetchServiceCategoriesData } =
-    useGetServiceCategoriesQuery(i18n.language);
   const { data: organizationsData, refetch: refetchOrganizationsData } =
     useGetOrganizationsQuery(i18n.language);
 
@@ -40,21 +38,10 @@ export default function FrontPage() {
     });
   }, [organizationsData, i18n.language]);
 
-  const serviceCategories = useMemo(() => {
-    if (!serviceCategoriesData) {
-      return [];
-    }
-
-    return serviceCategoriesData.map((category) => ({
-      id: category.identifier,
-      label: category.label[i18n.language],
-    }));
-  }, [serviceCategoriesData, i18n.language]);
 
   // Need to decide what data we want to fetch loading the application
   const refetchInfo = () => {
     refetchOrganizationsData();
-    refetchServiceCategoriesData();
   };
 
   return (

mscr-ui/src/modules/personal-home/index.tsx

@@ -9,7 +9,6 @@ export default function PersonalWorkspace({ pid, user }: PersonalHomeProps) {
   {
     return (
       <>
-        <p>This is the personal content page for user {user?.firstName}</p>
         <FrontPage></FrontPage>
       </>
     );

mscr-ui/src/modules/search-screen/index.tsx

@@ -16,6 +16,7 @@ import SearchFilterSet from '@app/common/components/search-filter-set';
 import { Bucket, Facet, Filter } from '@app/common/interfaces/search.interface';
 import { useTranslation } from 'next-i18next';
 import { Grid } from '@mui/material';
+import Layout from 'yti-common-ui/layout/layout';
 
 export default function SearchScreen() {
   const { urlState, patchUrlState } = useUrlState();
@@ -66,6 +67,7 @@ export default function SearchScreen() {
   }
 
   return (
+
     <SearchContainer>
       <Grid container justifyContent="space-between">
         <Grid item xs={2}>
@@ -91,6 +93,6 @@ export default function SearchScreen() {
           </CloseButton>
         </Grid>
       </Grid>
-    </SearchContainer>
+    </SearchContainer >  
   );
 }

mscr-ui/src/modules/search-screen/search-screen.styles.tsx

@@ -6,7 +6,7 @@ export const SearchContainer = styled(Block)`
   position: absolute;
   background-color: ${(props) => props.theme.suomifi.colors.depthLight3};
   z-index: 1;
-  width: 80vw;
+  width: 100%; 
 `;
 
 export const FacetsWrapper = styled(Block)`

mscr-ui/src/pages/schema/[...pid].tsx

@@ -6,6 +6,7 @@ import Layout from '@app/common/components/layout';
 import { SSRConfig } from 'next-i18next';
 import { createCommonGetServerSideProps } from '@app/common/utils/create-getserversideprops';
 import {
+  getServiceCategories,
   getRunningQueriesThunk as getServiceQueriesThunk,
 } from '@app/common/components/service-categories/service-categories.slice';
 import {
@@ -16,91 +17,40 @@ import { getRunningQueriesThunk as getInternalResourcesRunningQueriesThunk } fro
 import { getRunningQueriesThunk as getVisualizationRunningQueriesThunk } from '@app/common/components/visualization/visualization.slice';
 import { useRouter } from 'next/router';
 import { useGetSchemaQuery } from '@app/common/components/schema/schema.slice';
+import { Schema } from '@app/common/interfaces/schema.interface';
 import UpdateWithFileModal from '@app/common/components/update-with-file-modal';
 import Separator from 'yti-common-ui/components/separator';
 import { BasicBlock, BasicBlockExtraWrapper } from 'yti-common-ui/block';
 import { MscrUser } from '@app/common/interfaces/mscr-user.interface';
-import SchemaView from '@app/modules/schema-view';
+import SchemaView from "@app/modules/schema-view";
 
 interface IndexPageProps extends CommonContextState {
   _netI18Next: SSRConfig;
   user: MscrUser;
   schemaId: string;
 }
 
-
 export default function SchemaPage(props: IndexPageProps) {
   const { query, asPath } = useRouter();
   const schemaId = (query?.pid ?? '') as string;
-
-
-  const { data, isLoading, isSuccess, isError, error } =
-    useGetSchemaQuery(schemaId);
-
-  function renderSchema() {
-    let schemaContent;
-    if (isLoading) {
-      schemaContent = (
-        <div className="d-flex justify-content-center">
-          <div className="spinner-border" role="status">
-            <span className="visually-hidden">Loading...</span>
-          </div>
-        </div>
-      );
-    } else if (isSuccess) {
-      if (data) {
-        schemaContent = (
-          <div className="col-lg-12 mb-3 ">
-            <div className="card">
-              <div className="card-body">
-                <BasicBlock title={'Schema Name'}>{data.label?.en}</BasicBlock>
-                <BasicBlock title={'Schema Name'}>
-                  {data.description?.en}
-                </BasicBlock>
-                <BasicBlock title={'Schema created'}>{data.created}</BasicBlock>
-                <BasicBlock title={'Schema Visibilty'}>
-                  {data.visibility}
-                </BasicBlock>
-                <BasicBlock title={'Schema Version'}>
-                  {data.versionLabel}
-                </BasicBlock>
-                <BasicBlock title={'Schema Status'}>{data.status}</BasicBlock>
-                <BasicBlock title={'Schema format'}>{data.format}</BasicBlock>
-              </div>
-            </div>
-            <Separator />
-            <BasicBlockExtraWrapper>
-              <UpdateWithFileModal
-                pid={schemaId}
-                refetch={function (): void {
-                  throw new Error('Function not implemented.');
-                }}
-              />
-            </BasicBlockExtraWrapper>
-          </div>
-        );
-      }
-    }
-
-    return schemaContent;
-  }
-
+
   return (
     <CommonContextProvider value={props}>
       <Layout
         user={props.user ?? undefined}
         fakeableUsers={props.fakeableUsers}
       >
-
+        {/*{renderSchema()}*/}
+        <SchemaView schemaId={schemaId} />
       </Layout>
     </CommonContextProvider>
   );
 }
 
 export const getServerSideProps = createCommonGetServerSideProps(
   async ({ store, query, locale }) => {
-
-    store.dispatch(getOrganizations.initiate(locale ?? 'en'));
+    store.dispatch(getServiceCategories.initiate(locale ?? 'fi'));
+    store.dispatch(getOrganizations.initiate(locale ?? 'fi'));
 
     await Promise.all(store.dispatch(getServiceQueriesThunk()));
     await Promise.all(store.dispatch(getOrgQueriesThunk()));
@@ -109,6 +59,8 @@ export const getServerSideProps = createCommonGetServerSideProps(
     );
     await Promise.all(store.dispatch(getVisualizationRunningQueriesThunk()));
 
-    return {};
+    return {
+      props: {},
+    };
   }
 );