fix: multitude of fixes for c-admin-audit-log-page

IntelliTect · Dec 7, 2023 · 3bf80ce · 3bf80ce
1 parent 2a3772c
commit 3bf80ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/playground/Coalesce.Web.Vue2/src/main.ts b/playground/Coalesce.Web.Vue2/src/main.ts
@@ -34,6 +34,7 @@ const components: any = Vue.options.components;
 components.VInput.options.props.dense.default = true
 components.VTextField.options.props.dense.default = true
 components.VTextField.options.props.outlined.default = true
+components.VTextField.options.props.persistentPlaceholder.default = true;
 
 Vue.config.productionTip = false;
 

diff --git a/src/coalesce-vue-vuetify2/src/components/admin/c-admin-audit-log-page.vue b/src/coalesce-vue-vuetify2/src/components/admin/c-admin-audit-log-page.vue
@@ -41,46 +41,51 @@
               v-model="listVm.$params.filter.type"
               label="Type Name"
               style="width: 150px"
-              @clear="$nextTick(() => (listVm.$params.filter.type = ''))"
+              @click:clear="$nextTick(() => (listVm.$params.filter.type = ''))"
               flat
               solo-inverted
               hide-details
               single-line
               clearable
+              :persistent-placeholder="false"
             />
 
             <v-text-field
               v-model="listVm.$params.filter.keyValue"
               label="Key Value"
               style="width: 150px"
-              @clear="$nextTick(() => (listVm.$params.filter.keyValue = ''))"
+              @click:clear="
+                $nextTick(() => (listVm.$params.filter.keyValue = ''))
+              "
               flat
               solo-inverted
               hide-details
               single-line
               clearable
+              :persistent-placeholder="false"
             />
 
             <c-input
               v-model="listVm.$params.filter.state"
               :for="listVm.$metadata.props.state"
-              @clear="$nextTick(() => (listVm.$params.filter.state = ''))"
+              @click:clear="$nextTick(() => (listVm.$params.filter.state = ''))"
               style="min-width: 210px; max-width: 210px"
               flat
               solo-inverted
               hide-details
               single-line
               clearable
+              :persistent-placeholder="false"
             />
 
             <c-select
               v-if="userPropMeta"
               :for="userPropMeta"
-              v-model:key-value="
+              :key-value.sync="
                 listVm.$params.filter[userPropMeta.foreignKey.name]
               "
               style="width: 240px"
-              @clear="
+              @click:clear="
                 $nextTick(
                   () =>
                     (listVm.$params.filter[userPropMeta.foreignKey.name] = '')
@@ -91,6 +96,7 @@
               hide-details
               single-line
               clearable
+              :persistent-placeholder="false"
             />
           </div>
 
@@ -319,6 +325,7 @@ export default defineComponent({
         );
       }
       listVm = new ListViewModel.typeLookup![props.type]() as any;
+      listVm.$load.setConcurrency("cancel");
     }
 
     const userPropMeta = computed(() => {
@@ -408,7 +415,7 @@ export default defineComponent({
     useBindToQueryString(listVm.$params, "pageSize", "pageSize", (p) => +p);
 
     listVm.$load();
-    listVm.$useAutoLoad({ wait: 0 });
+    listVm.$useAutoLoad({ wait: 100 });
 
     const pageTitle = "Audit Logs";
 

diff --git a/src/coalesce-vue-vuetify2/src/components/admin/c-admin-table-toolbar.vue b/src/coalesce-vue-vuetify2/src/components/admin/c-admin-table-toolbar.vue
@@ -63,6 +63,7 @@
         v-model="list.$params.search"
         single-line
         clearable
+        :persistent-placeholder="false"
       ></v-text-field>
 
       <v-divider class="hidden-xs-only mx-4 my-0" vertical></v-divider>

diff --git a/src/coalesce-vue-vuetify3/src/components/admin/c-admin-audit-log-page.vue b/src/coalesce-vue-vuetify3/src/components/admin/c-admin-audit-log-page.vue
@@ -315,6 +315,7 @@ if (props.list) {
     );
   }
   list = new ListViewModel.typeLookup![props.type]() as any;
+  list.$load.setConcurrency("cancel");
 }
 
 const userPropMeta = computed(() => {
@@ -395,7 +396,7 @@ if (userPropMeta.value) {
 }
 
 list.$load();
-list.$useAutoLoad({ wait: 0 });
+list.$useAutoLoad({ wait: 100 });
 
 defineExpose({
   /** Support for common convention of exposing 'pageTitle' from router-view hosted components. */