quasar-ui-danx 0.4.5 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "vite-svg-loader": "^5.1.0",
     "vue": "^3.4.21",
     "vue-eslint-parser": "^9.4.2",
-    "vue-router": "^4.0.0"
+    "vue-router": "^4.3.2"
   },
   "dependencies": {
     "@heroicons/vue": "v1",

package/src/components/ActionTable/ActionTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="dx-action-table overflow-hidden"
-    :class="{'dx-no-data': !hasData}"
+    :class="{'dx-no-data': !hasData, 'dx-is-loading': loadingList || loadingSummary, 'dx-is-loading-list': loadingList}"
   >
     <ActionVnode />
     <QTable

package/src/components/ActionTable/Form/Fields/SelectField.vue

@@ -1,5 +1,10 @@
 <template>
   <div>
+    <FieldLabel
+      v-if="label"
+      :label="label"
+      class="mb-1 block"
+    />
     <QSelect
       ref="selectField"
       v-bind="$props"
@@ -15,6 +20,7 @@
       option-label="label"
       option-value="value"
       placeholder=""
+      label=""
       :input-class="{'is-hidden': !isShowing, [inputClass]: true}"
       class="max-w-full dx-select-field"
       @filter="onFilter"
@@ -68,6 +74,7 @@
 import { ChevronDownIcon as DropDownIcon } from "@heroicons/vue/outline";
 import { QSelect, QSelectProps } from "quasar";
 import { computed, isRef, nextTick, ref } from "vue";
+import FieldLabel from "./FieldLabel";
 
 export interface Props extends QSelectProps {
 	modelValue?: any;

package/src/components/ActionTable/Form/Fields/TextField.vue

@@ -1,12 +1,14 @@
 <template>
   <div>
-    <div v-if="readonly">
-      <LabelValueBlock
-        :label="label || field?.label || 'Text'"
-        :value="modelValue"
-      />
-    </div>
-    <template v-else>
+    <FieldLabel
+      :field="field"
+      :label="label"
+      :show-name="showName"
+      :class="labelClass"
+      :value="readonly ? modelValue : ''"
+      class="mb-1 block"
+    />
+    <template v-if="!readonly">
       <QInput
         :placeholder="field?.placeholder"
         outlined
@@ -24,16 +26,7 @@
         :debounce="debounce"
         @keydown.enter="$emit('submit')"
         @update:model-value="$emit('update:model-value', $event)"
-      >
-        <template #label>
-          <FieldLabel
-            :field="field"
-            :label="label"
-            :show-name="showName"
-            :class="labelClass"
-          />
-        </template>
-      </QInput>
+      />
       <MaxLengthCounter
         :length="modelValue?.length || 0"
         :max-length="field?.maxLength"
@@ -46,7 +39,6 @@
 import { TextFieldProps } from "../../../../types";
 import MaxLengthCounter from "../Utilities/MaxLengthCounter";
 import FieldLabel from "./FieldLabel";
-import LabelValueBlock from "./LabelValueBlock";
 
 defineEmits(["update:model-value", "submit"]);
 withDefaults(defineProps<TextFieldProps>(), {

package/src/components/ActionTable/TableSummaryRow.vue

@@ -9,24 +9,28 @@
       :class="{'has-selection': selectedCount}"
     >
       <div class="flex flex-nowrap items-center">
-        <div
-          v-if="selectedCount"
-          class="flex items-center"
-        >
-          <ClearIcon
-            class="w-6 mr-3"
-            @click="$emit('clear')"
+        <div class="relative">
+          <QSpinner
+            v-if="loading"
+            class="absolute top-0 left-0"
+            size="18"
           />
-          {{ fNumber(selectedCount) }} {{ selectedLabel }}
+          <div
+            :class="{'opacity-0': loading}"
+            class="flex items-center nowrap"
+          >
+            <ClearIcon
+              v-if="selectedCount"
+              class="w-6 mr-3 cursor-pointer"
+              @click="$emit('clear')"
+            />
+
+            {{ fNumber(selectedCount || itemCount) }}
+          </div>
         </div>
-        <div v-else-if="itemCount">
-          {{ fNumber(itemCount) }} {{ label }}
+        <div class="ml-2">
+          {{ selectedCount ? selectedLabel : label }}
         </div>
-        <QSpinner
-          v-if="loading"
-          class="ml-3"
-          size="18"
-        />
       </div>
     </QTd>
     <QTd
@@ -48,49 +52,49 @@ import { fNumber } from "../../helpers";
 
 defineEmits(["clear"]);
 const props = defineProps({
-  loading: Boolean,
-  label: {
-    type: String,
-    default: "Rows"
-  },
-  selectedLabel: {
-    type: String,
-    default: "Selected"
-  },
-  selectedCount: {
-    type: Number,
-    default: 0
-  },
-  itemCount: {
-    type: Number,
-    default: 0
-  },
-  summary: {
-    type: Object,
-    default: null
-  },
-  columns: {
-    type: Array,
-    required: true
-  },
-  stickyColspan: {
-    type: Number,
-    default: 2
-  }
+	loading: Boolean,
+	label: {
+		type: String,
+		default: "Rows"
+	},
+	selectedLabel: {
+		type: String,
+		default: "Selected"
+	},
+	selectedCount: {
+		type: Number,
+		default: 0
+	},
+	itemCount: {
+		type: Number,
+		default: 0
+	},
+	summary: {
+		type: Object,
+		default: null
+	},
+	columns: {
+		type: Array,
+		required: true
+	},
+	stickyColspan: {
+		type: Number,
+		default: 2
+	}
 });
 
 const summaryColumns = computed(() => {
-  // The sticky columns are where we display the selection count and should not be included in the summary columns
-  return props.columns.slice(props.stickyColspan - 1);
+	// The sticky columns are where we display the selection count and should not be included in the summary columns
+	return props.columns.slice(props.stickyColspan - 1);
 });
 
 function formatValue(column) {
-  const value = props.summary[column.name];
-  if (value === undefined) return "";
+	const value = props.summary[column.name];
+	if (value === undefined) return "";
 
-  if (column.format) {
-    return column.format(value);
-  }
-  return value;
+	if (column.format) {
+		return column.format(value);
+	}
+	return value;
 }
 </script>

package/src/components/ActionTable/listControls.ts

@@ -16,8 +16,8 @@ import { getFilterFromUrl } from "./listHelpers";
 
 export function useListControls(name: string, options: ListControlsOptions): ActionController {
 	let isInitialized = false;
-	let vueRoute: RouteLocationNormalizedLoaded | null = null;
-	let vueRouter: Router | null = null;
+	let vueRoute: RouteLocationNormalizedLoaded | null | undefined;
+	let vueRouter: Router | null | undefined;
 	const PAGE_SETTINGS_KEY = `dx-${name}-pager`;
 	const pagedItems = shallowRef<PagedItems | null>(null);
 	const activeFilter = ref<ListControlsFilter>({});
@@ -75,8 +75,12 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 	async function loadList() {
 		if (!isInitialized) return;
 		isLoadingList.value = true;
-		setPagedItems(await options.routes.list(pager.value));
-		isLoadingList.value = false;
+		try {
+			setPagedItems(await options.routes.list(pager.value));
+			isLoadingList.value = false;
+		} catch (e) {
+			// Fail silently
+		}
 	}
 
 	async function loadSummary() {
@@ -87,8 +91,12 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 		if (selectedRows.value.length) {
 			summaryFilter.id = selectedRows.value.map((row) => row.id);
 		}
-		summary.value = await options.routes.summary(summaryFilter);
-		isLoadingSummary.value = false;
+		try {
+			summary.value = await options.routes.summary(summaryFilter);
+			isLoadingSummary.value = false;
+		} catch (e) {
+			// Fail silently
+		}
 	}
 
 	async function loadListAndSummary() {
@@ -110,8 +118,12 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 	async function loadFieldOptions() {
 		if (!options.routes.fieldOptions || !isInitialized) return;
 		isLoadingFilters.value = true;
-		fieldOptions.value = await options.routes.fieldOptions(activeFilter.value) || {};
-		isLoadingFilters.value = false;
+		try {
+			fieldOptions.value = await options.routes.fieldOptions(activeFilter.value) || {};
+			isLoadingFilters.value = false;
+		} catch (e) {
+			// Fail silently
+		}
 	}
 
 	/**
@@ -197,18 +209,22 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 	async function loadMore(index: number, perPage: number | undefined = undefined) {
 		if (!options.routes.more) return false;
 
-		const newItems = await options.routes.more({
-			page: index + 1,
-			perPage,
-			filter: { ...activeFilter.value, ...globalFilter.value }
-		});
-
-		if (newItems && newItems.length > 0) {
-			setPagedItems({
-				data: [...(pagedItems.value?.data || []), ...newItems],
-				meta: { total: pagedItems.value?.meta?.total || 0 }
+		try {
+			const newItems = await options.routes.more({
+				page: index + 1,
+				perPage,
+				filter: { ...activeFilter.value, ...globalFilter.value }
 			});
-			return true;
+
+			if (newItems && newItems.length > 0) {
+				setPagedItems({
+					data: [...(pagedItems.value?.data || []), ...newItems],
+					meta: { total: pagedItems.value?.meta?.total || 0 }
+				});
+				return true;
+			}
+		} catch (e) {
+			// Fail silently
 		}
 
 		return false;
@@ -283,14 +299,18 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 	async function getActiveItemDetails() {
 		if (!activeItem.value || !options.routes.details) return;
 
-		const result = await options.routes.details(activeItem.value);
+		try {
+			const result = await options.routes.details(activeItem.value);
 
-		if (!result || !result.__type || !result.id) {
-			return console.error("Invalid response from details route: All responses must include a __type and id field. result =", result);
-		}
+			if (!result || !result.__type || !result.id) {
+				return console.error("Invalid response from details route: All responses must include a __type and id field. result =", result);
+			}
 
-		// Reassign the active item to the store object to ensure reactivity
-		activeItem.value = storeObject(result);
+			// Reassign the active item to the store object to ensure reactivity
+			activeItem.value = storeObject(result);
+		} catch (e) {
+			// Fail silently
+		}
 	}
 
 	// Whenever the active item changes, fill the additional item details
@@ -314,12 +334,8 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 		activePanel.value = panel;
 
 		// Push vue router change /:id/:panel
-		if (vueRoute && vueRouter && item?.id) {
-			vueRouter.push({
-				name: Array.isArray(vueRoute.name) ? vueRoute.name[0] : vueRoute.name,
-				params: { id: item.id, panel },
-				replace: true
-			});
+		if (item?.id) {
+			updateRouteParams({ id: item.id, panel });
 		}
 	}
 
@@ -330,7 +346,7 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 		activeItem.value = item ? storeObject(item) : item;
 
 		if (!item?.id) {
-			vueRouter?.push({ name: vueRoute?.name || "home" });
+			updateRouteParams({});
 		}
 	}
 
@@ -385,17 +401,16 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 	}
 
 	// Initialize the list actions and load settings, lists, summaries, filter fields, etc.
-	function initialize(initOptions: ListControlsInitializeOptions) {
-		vueRouter = initOptions.vueRouter;
-		vueRoute = initOptions.vueRoute;
+	function initialize(initOptions?: ListControlsInitializeOptions) {
+		vueRouter = initOptions?.vueRouter;
+		vueRoute = initOptions?.vueRouter?.currentRoute.value;
 		isInitialized = true;
 		loadSettings();
 
-		console.log("initialize() called", name, options, "initOptions", initOptions);
 		/**
 		 * Watch the id params in the route and set the active item to the item with the given id.
 		 */
-		if (options.routes.details && vueRoute) {
+		if (options.routes.details && vueRoute && vueRouter) {
 			const { params, meta } = vueRoute;
 
 			const controlRouteName = vueRoute.name;
@@ -409,6 +424,18 @@ export function useListControls(name: string, options: ListControlsOptions): Act
 		}
 	}
 
+	/**
+	 * Updates the URL bar and route to the given params.
+	 */
+	function updateRouteParams(params: AnyObject) {
+		if (vueRouter && vueRoute) {
+			vueRouter.push({
+				name: (Array.isArray(vueRoute.name) ? vueRoute.name[0] : vueRoute.name) || "home",
+				params
+			});
+		}
+	}
+
 	function setPanelFromRoute(params: RouteParams, meta: AnyObject) {
 		const id = Array.isArray(params?.id) ? params.id[0] : params?.id;
 		if (id && meta.type) {

package/src/helpers/app.ts

@@ -0,0 +1,20 @@
+let appRefreshed = false;
+
+export function refreshApplication(callback: () => void) {
+	// Only allow refreshing the application once
+	if (appRefreshed) return;
+	appRefreshed = true;
+
+	// Create a hidden iframe
+	const iframe = document.createElement("iframe");
+	iframe.style.display = "none";
+	iframe.src = window.location.href;
+	document.body.appendChild(iframe);
+
+	// Listen for the iframe to finish loading
+	iframe.onload = () => {
+		// Remove the iframe
+		document.body.removeChild(iframe);
+		callback();
+	};
+}

package/src/helpers/index.ts

@@ -1,4 +1,5 @@
 export * from "./actions";
+export * from "./app";
 export * from "./array";
 export * from "./compatibility";
 export * from "./date";

package/src/helpers/request.ts

@@ -1,6 +1,6 @@
 import { Ref } from "vue";
 import { danxOptions } from "../config";
-import { RequestApi } from "../types";
+import { HttpResponse, RequestApi } from "../types";
 
 /**
  * A simple request helper that wraps the fetch API
@@ -17,59 +17,57 @@ export const request: RequestApi = {
 	},
 
 	async call(url, options) {
-		try {
+		options = options || {};
+		const abortKey = options?.abortOn !== undefined ? options.abortOn : url;
+		const timestamp = new Date().getTime();
+
+		if (abortKey) {
 			const abort = new AbortController();
-			const timestamp = new Date().getTime();
-
-			console.log("call", url, options);
-			if (options?.abortOn) {
-				console.log("setting up abort", options.abortOn);
-				const previousAbort = options.abortOn && request.abortControllers[options.abortOn];
-				// If there is already an abort controller set for this key, abort it
-				if (previousAbort) {
-					previousAbort.abort.abort();
-				}
-
-				// Set the new abort controller for this key
-				request.abortControllers[options.abortOn] = { abort, timestamp };
-				options.signal = abort.signal;
+			const previousAbort = request.abortControllers[abortKey];
+			// If there is already an abort controller set for this key, abort it
+			if (previousAbort) {
+				previousAbort.abort.abort("Request was aborted due to a newer request being made");
 			}
 
-			console.log("current timestamp:", timestamp);
-			const response = await fetch(request.url(url), options);
+			// Set the new abort controller for this key
+			request.abortControllers[abortKey] = { abort, timestamp };
+			options.signal = abort.signal;
+		}
 
-			// handle the case where the request was aborted too late, and we need to abort the response via timestamp check
-			if (options?.abortOn) {
-				if (request.abortControllers[options.abortOn].timestamp !== timestamp) {
-					console.log("aborting request", options.abortOn, timestamp, "!==", request.abortControllers[options.abortOn].timestamp);
-					return { abort: true };
-				}
+		const response = await fetch(request.url(url), options);
 
-				delete request.abortControllers[options.abortOn];
-			}
+		// Verify the app version of the client and server are matching
+		checkAppVersion(response);
 
-			const result = await response.json();
-
-			if (response.status === 401) {
-				const onUnauthorized = danxOptions.value.request?.onUnauthorized;
-				return onUnauthorized ? onUnauthorized(response) : {
-					error: true,
-					message: "Unauthorized"
-				};
+		// handle the case where the request was aborted too late, and we need to abort the response via timestamp check
+		if (abortKey) {
+			// If the request was aborted too late, but there was still another request that was made after the current,
+			// then abort the current request with an abort flag
+			if (timestamp < request.abortControllers[abortKey].timestamp) {
+				throw new Error("Request was aborted due to a newer request being made: " + timestamp + " < " + request.abortControllers[abortKey].timestamp);
 			}
 
-			if (response.status > 400) {
-				if (result.exception && !result.error) {
-					result.error = true;
-				}
-			}
+			// Otherwise, the current is the most recent request, so we can delete the abort controller
+			delete request.abortControllers[abortKey];
+		}
+
+		const result = await response.json();
 
-			return result;
-		} catch (error: any) {
-			return {
-				error: error.message || "An error occurred fetching the data"
+		if (response.status === 401) {
+			const onUnauthorized = danxOptions.value.request?.onUnauthorized;
+			return onUnauthorized ? onUnauthorized(response) : {
+				error: true,
+				message: "Unauthorized"
 			};
 		}
+
+		if (response.status > 400) {
+			if (result.exception && !result.error) {
+				result.error = true;
+			}
+		}
+
+		return result;
 	},
 	async get(url, options) {
 		return await request.call(url, {
@@ -97,6 +95,23 @@ export const request: RequestApi = {
 	}
 };
 
+/**
+ * Checks the app version of the client and server to see if they match.
+ * If they do not match, the onAppVersionMismatch callback is called
+ */
+function checkAppVersion(response: HttpResponse) {
+	const requestOptions = danxOptions.value.request;
+	if (!requestOptions || !requestOptions.headers || !requestOptions.onAppVersionMismatch) {
+		return;
+	}
+
+	const clientAppVersion = requestOptions.headers["X-App-Version"] || "";
+	const serverAppVersion = response.headers.get("X-App-Version");
+	if (clientAppVersion && clientAppVersion !== serverAppVersion) {
+		requestOptions.onAppVersionMismatch(serverAppVersion);
+	}
+}
+
 /**
  * Fetches a resource list applying the filter. If there is a selected resource,
  * stores that resource from the already populated list. If that resource does not exist

package/src/helpers/routes.ts

@@ -5,8 +5,7 @@ import { request } from "./request";
 export function useActionRoutes(baseUrl: string): ListControlsRoutes {
 	return {
 		list(pager?) {
-			console.log("here");
-			return request.post(`${baseUrl}/list`, pager, { abortOn: "list" });
+			return request.post(`${baseUrl}/list`, pager);
 		},
 		summary(filter) {
 			return request.post(`${baseUrl}/summary`, { filter });

package/src/styles/quasar-reset.scss

@@ -45,7 +45,7 @@
 
 		&.q-field--labeled {
 			.q-field__control-container {
-				padding-top: 1.1rem;
+				padding-top: 0;
 			}
 
 			&.q-textarea {

package/src/types/controls.d.ts

@@ -1,5 +1,5 @@
 import { ComputedRef, Ref, ShallowRef } from "vue";
-import { RouteLocationNormalizedLoaded, Router } from "vue-router";
+import { Router } from "vue-router";
 import { ActionTargetItem } from "./actions";
 import { AnyObject, LabelValueItem } from "./shared";
 
@@ -68,8 +68,7 @@ export interface PagedItems {
 }
 
 export interface ListControlsInitializeOptions {
-	vueRoute: RouteLocationNormalizedLoaded;
-	vueRouter: Router;
+	vueRouter?: Router;
 }
 
 export interface ActionController {

package/src/types/requests.d.ts

@@ -1,3 +1,5 @@
+import { AnyObject } from "src/types/shared";
+
 export interface RequestApi {
 	abortControllers: { [key: string]: { abort: AbortController, timestamp: number } };
 
@@ -20,8 +22,9 @@ export interface HttpResponse {
 
 export interface RequestOptions {
 	baseUrl?: string;
-	headers?: object;
+	headers?: AnyObject;
 	onUnauthorized?: (response) => object;
+	onAppVersionMismatch?: (version) => void;
 }
 
 export interface RequestCallOptions extends RequestInit {

package/tsconfig.json

@@ -42,7 +42,6 @@
     "types/**/*.d.ts"
   ],
   "exclude": [
-    "node_modules",
     "dist",
     "**/*.spec.ts"
   ]