@christianriedl/utils 1.0.63 → 1.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/utils",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "Interfaces, local storage, service worker, configuration, application state",
 
   "main": "dist/index.js",

package/src/components/SettingsLine.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
     import { reactive } from 'vue';
-    import { IConfigItem } from '@christianriedl/utils';
+    import { IConfigItem, EScope } from '@christianriedl/utils';
 
-    const props = defineProps<{item: IConfigItem; }>();
+    const props = defineProps<{item: IConfigItem; scopes: EScope }>();
     const emits = defineEmits<{ (e: 'change', value: any): void }>();
 
     const item = reactive(props.item);
@@ -11,6 +11,7 @@
     const isNumber = typeof item.default === 'number';
     const isBoolean = typeof item.default === 'boolean';
     const isDisabled = item.doNotChange;
+    const isVisible = (item.scopes & props.scopes) != 0; 
 
     function onChange(ev: Event) {
         emits('change', true);
@@ -18,7 +19,7 @@
 </script>
 
 <template>
-    <tr class="settingsline">
+    <tr v-if="isVisible" class="settingsline">
         <td style="width:50%">{{item.description}}</td>
         <td style="width:50%">
             <v-switch v-if="isBoolean" v-model="item.value" :disabled="isDisabled" density="compact" hide-details marg color="primary" @change="onChange"></v-switch>

package/src/views/SettingsPage.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-    import { inject, computed, onBeforeUnmount } from 'vue';
+    import { inject, computed, ref, nextTick, onBeforeUnmount } from 'vue';
     import { onBeforeRouteLeave } from 'vue-router'
     import { IAppConfig, IConfigItem, IAppState } from '@christianriedl/utils'
     import SettingsLine from '../components/SettingsLine.vue';
@@ -7,9 +7,8 @@
     const emits = defineEmits<{ (e: 'configchange', item: IConfigItem): void }>();
     const appState = inject<IAppState>('appstate')!;
     const appConfig = inject<IAppConfig>('appconfig')!;
-    const appItems = appConfig.items.filter((i) => (i.scopes & appState.scopes) != 0);
-
     const heightStyle = computed(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
+    const scopes = ref(appState.scopes);
 
     let   changed = false;
     const subscribePushNotifications = appConfig.subscribePush ? appConfig.items["subscribePushNotifications"] : null;
@@ -29,6 +28,7 @@
 
     async function saveConfiguration(): Promise<boolean> {
         if (changed) {
+            const useServerWait = appConfig.items['smartHomeUseServerWait'].value;
             appConfig.save();
             if (subscribePushNotifications && subscribePushNotifications.value != wasSubscribed) {
                 console.log(`Subscribe changed to ${subscribePushNotifications.value}`)
@@ -46,6 +46,13 @@
     }
 
     function onChange(item: IConfigItem) {
+        if (item.name === 'smartHomeUseServerWait') {
+            const acqCycleItem = appConfig.items['smartHomeAcqCycle'];
+            if (acqCycleItem)
+                acqCycleItem.value = item.value ? 30000 : 1000; 
+            scopes.value = 0;
+            nextTick(() => scopes.value = appState.scopes);
+        }
         emits('configchange', item);
         changed = true;
     } 
@@ -62,7 +69,7 @@
                 </tr>
             </thead>
             <tbody>
-                <settings-line v-for="config in appItems" :item="config" :key="config.name" @change="onChange(config)"></settings-line>
+                <settings-line v-for="config in appConfig.items" :key="config.name" :item="config" :scopes="scopes" @change="onChange(config)"></settings-line>
             </tbody>
         </v-table>
     </v-container>