add a flag to opt out of version check in super.shouldApply in file mods

Author: pujitm

api/src/unraid-api/graph/resolvers/docker/docker-template-scanner.service.ts

@@ -5,7 +5,7 @@ import { join } from 'path';
 
 import { XMLParser } from 'fast-xml-parser';
 
-import { PATHS_DOCKER_TEMPLATES } from '@app/environment.js';
+import { ENABLE_NEXT_DOCKER_RELEASE, PATHS_DOCKER_TEMPLATES } from '@app/environment.js';
 import { DockerConfigService } from '@app/unraid-api/graph/resolvers/docker/docker-config.service.js';
 import { DockerTemplateSyncResult } from '@app/unraid-api/graph/resolvers/docker/docker-template-scanner.model.js';
 import { DockerContainer } from '@app/unraid-api/graph/resolvers/docker/docker.model.js';
@@ -33,6 +33,9 @@ export class DockerTemplateScannerService {
 
     @Timeout(5_000)
     async bootstrapScan(attempt = 1, maxAttempts = 5): Promise<void> {
+        if (!ENABLE_NEXT_DOCKER_RELEASE) {
+            return;
+        }
         try {
             this.logger.log(`Starting template scan (attempt ${attempt}/${maxAttempts})`);
             const result = await this.scanTemplates();

api/src/unraid-api/unraid-file-modifier/file-modification.ts

@@ -212,9 +212,11 @@ export abstract class FileModification {
     }
 
     // Default implementation that can be overridden if needed
-    async shouldApply(): Promise<ShouldApplyWithReason> {
+    async shouldApply({
+        checkOsVersion = true,
+    }: { checkOsVersion?: boolean } = {}): Promise<ShouldApplyWithReason> {
         try {
-            if (await this.isUnraidVersionGreaterThanOrEqualTo('7.2.0')) {
+            if (checkOsVersion && (await this.isUnraidVersionGreaterThanOrEqualTo('7.2.0'))) {
                 return {
                     shouldApply: false,
                     reason: 'Patch unnecessary for Unraid 7.2 or later because the Unraid API is integrated.',

api/src/unraid-api/unraid-file-modifier/modifications/docker-containers-page.modification.ts

@@ -12,7 +12,7 @@ export default class DockerContainersPageModification extends FileModification {
         '/usr/local/emhttp/plugins/dynamix.docker.manager/DockerContainers.page';
 
     async shouldApply(): Promise<ShouldApplyWithReason> {
-        const baseCheck = await super.shouldApply();
+        const baseCheck = await super.shouldApply({ checkOsVersion: false });
         if (!baseCheck.shouldApply) {
             return baseCheck;
         }

web/src/components/Docker/DockerContainersTable.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, h, nextTick, ref, resolveComponent, watch } from 'vue';
+import { computed, h, nextTick, ref, resolveComponent, watch, watchEffect } from 'vue';
 import { useMutation } from '@vue/apollo-composable';
 
 import BaseTreeTable from '@/components/Common/BaseTreeTable.vue';
@@ -260,8 +260,7 @@ const { visibleFolders, expandedFolders, toggleExpandFolder, setExpandedFolders
 });
 const busyRowIds = ref<Set<string>>(new Set());
 
-const { loadColumnVisibility, mergeServerPreferences, saveColumnVisibility } =
-  useDockerViewPreferences();
+const { mergeServerPreferences, saveColumnVisibility, columnVisibilityRef } = useDockerViewPreferences();
 
 function setRowsBusy(ids: string[], busy: boolean) {
   const next = new Set(busyRowIds.value);
@@ -467,7 +466,7 @@ const columns = computed<TableColumn<TreeRow<DockerContainer>>[]>(() => {
   return cols;
 });
 
-const hasAppliedPreferences = ref(false);
+const isApplyingColumnVisibility = ref(false);
 
 function getDefaultColumnVisibility(isCompact: boolean): Record<string, boolean> {
   if (isCompact) {
@@ -498,38 +497,53 @@ function getDefaultColumnVisibility(isCompact: boolean): Record<string, boolean>
   }
 }
 
-function applyColumnVisibilityPreferences() {
-  if (!baseTableRef.value?.columnVisibility) return;
-  if (hasAppliedPreferences.value) return;
+const defaultColumnVisibility = computed(() => getDefaultColumnVisibility(props.compact));
 
-  const savedPrefs = loadColumnVisibility();
-  const defaultPrefs = getDefaultColumnVisibility(props.compact);
+const resolvedColumnVisibility = computed<Record<string, boolean>>(() => {
+  const saved = columnVisibilityRef.value;
+  return {
+    ...defaultColumnVisibility.value,
+    ...(saved ?? {}),
+  };
+});
 
-  baseTableRef.value.columnVisibility.value = savedPrefs || defaultPrefs;
-  hasAppliedPreferences.value = true;
+function visibilityStatesEqual(a?: Record<string, boolean>, b?: Record<string, boolean>): boolean {
+  if (a === b) return true;
+  if (!a || !b) return false;
+  const aKeys = Object.keys(a);
+  const bKeys = Object.keys(b);
+  if (aKeys.length !== bKeys.length) return false;
+  for (const key of aKeys) {
+    if (a[key] !== b[key]) {
+      return false;
+    }
+  }
+  return true;
 }
 
-watch(
-  baseTableRef,
-  (ref) => {
-    if (ref?.columnVisibility && !hasAppliedPreferences.value) {
-      applyColumnVisibilityPreferences();
-    }
-  },
-  { immediate: true, flush: 'post' }
-);
+watchEffect(() => {
+  const tableVisibility = baseTableRef.value?.columnVisibility;
+  if (!tableVisibility) return;
+
+  const target = resolvedColumnVisibility.value;
+  const current = tableVisibility.value || {};
+
+  if (visibilityStatesEqual(current, target)) {
+    return;
+  }
+
+  isApplyingColumnVisibility.value = true;
+  tableVisibility.value = { ...target };
+  nextTick(() => {
+    isApplyingColumnVisibility.value = false;
+  });
+});
 
 watch(
   () => props.viewPrefs,
   (prefs) => {
-    if (prefs && hasAppliedPreferences.value) {
+    if (prefs) {
       mergeServerPreferences(prefs);
-      if (baseTableRef.value?.columnVisibility) {
-        const savedPrefs = loadColumnVisibility();
-        if (savedPrefs) {
-          baseTableRef.value.columnVisibility.value = savedPrefs;
-        }
-      }
     }
   },
   { immediate: true }
@@ -538,9 +552,10 @@ watch(
 watch(
   () => baseTableRef.value?.columnVisibility?.value,
   (columnVisibility) => {
-    if (columnVisibility && hasAppliedPreferences.value && !props.compact) {
-      saveColumnVisibility(columnVisibility);
+    if (!columnVisibility || props.compact || isApplyingColumnVisibility.value) {
+      return;
     }
+    saveColumnVisibility({ ...columnVisibility });
   },
   { deep: true }
 );

web/src/composables/useDockerColumnVisibility.ts

@@ -1,3 +1,4 @@
+import { computed } from 'vue';
 import { useMutation } from '@vue/apollo-composable';
 import { useDebounceFn, useStorage } from '@vueuse/core';
 
@@ -11,6 +12,7 @@ export function useDockerViewPreferences(viewId = 'default') {
   const storageKey = `docker-view-prefs-${viewId}`;
 
   const localPrefs = useStorage<ViewPreferences>(storageKey, {});
+  const columnVisibilityRef = computed(() => localPrefs.value.columnVisibility);
 
   const { mutate: updatePrefs } = useMutation(UPDATE_DOCKER_VIEW_PREFERENCES);
 
@@ -52,5 +54,6 @@ export function useDockerViewPreferences(viewId = 'default') {
     loadColumnVisibility,
     mergeServerPreferences,
     saveColumnVisibility,
+    columnVisibilityRef,
   };
 }