@thzero/library_client_vue3_store_pinia 0.17.3 → 0.17.5

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@thzero/library_client_vue3_store_pinia",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "version_major": 0,
   "version_minor": 17,
-  "version_patch": 3,
-  "version_date": "02/03/2023",
+  "version_patch": 5,
+  "version_date": "03/12/2023",
   "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",
@@ -23,9 +23,9 @@
     "@thzero/library_client": "^0.17",
     "@thzero/library_client_vue3": "^0.17",
     "@thzero/library_common": "^0.17",
-    "pinia": "^2.0.30",
-    "pinia-plugin-persistedstate": "^3.0.2",
-    "pinia-plugin-persistedstate-2": "^2.0.11",
+    "pinia": "^2.0.33",
+    "pinia-plugin-persistedstate": "^3.1.0",
+    "pinia-plugin-persistedstate-2": "^2.0.14",
     "vue": "^3.2.47"
   }
 }

package/store/index.js

@@ -27,7 +27,7 @@ class BaseStore {
 	}
 
 	setup() {
-		const logger = LibraryClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_LOGGER);
+		// const logger = LibraryClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_LOGGER);
 
 		const initialStoreConfig = this._initStoreConfigBase();
 		const appStoreConfig = this._initStoreConfig();
@@ -44,10 +44,10 @@ class BaseStore {
 			func: {
 				install(app, options) {
 					const storeConfig = options.storeConfig;
-					
+
 					options.actionGetters = storeConfig.getters;
 					options.actionDispatcher = storeConfig.dispatcher;
-					if (!options.actionDispatcher) 
+					if (!options.actionDispatcher)
 						options.actionDispatcher = {};
 
 					const pluginPersistType = options.pluginPersistType();
@@ -57,20 +57,29 @@ class BaseStore {
 						options.pluginPersistSetup(pluginPersistType, storeConfig, options.pluginPersistConfig[pluginPersistType], options.pluginPersistSetupOverride, {
 							additionalPaths: additionalPaths
 						});
-						
+
 					// if (storeConfig.pluginPersistPaths && storeConfig.pluginPersistPaths[pluginPersistType])
 					// 	storeConfig[pluginPersistType].paths = [ ...storeConfig[pluginPersistType].paths, ...storeConfig.pluginPersistPaths[pluginPersistType] ];
 					delete storeConfig.pluginPersistPaths;
 
 					const storeFunc = defineStore('main', storeConfig);
 					LibraryClientUtility.$store = storeFunc(options.pinia);
-					LibraryClientUtility.$store.$logger = options.logger;
+					//LibraryClientUtility.$store.$logger = options.logger;
+					Object.defineProperty(LibraryClientUtility.$store, '$logger', {
+						get() {
+							if (!this._logger)
+								this._logger = LibraryClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_LOGGER);
+							return this._logger;
+						},
+					  });
 
 					const storeFuncModules = [];
 					// options.addModule('adminNews', adminNews, options.actionDispatcher, pluginPersistType, options.pluginPersistConfig, options.pinia, logger);
 					// options.addModule('adminUsers', adminUsers, options.actionDispatcher, pluginPersistType, options.pluginPersistConfig, options.pinia, logger);
-					storeFuncModules.push(options.addModule('news', news, options.actionDispatcher, options.actionGetters, storeConfig.persist, pluginPersistType, options.pluginPersistSetup, options.pluginPersistSetupOverride, options.pinia, logger));
-					storeFuncModules.push(options.addModule('user', user, options.actionDispatcher, options.actionGetters, storeConfig.persist, pluginPersistType, options.pluginPersistSetup, options.pluginPersistSetupOverride, options.pinia, logger));
+					// storeFuncModules.push(options.addModule('news', news, options.actionDispatcher, options.actionGetters, storeConfig.persist, pluginPersistType, options.pluginPersistSetup, options.pluginPersistSetupOverride, options.pinia, logger));
+					// storeFuncModules.push(options.addModule('user', user, options.actionDispatcher, options.actionGetters, storeConfig.persist, pluginPersistType, options.pluginPersistSetup, options.pluginPersistSetupOverride, options.pinia, logger));
+					storeFuncModules.push(options.addModule('news', news, options.actionDispatcher, options.actionGetters, storeConfig.persist, pluginPersistType, options.pluginPersistSetup, options.pluginPersistSetupOverride, options.pinia));
+					storeFuncModules.push(options.addModule('user', user, options.actionDispatcher, options.actionGetters, storeConfig.persist, pluginPersistType, options.pluginPersistSetup, options.pluginPersistSetupOverride, options.pinia));
 
 					storeFuncModules.push(...options.initModules());
 
@@ -83,7 +92,7 @@ class BaseStore {
 				actionGetters: this.actionGetters,
 				addModule: this._addModule,
 				initModules: this._initModules,
-				logger: logger,
+				// logger: logger,
 				pinia: this.pinia,
 				pluginPersistConfig: this._initPluginPersistConfig(),
 				pluginPersistSetupOverride: this._initPluginPersistConfigSetupOverride,
@@ -94,7 +103,8 @@ class BaseStore {
 		};
 	}
 
-	_addModule(key, storeConfig, actionDispatcher, actionGetters, pluginPersistConfig, pluginPersistType, pluginPersistSetup, pluginPersistSetupOverride, pinia, logger) {
+	// _addModule(key, storeConfig, actionDispatcher, actionGetters, pluginPersistConfig, pluginPersistType, pluginPersistSetup, pluginPersistSetupOverride, pinia, logger) {
+		_addModule(key, storeConfig, actionDispatcher, actionGetters, pluginPersistConfig, pluginPersistType, pluginPersistSetup, pluginPersistSetupOverride, pinia) {
 		if (pluginPersistType && pluginPersistSetup && storeConfig.pluginPersistPaths && storeConfig.pluginPersistPaths[pluginPersistType]) {
 			pluginPersistConfig = LibraryCommonUtility.cloneDeep(pluginPersistConfig);
 			pluginPersistSetup(pluginPersistType, storeConfig, pluginPersistConfig, pluginPersistSetupOverride, {
@@ -109,7 +119,14 @@ class BaseStore {
 		delete storeConfig.pluginPersistPaths;
 		const storeFunc = defineStore(key, storeConfig);
 		LibraryClientUtility.$store[key] = storeFunc(pinia);
-		LibraryClientUtility.$store[key].$logger = logger;
+		// LibraryClientUtility.$store[key].$logger = logger;
+		Object.defineProperty(LibraryClientUtility.$store[key], '$logger', {
+			get() {
+				if (!this._logger)
+					this._logger = LibraryClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_LOGGER);
+				return this._logger;
+			},
+		});
 		return { key: key, storeFunc: storeFunc };
 	}
 

package/store/user/index.js

@@ -8,6 +8,7 @@ import Response from '@thzero/library_common/response';
 const store = {
 	pluginPersistPaths: {
 		persist: [
+			'settings',
 			'user'
 		]
 	},
@@ -15,6 +16,7 @@ const store = {
 		authCompleted: false,
 		claims: null,
 		isLoggedIn: false,
+		settings: {},
 		theme: 'defaultTheme',
 		token: null,
 		tokenResult: null,
@@ -35,9 +37,17 @@ const store = {
 				isLoggedIn: false,
 				token: null,
 				tokenResult: null,
+				settings: {},
 				user: null
 			});
 		},
+		async setUser(correlationId, user) {
+			if (user) {
+				this.settings = LibraryClientVueUtility.settings().mergeUser(correlationId, user.settings);
+				delete user.settings;
+			}
+			this.user = user;
+		},
 		async setUserAuthCompleted(correlationId, authCompleted) {
 			this.authCompleted = authCompleted;
 		},
@@ -50,11 +60,21 @@ const store = {
 		async setUserSettings(correlationId, settings) {
 			const service = LibraryClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_USER);
 			settings = LibraryClientVueUtility.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.user = response.results;
-			return response;
+			if (this.isLoggedIn) {
+				const response = await service.updateSettings(correlationId, this.user, settings);
+				this.$logger.debug('store.user', 'setUserSettings', 'response', response);
+				if (Response.hasSucceeded(response) && response.results) {
+					// this.settings = response.results.settings;
+					// delete response.results.settings;
+					// this.user = response.results;
+					// response.results = this.settings;
+					this.setUser(correlationId, response.results);
+					response.results = this.settings;
+				}
+				return response;
+			}
+			this.settings = LibraryClientVueUtility.settings().mergeUser(correlationId, settings);
+			return Response.success(correlationId, this.settings);
 		},
 		async setUserTheme(correlationId, isLoggedIn) {
 			this.theme = theme;
@@ -64,11 +84,6 @@ const store = {
 				tokenResult: null,
 				token: tokenResult ? tokenResult.token : null
 			});
-		},
-		async setUser(correlationId, user) {
-			if (user)
-				user.settings = LibraryClientVueUtility.settings().mergeUser(correlationId, user.settings);
-			this.user = user;
 		}
 	},
 	getters: {
@@ -79,8 +94,8 @@ const store = {
 			return LibraryClientUtility.$store.theme;
 		},
 		getUserSettings(correlationId) {
-			if (LibraryClientUtility.$store.user.user && LibraryClientUtility.$store.user.user.settings) // TODO: userRef
-				return LibraryClientUtility.$store.user.user.settings;
+			if (LibraryClientUtility.$store.user.settings) // TODO: userRef
+				return LibraryClientUtility.$store.user.settings;
 
 			const service = LibraryClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_USER);
 			return service.initializeSettings();