Merge branch 'v2' of https://github.com/SoftUni-Internal/OpenJudgeSystem into v2-development

Author: gogo4ds

Servers/UI/OJS.Servers.Ui/ClientApp/.env.production

@@ -1,4 +1,5 @@
 VITE_UI_SERVER_URL = 'https://alpha.judge.softuni.org'
 VITE_ADMINISTRATION_URL = 'https://admin.alpha.judge.softuni.org'
 VITE_PLATFORM_URL = 'https://platform.softuni.bg'
-VITE_YOUTUBE_VIDEO_ID = 'EjQlqgTbvsE'
+VITE_YOUTUBE_VIDEO_ID = 'EjQlqgTbvsE'
+UNMINIFIED=true

Servers/UI/OJS.Servers.Ui/ClientApp/.env.staging

@@ -1,4 +1,5 @@
 VITE_UI_SERVER_URL = 'https://dev.alpha.judge.softuni.org'
 VITE_ADMINISTRATION_URL = 'https://admin.dev.alpha.judge.softuni.org'
 VITE_PLATFORM_URL = 'https://dev.platform.softuni.bg'
-VITE_YOUTUBE_VIDEO_ID = 'EjQlqgTbvsE'
+VITE_YOUTUBE_VIDEO_ID = 'EjQlqgTbvsE'
+UNMINIFIED=true

Servers/UI/OJS.Servers.Ui/ClientApp/src/components/guidelines/lists/List.tsx

@@ -85,7 +85,7 @@ const List = <TValue, >({
 
     const renderItems = useCallback(
         () => {
-            if (isNil(values) || isEmpty(values)) {
+            if (isNil(values) || isEmpty(values) || !Array.isArray(values)) {
                 return null;
             }
 

Servers/UI/OJS.Servers.Ui/ClientApp/src/pages/contests/ContestsPage.tsx

@@ -102,6 +102,16 @@ const ContestsPage = () => {
             return <div style={{ ...flexCenterObjectStyles }}><SpinningLoader /></div>;
         }
 
+        if (!Array.isArray(contests?.items)) {
+            console.log('The value of the contests is:');
+            console.log(contests);
+            return (
+                <Heading type={HeadingType.secondary} className={`${textColorClassName} ${styles.contestHeading}`}>
+                    The contests could not be loaded. If this problem persists, please contact an administrator.
+                </Heading>
+            );
+        }
+
         if (!contests?.items?.length) {
             return (
                 <Heading type={HeadingType.secondary} className={`${textColorClassName} ${styles.contestHeading}`}>

Servers/UI/OJS.Servers.Ui/ClientApp/vite.config.js

@@ -22,33 +22,38 @@ const forwardToAdmin = () => {
     }
 }
 
-export default defineConfig(({ mode }) => ({
-    appType: 'mpa', // Multi Page Application
-    build: {
-        sourcemap: mode === 'staging',
-        rollupOptions: {
-            input: {
-                main: resolve(__dirname, 'index.html'),
-                admin: resolve(__dirname, 'admin.html')
-            },
-            onwarn(warning, warn) {
-                if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {
-                    return
+export default defineConfig(({ mode }) => {
+    const isUnminified = process.env.UNMINIFIED === 'true';
+
+    return ({
+        appType: 'mpa', // Multi Page Application
+        build: {
+            minify: isUnminified ? false : 'esbuild',
+            sourcemap: isUnminified,
+            rollupOptions: {
+                input: {
+                    main: resolve(__dirname, 'index.html'),
+                    admin: resolve(__dirname, 'admin.html')
+                },
+                onwarn(warning, warn) {
+                    if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {
+                        return
+                    }
+                    warn(warning)
                 }
-                warn(warning)
-            }
+            },
         },
-    },
-    plugins: [
-        react(),
-        svgr(),
-        forwardToAdmin(),
-        visualizer({open: true, filename: 'bundle-analysis.html'}),
-    ],
-    server: {port: 5002},
-    resolve: {
-        alias: {
-            'src': resolve(__dirname, 'src'),
+        plugins: [
+            react(),
+            svgr(),
+            forwardToAdmin(),
+            visualizer({open: true, filename: 'bundle-analysis.html'}),
+        ],
+        server: {port: 5002},
+        resolve: {
+            alias: {
+                'src': resolve(__dirname, 'src'),
+            },
         },
-    },
-}));
+    });
+});