@thzero/library_client_vue3_store_pinia 0.16.19 → 0.16.21

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@thzero/library_client_vue3_store_pinia",
-  "version": "0.16.19",
+  "version": "0.16.21",
   "version_major": 0,
   "version_minor": 16,
-  "version_patch": 19,
-  "version_date": "12/17/2022",
+  "version_patch": 21,
+  "version_date": "12/19/2022",
   "description": "An opinionated library for vue3 with pinia store for the library_client_vue3 using the https://prazdevs.github.io/pinia-plugin-persistedstate library.",
   "author": "thZero",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "@thzero/library_common": "^0.16",
     "pinia": "^2.0.28",
     "pinia-plugin-persistedstate": "^3.0.1",
-    "pinia-plugin-persistedstate-2": "^2.0.5",
+    "pinia-plugin-persistedstate-2": "^2.0.6",
     "vue": "^3.2.45"
   }
 }

package/service/store/index.js

@@ -8,7 +8,7 @@ class PiniaStoreService extends Service {
 	}
 
 	get getters() {
-		return GlobalUtility.$store;
+		return GlobalUtility.$store.getters;
 	}
 
 	get state() {
@@ -16,7 +16,31 @@ class PiniaStoreService extends Service {
 	}
 
 	get user() {
-		return GlobalUtility.$store.user;
+		return GlobalUtility.$store.user.user;
+	}
+	
+	get userClaims() {
+		return GlobalUtility.$store.user.claims;
+	}
+	
+	get userToken() {
+		return GlobalUtility.$store.user.token;
+	}
+	
+	get userAuthCompleted() {
+		return GlobalUtility.$store.user.authCompleted;
+	}
+	
+	get userAuthIsLoggedIn() {
+		return GlobalUtility.$store.user.isLoggedIn;
+	}
+	
+	get userTheme() {
+		return GlobalUtility.$store.user.theme;
+	}
+	
+	get userTokenResult() {
+		return GlobalUtility.$store.user.tokenResult;
 	}
 }
 

package/store/index.js

@@ -25,11 +25,24 @@ class BaseStore {
 
 	setup() {
 		const logger = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_LOGGER);
+
+		const initialStoreConfig = this._initStoreConfigBase();
+		const appStoreConfig = this._initStoreConfig();
+		initialStoreConfig.actions = Object.assign(initialStoreConfig.actions, appStoreConfig.actions);
+		initialStoreConfig.dispatcher = Object.assign(initialStoreConfig.dispatcher, appStoreConfig.dispatcher);
+		initialStoreConfig.getters = Object.assign(initialStoreConfig.getters, appStoreConfig.getters);
+
+		const initialState = initialStoreConfig.state();
+		const appState = appStoreConfig.state();
+		const state = Object.assign(initialState, appState);
+		initialStoreConfig.state = () => state;
+
 		return {
 			func: {
 				install(app, options) {
 					const storeConfig = options.storeConfig;
 					
+					options.actionGetters = storeConfig.getters;
 					options.actionDispatcher = storeConfig.dispatcher;
 					if (!options.actionDispatcher) 
 						options.actionDispatcher = {};
@@ -43,14 +56,16 @@ class BaseStore {
 
 					// options.addModule('adminNews', adminNews, options.actionDispatcher, options.pluginPersistType(), options.pluginPersistConfig, options.pinia, logger);
 					// options.addModule('adminUsers', adminUsers, options.actionDispatcher, options.pluginPersistType(), options.pluginPersistConfig, options.pinia, logger);
-					options.addModule('news', news, options.actionDispatcher, options.pluginPersistType(), options.pluginPersistSetup, options.pluginPersistConfig, options.pluginPersistSetupOverride, options.pinia, logger);
-					options.addModule('user', user, options.actionDispatcher, options.pluginPersistType(), options.pluginPersistSetup, options.pluginPersistConfig, options.pluginPersistSetupOverride, options.pinia, logger);
+					options.addModule('news', news, options.actionDispatcher, options.actionGetters, options.pluginPersistType(), options.pluginPersistSetup, options.pluginPersistConfig, options.pluginPersistSetupOverride, options.pinia, logger);
+					options.addModule('user', user, options.actionDispatcher, options.actionGetters, options.pluginPersistType(), options.pluginPersistSetup, options.pluginPersistConfig, options.pluginPersistSetupOverride, options.pinia, logger);
 					options.initModules();
 					GlobalUtility.$store.dispatcher = options.actionDispatcher;
+					GlobalUtility.$store.getters = options.actionGetters;
 				}
 			},
 			options: {
 				actionDispatcher: this.actionDispatcher,
+				actionGetters: this.actionGetters,
 				addModule: this._addModule,
 				initModules: this._initModules,
 				logger: logger,
@@ -59,25 +74,23 @@ class BaseStore {
 				pluginPersistSetupOverride: this._initPluginPersistConfigSetupOverride,
 				pluginPersistSetup: this._initPluginPersistConfigSetup,
 				pluginPersistType: this._initPluginPersistType,
-				storeConfig: this._init()
+				storeConfig: initialStoreConfig
 			}
 		};
 	}
 
-	_addModule(key, storeConfig, actionDispatcher, pluginPersistType, pluginPersistSetup, pluginPersistConfig, pluginPersistSetupOverride, pinia, logger) {
+	_addModule(key, storeConfig, actionDispatcher, actionGetters, pluginPersistType, pluginPersistSetup, pluginPersistConfig, pluginPersistSetupOverride, pinia, logger) {
 		if (pluginPersistType && pluginPersistSetup && pluginPersistConfig && pluginPersistConfig[key])
 			pluginPersistSetup(pluginPersistType, storeConfig, pluginPersistConfig['root'], pluginPersistSetupOverride);
 		actionDispatcher[key] = storeConfig.dispatcher;
 		delete storeConfig.dispatcher;
+		actionGetters[key] = storeConfig.getters;
+		delete storeConfig.getters;
 		const storeFunc = defineStore(key, storeConfig);
 		GlobalUtility.$store[key] = storeFunc(pinia);
 		GlobalUtility.$store[key].$logger = logger;
 	}
 
-	_init() {
-		throw new NotImplementedError();
-	}
-
 	_initModules() {
 		throw new NotImplementedError();
 	}
@@ -137,6 +150,65 @@ class BaseStore {
 	_initPluginPersistConfigSetupOverride(storeConfig, persistConfig) {
 	}
 
+	_initStoreConfig() {
+		throw new NotImplementedError();
+	}
+
+	_initStoreConfigBase() {
+		return {
+			state: () => ({
+				checksumLastUpdate: [],
+				plans: [],
+				version: null
+			}),
+			actions: {
+				async getPlans(correlationId) {
+					const service = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_PLANS);
+					const response = await service.plans(correlationId);
+					this.$logger.debug('store', 'getPlans', 'response', response, correlationId);
+					if (Response.hasSucceeded(response)) {
+						this.setPlans(correlationId, response.results ? response.results.data : []);
+					}
+				},
+				async requestVersion(correlationId) {
+					const service = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_VERSION);
+					const version = await service.version(correlationId);
+					this.setVersion(correlationId, version);
+				},
+				async setPlans(correlationId, plans) {
+					this.$logger.debug('store', 'setPlans', 'plans.a', plans, correlationId);
+					this.$logger.debug('store', 'setPlans', 'plans.b', this.plans, correlationId);
+					this.plans = plans;
+					this.$logger.debug('store', 'setPlans', 'plans.c', this.plans, correlationId);
+				},
+				async setVersion(correlationId, version) {
+					// this.$logger.debug('store', 'getVersion', 'version', version, correlationId);
+					// commit('setVersion', { correlationId: correlationId, version: version });
+					this.$logger.debug('store', 'setVersion', 'version', version, correlationId);
+					this.version = version;
+				}
+			},
+			getters: {
+				getPlan (correlationId, id) {
+					if (GlobalUtility.$store.plans == null)
+						return null;
+					return GlobalUtility.$store.plans.find(plan => plan.id === id);
+				}
+			},
+			dispatcher: {
+				async getPlans(correlationId) {
+					await GlobalUtility.$store.getPlans(correlationId);
+				},
+				async requestVersion(correlationId) {
+					await GlobalUtility.$store.requestVersion(correlationId);
+				},
+				async initialize(correlationId) {
+					await GlobalUtility.$store.initialize(correlationId);
+				}
+			}
+		};
+	}
+
 	static PersistanceTypeOverride = 'override';
 	static PersistanceTypePersist = 'persist';
 	static PersistanceTypePersist2 = 'persist2';

package/store/user/index.js

@@ -10,6 +10,7 @@ const store = {
 		authCompleted: false,
 		claims: null,
 		isLoggedIn: false,
+		theme: 'defaultTheme',
 		token: null,
 		tokenResult: null,
 		user: null
@@ -41,27 +42,26 @@ const store = {
 		async setUserLoggedIn(correlationId, isLoggedIn) {
 			this.isLoggedIn = isLoggedIn;
 		},
+		// async setUserSettings(correlationId, settings) {
+		// 	const service = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_USER);
+		// 	settings = VueUtility.settings().mergeUser(correlationId, settings);
+		// 	const response = await service.updateSettings(correlationId, this.user, settings);
+		// 	this.$logger.debug('store.user', 'setUserSettings', 'response', response);
+		// 	if (Response.hasSucceeded(response) && response.results)
+		// 		this.setUser(correlationId, response.results);
+		// 	return response;
+		// },
 		async setUserSettings(correlationId, settings) {
 			const service = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_USER);
-			settings = VueUtility.settings().mergeUser(params.correlationId, settings);
-			const response = await service.updateSettings(params.correlationId, this.user, settings);
+			settings = VueUtility.settings().mergeUser(correlationId, settings);
+			const response = await service.updateSettings(correlationId, this.user, settings);
 			this.$logger.debug('store.user', 'setUserSettings', 'response', response);
 			if (Response.hasSucceeded(response) && response.results)
-				this.setUser(correlationId, response.results);
+				this.user = response.results;
 			return response;
 		},
-		async setUserSettings2(correlationId, settings) {
-			const service = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_USER);
-			settings = VueUtility.settings().mergeUser(params.correlationId, settings);
-			const response = await service.updateSettings(params.correlationId, this.user, settings);
-			this.$logger.debug('store.user', 'setUserSettings', 'response', response);
-			if (Response.hasSucceeded(response) && response.results) {
-				// commit('setUserSettings', { correlationId: params.correlationId, user: response.results });
-				const user = response.results;
-				user.settings = VueUtility.settings().mergeUser(correlationId, user.settings);
-				this.user = user;
-			}
-			return response;
+		async setUserTheme(correlationId, isLoggedIn) {
+			this.theme = theme;
 		},
 		async setUserTokenResult(correlationId, tokenResult) {
 			this.$patch({
@@ -75,37 +75,47 @@ const store = {
 			this.user = user;
 		}
 	},
+	getters: {
+		getUser (correlationId) {
+			return GlobalUtility.$store.user.user;
+		},
+		getUserTheme (correlationId) {
+			return GlobalUtility.$store.theme;
+		},
+		getUserSettings(correlationId) {
+			if (GlobalUtility.$store.user.user && GlobalUtility.$store.user.user.settings)
+				return GlobalUtility.$store.user.user.settings;
+
+			const service = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_USER);
+			return service.initializeSettings();
+		}
+	},
 	dispatcher: {
 		async refreshUserSettings(correlationId) {
-			// await GlobalUtility.$store.dispatch('refreshUserSettings', correlationId);
-			await GlobalUtility.$store.user.refreshUserSettings(correlationId);
+			return await GlobalUtility.$store.user.refreshUserSettings(correlationId);
 		},
 		async resetUser(correlationId) {
-			// await GlobalUtility.$store.dispatch('resetUser', correlationId);
 			await GlobalUtility.$store.user.resetUser(correlationId);
 		},
-		async setAuthCompleted(correlationId, authCompleted) {
-			// await GlobalUtility.$store.dispatch('setUserAuthCompleted', { correlationId: correlationId, authCompleted: authCompleted });
+		async setUserAuthCompleted(correlationId, authCompleted) {
 			await GlobalUtility.$store.user.setUserAuthCompleted(correlationId, authCompleted);
 		},
-		async setClaims(correlationId, claims) {
-			// await GlobalUtility.$store.dispatch('setUserClaims', { correlationId: correlationId, authCompleted: claims });
+		async setUserClaims(correlationId, claims) {
 			await GlobalUtility.$store.user.setUserClaims(correlationId, claims);
 		},
-		async setLoggedIn(correlationId, isLoggedIn) {
-			// await GlobalUtility.$store.dispatch('setUserLoggedIn', { correlationId: correlationId, isLoggedIn: isLoggedIn });
+		async setUserLoggedIn(correlationId, isLoggedIn) {
 			await GlobalUtility.$store.user.setUserLoggedIn(correlationId, isLoggedIn);
 		},
 		async setUserSettings(correlationId, settings) {
-			// return await GlobalUtility.$store.dispatch('setUserSettings', { correlationId: correlationId, settings: settings });
-			await GlobalUtility.$store.user.setUserSettings(correlationId, settings);
+			return await GlobalUtility.$store.user.setUserSettings(correlationId, settings);
+		},
+		async setUserTheme(correlationId, theme) {
+			await GlobalUtility.$store.user.setUserTheme(correlationId, theme);
 		},
-		async setTokenResult(correlationId, tokenResult) {
-			// await GlobalUtility.$store.dispatch('setUserTokenResult', { correlationId: correlationId, tokenResult: tokenResult });
+		async setUserTokenResult(correlationId, tokenResult) {
 			await GlobalUtility.$store.user.setUserTokenResult(correlationId, tokenResult);
 		},
 		async setUser(correlationId, user) {
-			// await GlobalUtility.$store.dispatch('setUser', { correlationId: correlationId, user: user });
 			await GlobalUtility.$store.user.setUser(correlationId, user);
 		}
 	}