) => {
const enhancedReducer = {
...renkuStateModelReducer,
@@ -126,12 +124,11 @@ export const createStore = (
immutableCheck: false,
serializableCheck: false,
})
- .concat(computeResourcesApi.middleware)
.concat(adminKeycloakApi.middleware)
.concat(adminSessionsApi.middleware)
+ .concat(computeResourcesApi.middleware)
.concat(connectedServicesApi.middleware)
.concat(dataConnectorsApi.middleware)
- // this is causing some problems, and I do not know why
.concat(datasetsCoreApi.middleware)
.concat(doiResolverApi.middleware)
.concat(inactiveKgProjectsApi.middleware)
@@ -149,14 +146,12 @@ export const createStore = (
.concat(sessionLaunchersV2Api.middleware)
.concat(sessionsApi.middleware)
.concat(sessionSidecarApi.middleware)
- .concat(sessionSidecarApi.middleware)
.concat(sessionsV2Api.middleware)
.concat(statuspageApi.middleware)
.concat(termsApi.middleware)
.concat(usersApi.middleware)
.concat(versionsApi.middleware)
.concat(workflowsApi.middleware),
- enhancers,
});
return store;
};
diff --git a/client/src/utils/helpers/HelperFunctions.js b/client/app/old-src/utils/helpers/HelperFunctions.js
similarity index 100%
rename from client/src/utils/helpers/HelperFunctions.js
rename to client/app/old-src/utils/helpers/HelperFunctions.js
diff --git a/client/src/utils/helpers/HelperFunctionsV2.ts b/client/app/old-src/utils/helpers/HelperFunctionsV2.ts
similarity index 100%
rename from client/src/utils/helpers/HelperFunctionsV2.ts
rename to client/app/old-src/utils/helpers/HelperFunctionsV2.ts
diff --git a/client/src/utils/helpers/KgSearchFunctions.ts b/client/app/old-src/utils/helpers/KgSearchFunctions.ts
similarity index 100%
rename from client/src/utils/helpers/KgSearchFunctions.ts
rename to client/app/old-src/utils/helpers/KgSearchFunctions.ts
diff --git a/client/src/utils/helpers/ProjectFunctions.ts b/client/app/old-src/utils/helpers/ProjectFunctions.ts
similarity index 100%
rename from client/src/utils/helpers/ProjectFunctions.ts
rename to client/app/old-src/utils/helpers/ProjectFunctions.ts
diff --git a/client/src/utils/helpers/RtkQueryErrorsContext.tsx b/client/app/old-src/utils/helpers/RtkQueryErrorsContext.tsx
similarity index 100%
rename from client/src/utils/helpers/RtkQueryErrorsContext.tsx
rename to client/app/old-src/utils/helpers/RtkQueryErrorsContext.tsx
diff --git a/client/src/utils/helpers/ServiceWorker.js b/client/app/old-src/utils/helpers/ServiceWorker.js
similarity index 100%
rename from client/src/utils/helpers/ServiceWorker.js
rename to client/app/old-src/utils/helpers/ServiceWorker.js
diff --git a/client/src/utils/helpers/SessionFunctions.ts b/client/app/old-src/utils/helpers/SessionFunctions.ts
similarity index 100%
rename from client/src/utils/helpers/SessionFunctions.ts
rename to client/app/old-src/utils/helpers/SessionFunctions.ts
diff --git a/client/src/utils/helpers/TextUtils.test.ts b/client/app/old-src/utils/helpers/TextUtils.test.ts
similarity index 100%
rename from client/src/utils/helpers/TextUtils.test.ts
rename to client/app/old-src/utils/helpers/TextUtils.test.ts
diff --git a/client/src/utils/helpers/TextUtils.ts b/client/app/old-src/utils/helpers/TextUtils.ts
similarity index 100%
rename from client/src/utils/helpers/TextUtils.ts
rename to client/app/old-src/utils/helpers/TextUtils.ts
diff --git a/client/src/utils/helpers/UseWindowsSize.tsx b/client/app/old-src/utils/helpers/UseWindowsSize.tsx
similarity index 100%
rename from client/src/utils/helpers/UseWindowsSize.tsx
rename to client/app/old-src/utils/helpers/UseWindowsSize.tsx
diff --git a/client/src/utils/helpers/kgPagination.utils.ts b/client/app/old-src/utils/helpers/kgPagination.utils.ts
similarity index 100%
rename from client/src/utils/helpers/kgPagination.utils.ts
rename to client/app/old-src/utils/helpers/kgPagination.utils.ts
diff --git a/client/src/utils/helpers/markdown.utils.js b/client/app/old-src/utils/helpers/markdown.utils.js
similarity index 100%
rename from client/src/utils/helpers/markdown.utils.js
rename to client/app/old-src/utils/helpers/markdown.utils.js
diff --git a/client/src/utils/helpers/markdownUtils.test.js b/client/app/old-src/utils/helpers/markdownUtils.test.js
similarity index 90%
rename from client/src/utils/helpers/markdownUtils.test.js
rename to client/app/old-src/utils/helpers/markdownUtils.test.js
index eb66636bd6..58302c1b49 100644
--- a/client/src/utils/helpers/markdownUtils.test.js
+++ b/client/app/old-src/utils/helpers/markdownUtils.test.js
@@ -148,7 +148,7 @@ describe("display latex in markdown", () => {
// eslint-disable-next-line max-len
'∫ f ( x ) d u ( x ) , ∫ f ( x ) d u ( x ) , ∫ f ( x ) d u ( x ) , This is a README with some LaTeX expressions that should render nicely:
\n" +
"Expression 1
\n" +
// eslint-disable-next-line max-len
- '\\int f(\\mathbf{x}) {\\rm d}u(\\mathbf{x}),&\n' +
+ '\\int f(\\mathbf{x}) {\\rm d}u(\\mathbf{x}),&\n' +
"
+
+ = ({ data }) => {
+ if (data == null || !data.ok) {
+ return DEFAULT_META;
+ }
+
+ const { name, description } = data.group;
+
+ const metaTitle = `${name} | Group on Renku`;
+ const metaDescription = description || DEFAULT_META_DESCRIPTION;
+
+ return [
+ {
+ title: metaTitle,
+ },
+ {
+ name: "description",
+ content: metaDescription,
+ },
+ {
+ property: "og:title",
+ content: metaTitle,
+ },
+ {
+ property: "og:description",
+ content: metaDescription,
+ },
+ ];
+};
+
+export default function UserRoute() {
+ return = ({ data }) => {
+ if (data == null || !data.ok) {
+ return DEFAULT_META;
+ }
+
+ const { name, visibility, description } = data.project;
+
+ const metaTitle = `${name} | ${startCase(visibility)} project on Renku`;
+ const metaDescription = description || DEFAULT_META_DESCRIPTION;
+
+ return [
+ {
+ title: metaTitle,
+ },
+ {
+ name: "description",
+ content: metaDescription,
+ },
+ {
+ property: "og:title",
+ content: metaTitle,
+ },
+ {
+ property: "og:description",
+ content: metaDescription,
+ },
+ ];
+};
+
+export default function ProjectRoute() {
+ return = ({ data }) => {
+ if (data == null || !data.ok) {
+ return DEFAULT_META;
+ }
+
+ const { first_name, last_name, username } = data.user;
+ const fullName =
+ first_name && last_name
+ ? `${first_name} ${last_name}`
+ : first_name
+ ? first_name
+ : last_name || "unknown";
+
+ const metaTitle = `${fullName} (@${username}) | User profile on Renku`;
+
+ return [
+ {
+ title: metaTitle,
+ },
+ {
+ name: "description",
+ content: DEFAULT_META_DESCRIPTION,
+ },
+ {
+ property: "og:title",
+ content: metaTitle,
+ },
+ {
+ property: "og:description",
+ content: DEFAULT_META_DESCRIPTION,
+ },
+ ];
+};
+
+export default function UserRoute() {
+ return
-
-
-
-
- );
- return;
- }
-
- // Query user data
- const userCoordinator = new UserCoordinator(client, model.subModel("user"));
- let userPromise = userCoordinator.fetchUser();
-
- // configure Sentry
- let uiApplication = App;
- if (params.SENTRY_URL) {
- Sentry.init(
- params.SENTRY_URL,
- params.SENTRY_NAMESPACE,
- userPromise,
- params.UI_VERSION,
- params.TELEPRESENCE,
- params.SENTRY_SAMPLE_RATE,
- [params.UISERVER_URL]
- );
- const profiler = !!params.SENTRY_SAMPLE_RATE;
- if (profiler) uiApplication = Sentry.withProfiler(App);
- }
-
- // Set up polling
- const statuspageId = params.STATUSPAGE_ID;
- pollStatuspage(statuspageId, model);
-
- // Map redux user data to the initial react application
- function mapStateToProps(state, ownProps) {
- return { user: state.stateModel.user, ...ownProps };
- }
-
- // Render UI application
- const VisibleApp = connect(mapStateToProps)(uiApplication);
- root.render(
-
-
-
-
-
-
- );
- });
-});
-
-function LoginHandler() {
- // const history = useHistory();
- const location = useLocation();
- const navigate = useNavigate();
-
- useEffect(() => {
- LoginHelper.handleLoginParams(location, navigate);
- }, [location, navigate]);
-
- return null;
-}
-
-function FeatureFlagHandler() {
- useFeatureFlagSync();
- return null;
-}
-
-export function StyleHandler() {
- const location = useLocation();
- return (
-
-
-
- );
-}
diff --git a/client/tsconfig.json b/client/tsconfig.json
index ffd0726179..edc6e0b0fc 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,8 +1,8 @@
{
"compilerOptions": {
- "target": "ES2021",
+ "target": "ES2022",
"useDefineForClassFields": true,
- "lib": ["ES2021", "DOM", "DOM.Iterable"],
+ "lib": ["ES2022", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
@@ -21,8 +21,14 @@
"noFallthroughCasesInSwitch": true,
/* JavaScript support */
- "allowJs": true
+ "allowJs": true,
+
+ /* New */
+ "baseUrl": ".",
+ "paths": {
+ "~/*": ["./app/*"]
+ }
},
- "include": ["src"],
+ "include": ["app"],
"references": [{ "path": "./tsconfig.node.json" }]
}
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 5c5783ca97..426c061f3d 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -1,7 +1,14 @@
import eslintPlugin from "@nabla/vite-plugin-eslint";
-import react from "@vitejs/plugin-react";
+import { vitePlugin as remix } from "@remix-run/dev";
import { resolve } from "path";
import { defineConfig } from "vite";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+declare module "@remix-run/node" {
+ interface Future {
+ v3_singleFetch: true;
+ }
+}
// https://vitejs.dev/config/
export default defineConfig({
@@ -12,7 +19,16 @@ export default defineConfig({
server: {
allowedHosts: [".dev.renku.ch"],
},
- plugins: [react({ include: "/index.html" }), eslintPlugin()],
+ plugins: [
+ remix({
+ future: {
+ v3_singleFetch: true,
+ },
+ ignoredRouteFiles: ["**/*.css"],
+ }),
+ tsconfigPaths(),
+ eslintPlugin(),
+ ],
resolve: {
alias: {
"~bootstrap": resolve(__dirname, "node_modules/bootstrap"),
diff --git a/client/vite.storybook.config.ts b/client/vite.storybook.config.ts
new file mode 100644
index 0000000000..fbd5acddf2
--- /dev/null
+++ b/client/vite.storybook.config.ts
@@ -0,0 +1,32 @@
+import eslintPlugin from "@nabla/vite-plugin-eslint";
+import { resolve } from "path";
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import tsconfigPaths from "vite-tsconfig-paths";
+
+declare module "@remix-run/node" {
+ interface Future {
+ v3_singleFetch: true;
+ }
+}
+
+// https://vitejs.dev/config/
+export default defineConfig({
+ build: {
+ outDir: "build",
+ sourcemap: true,
+ },
+ server: {
+ allowedHosts: [".dev.renku.ch"],
+ },
+ plugins: [
+ react({ jsxRuntime: "automatic" }),
+ tsconfigPaths(),
+ eslintPlugin(),
+ ],
+ resolve: {
+ alias: {
+ "~bootstrap": resolve(__dirname, "node_modules/bootstrap"),
+ },
+ },
+});