Rename currentVersion to version in Telestion options

wuespace · Dec 13, 2023 · 542df05 · 542df05
1 parent 5c6ebfc
commit 542df05
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/frontend-react/src/app/index.tsx b/frontend-react/src/app/index.tsx
@@ -25,7 +25,7 @@ const defaultUserData: UserData = {
 registerWidgets(simpleWidget);
 
 await initTelestion({
-	currentVersion: '0.0.1',
+	version: '0.0.1',
 	defaultBackendUrl: 'ws://localhost:9222',
 	defaultUserData
 });
diff --git a/frontend-react/src/lib/application/index.tsx b/frontend-react/src/lib/application/index.tsx
@@ -20,7 +20,7 @@ export * from './hooks';
 export async function initTelestion(options: TelestionOptions) {
 	// override default current version
 	if (options.defaultUserData) {
-		options.defaultUserData.version = options.currentVersion;
+		options.defaultUserData.version = options.version;
 	}
 
 	if (options.widgets) {

diff --git a/frontend-react/src/lib/application/model.ts b/frontend-react/src/lib/application/model.ts
@@ -8,7 +8,7 @@ export interface TelestionOptions {
 	/**
 	 * Represents the current version of the software.
 	 */
-	currentVersion: string;
+	version: string;
 	/**
 	 * The backend URL that should be inserted by default on first page load.
 	 */

diff --git a/frontend-react/src/lib/application/routes/dashboard-editor/routing.ts b/frontend-react/src/lib/application/routes/dashboard-editor/routing.ts
@@ -14,14 +14,14 @@ import {
 import { isUserDataUpToDate } from '../../../utils.ts';
 import { TelestionOptions } from '../../model.ts';
 
-export function dashboardEditorLoader({ currentVersion }: TelestionOptions) {
+export function dashboardEditorLoader({ version }: TelestionOptions) {
 	return ({ params }: LoaderFunctionArgs) => {
 		if (!isLoggedIn()) {
 			return redirect('/login');
 		}
 
 		const userData = getUserData();
-		if (!isUserDataUpToDate(userData, currentVersion) || !userData) {
+		if (!isUserDataUpToDate(userData, version) || !userData) {
 			return redirect('/');
 		}
 
@@ -45,14 +45,14 @@ export function dashboardEditorLoader({ currentVersion }: TelestionOptions) {
 	};
 }
 
-export function dashboardEditorAction({ currentVersion }: TelestionOptions) {
+export function dashboardEditorAction({ version }: TelestionOptions) {
 	return async ({ request, params }: ActionFunctionArgs) => {
 		if (!isLoggedIn()) {
 			return redirect('/login');
 		}
 
 		const userData = getUserData();
-		if (!isUserDataUpToDate(userData, currentVersion) || !userData) {
+		if (!isUserDataUpToDate(userData, version) || !userData) {
 			return redirect('/');
 		}
 

diff --git a/frontend-react/src/lib/application/routes/dashboard-index/routing.ts b/frontend-react/src/lib/application/routes/dashboard-index/routing.ts
@@ -4,14 +4,14 @@ import { getUserData } from '../../../user-data';
 import { isUserDataUpToDate } from '../../../utils.ts';
 import { TelestionOptions } from '../../model.ts';
 
-export function dashboardIndexLoader({ currentVersion }: TelestionOptions) {
+export function dashboardIndexLoader({ version }: TelestionOptions) {
 	return () => {
 		if (!isLoggedIn()) {
 			return redirect('/login');
 		}
 
 		const userData = getUserData();
-		if (!isUserDataUpToDate(userData, currentVersion) || !userData) {
+		if (!isUserDataUpToDate(userData, version) || !userData) {
 			return redirect('/');
 		}
 

diff --git a/frontend-react/src/lib/application/routes/dashboard-page/routing.ts b/frontend-react/src/lib/application/routes/dashboard-page/routing.ts
@@ -11,14 +11,14 @@ import { isUserDataUpToDate } from '../../../utils.ts';
 
 import { dashboardCreateAction } from '../dashboard.ts';
 
-export function dashboardPageLoader({ currentVersion }: TelestionOptions) {
+export function dashboardPageLoader({ version }: TelestionOptions) {
 	return ({ params }: LoaderFunctionArgs) => {
 		if (!isLoggedIn()) {
 			return redirect('/login');
 		}
 
 		const userData = getUserData();
-		if (!isUserDataUpToDate(userData, currentVersion) || !userData) {
+		if (!isUserDataUpToDate(userData, version) || !userData) {
 			return redirect('/');
 		}
 
@@ -42,7 +42,7 @@ export function dashboardPageLoader({ currentVersion }: TelestionOptions) {
 }
 
 export function dashboardPageAction(options: TelestionOptions) {
-	const { currentVersion } = options;
+	const { version } = options;
 
 	const createAction = dashboardCreateAction(options);
 	const deleteAction = ({ params }: ActionFunctionArgs) => {
@@ -51,7 +51,7 @@ export function dashboardPageAction(options: TelestionOptions) {
 		}
 
 		const oldUserData = getUserData();
-		if (!isUserDataUpToDate(oldUserData, currentVersion) || !oldUserData) {
+		if (!isUserDataUpToDate(oldUserData, version) || !oldUserData) {
 			return redirect('/');
 		}
 

diff --git a/frontend-react/src/lib/application/routes/dashboard.ts b/frontend-react/src/lib/application/routes/dashboard.ts
@@ -4,14 +4,14 @@ import { generatePath, redirect } from 'react-router-dom';
 import { getEmptyDashboard, getUserData, setUserData } from '../../user-data';
 import { isUserDataUpToDate } from '../../utils.ts';
 
-export function dashboardCreateAction({ currentVersion }: TelestionOptions) {
+export function dashboardCreateAction({ version }: TelestionOptions) {
 	return () => {
 		if (!isLoggedIn()) {
 			return redirect('/login');
 		}
 
 		const oldUserData = getUserData();
-		if (!isUserDataUpToDate(oldUserData, currentVersion) || !oldUserData) {
+		if (!isUserDataUpToDate(oldUserData, version) || !oldUserData) {
 			return redirect('/');
 		}
 

diff --git a/frontend-react/src/lib/application/routes/migration/routing.ts b/frontend-react/src/lib/application/routes/migration/routing.ts
@@ -15,7 +15,7 @@ import { getWidgetById } from '../../../widget';
 import { promptActionSchema } from './model.ts';
 
 export function migrationLoader({
-	currentVersion,
+	version,
 	defaultUserData
 }: TelestionOptions) {
 	return () => {
@@ -24,15 +24,15 @@ export function migrationLoader({
 		}
 
 		const userData = getUserData();
-		if (isUserDataUpToDate(userData, currentVersion)) {
+		if (isUserDataUpToDate(userData, version)) {
 			return redirect('/');
 		}
 
 		return {
 			migrationState: userData
 				? {
 						previousVersion: userData.version,
-						currentVersion,
+						version: version,
 						oldUserData: userData
 				  }
 				: undefined,
@@ -43,7 +43,7 @@ export function migrationLoader({
 
 export function migrationAction({
 	defaultUserData,
-	currentVersion
+	version
 }: TelestionOptions) {
 	return async ({ request }: ActionFunctionArgs) => {
 		if (!isLoggedIn()) {
@@ -81,7 +81,7 @@ export function migrationAction({
 				}
 
 			case 'blank':
-				setUserData(getBlankUserData(currentVersion));
+				setUserData(getBlankUserData(version));
 				return redirect('/');
 			case 'existing': {
 				const oldUserData = getUserData();
@@ -97,7 +97,7 @@ export function migrationAction({
 
 				setUserData({
 					...oldUserData,
-					version: currentVersion,
+					version: version,
 					widgetInstances: {
 						...Object.fromEntries(newInstances)
 					}

diff --git a/frontend-react/src/lib/application/routes/root.ts b/frontend-react/src/lib/application/routes/root.ts
@@ -5,14 +5,14 @@ import { getUserData } from '../../user-data';
 import { isUserDataUpToDate } from '../../utils.ts';
 import { TelestionOptions } from '../model.ts';
 
-export function rootLoader({ currentVersion }: TelestionOptions) {
+export function rootLoader({ version }: TelestionOptions) {
 	return () => {
 		if (!isLoggedIn()) {
 			return redirect('/login');
 		}
 
 		const userData = getUserData();
-		if (!isUserDataUpToDate(userData, currentVersion)) {
+		if (!isUserDataUpToDate(userData, version)) {
 			return redirect('/migration');
 		}
 

diff --git a/frontend-react/src/lib/index.ts b/frontend-react/src/lib/index.ts
@@ -14,7 +14,7 @@
  *
  * ```ts
  * initTelestion({
- *   currentVersion: '1.0.0',
+ *   version: '1.0.0',
  *   ...
  * });
  * ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
      *
      * ```ts
      * initTelestion({
-     *   currentVersion: '1.0.0',
+     *   version: '1.0.0',
      *   ...
      * });
      * ```
@@ Expand Down @@