@ditojs/admin 1.20.1 → 1.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "1.20.1",
+  "version": "1.22.0",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -39,14 +39,14 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/build": "^1.20.0",
-    "@ditojs/ui": "^1.20.0",
-    "@ditojs/utils": "^1.20.0",
+    "@ditojs/build": "^1.22.0",
+    "@ditojs/ui": "^1.22.0",
+    "@ditojs/utils": "^1.22.0",
     "codeflask": "^1.4.1",
-    "filesize": "^10.0.5",
+    "filesize": "^10.0.6",
     "filesize-parser": "^1.5.0",
     "nanoid": "^4.0.0",
-    "tinycolor2": "^1.4.2",
+    "tinycolor2": "^1.5.2",
     "tiptap": "^1.32.2",
     "tiptap-commands": "^1.17.1",
     "tiptap-extensions": "^1.35.2",
@@ -54,7 +54,7 @@
     "vue": "^2.7.14",
     "vue-color": "^2.8.1",
     "vue-js-modal": "^2.0.1",
-    "vue-multiselect": "^2.1.6",
+    "vue-multiselect": "^2.1.7",
     "vue-notification": "^1.3.20",
     "vue-router": "^3.6.5",
     "vue-spinner": "^1.0.4",
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@ditojs/build": "^1.19.0",
     "pug": "^3.0.2",
-    "sass": "1.56.1",
-    "type-fest": "^3.3.0",
-    "typescript": "^4.9.3",
-    "vite": "^3.2.5",
-    "vite-plugin-vue2": "^2.0.2"
+    "sass": "1.57.1",
+    "type-fest": "^3.5.3",
+    "typescript": "^4.9.4",
+    "vite": "^4.0.4",
+    "vite-plugin-vue2": "^2.0.3"
   },
   "types": "types",
-  "gitHead": "66013b5bf5ba7c216f950f39f311f56851de2821"
+  "gitHead": "e1693edb8bf18e074606a842f2f2bacc1d2856cb"
 }

package/src/DitoAdmin.js

@@ -288,10 +288,11 @@ function onBeforeViteUpdate(event) {
     // Why the stored `deps` are missing this part of the URL, I cannot say…
     const updates = []
     for (const update of event.updates) {
-      updates.push(update, {
-        ...update,
-        acceptedPath: update.acceptedPath.replace(/\?v=[0-9a-f]+&/, '?')
-      })
+      updates.push(update) // Keep the original update.
+      const acceptedPath = update.acceptedPath.replace(/\?v=[0-9a-f]+&/i, '?')
+      if (acceptedPath !== update.acceptedPath) {
+        updates.push({ ...update, acceptedPath })
+      }
     }
     event.updates = updates
   }

package/src/mixins/ResourceMixin.js

@@ -245,19 +245,11 @@ export default {
         const { response } = error
         if (!callback(error, response)) {
           const data = response?.data
-          if (data && isString(data.type)) {
-            this.notify({
-              type: 'error',
-              title: labelize(data.type),
-              text: data.message || error
-            })
-          } else {
-            this.notify({
-              type: 'error',
-              title: 'Request Error',
-              text: error
-            })
-          }
+          const title = isString(data?.type)
+            ? labelize(data.type)
+            : 'Error'
+          const text = data?.message ?? error
+          this.notify({ type: 'error', title, text })
         }
       }
       this.setLoading(false, loadingOptions)

package/types/index.d.ts

@@ -35,8 +35,8 @@ export type RequestMethod = <T>({
   method: HTTPVerb
   data: any
   /** @deprecated use query instead */
-  params: ConstructorParameters<typeof URLSearchParams>[0]
-  query: ConstructorParameters<typeof URLSearchParams>[0]
+  params: Record<string, string | string[]> | [string, string][]
+  query: Record<string, string | string[]> | [string, string][]
   headers: Record<string, string>
 }) => Promise<RequestMethodResponse<T>>
 
@@ -1035,11 +1035,14 @@ export type DitoContext<$Item = any> = {
     cache?: 'local' | 'global'
     url: string
     /**
-     * @defaultValue `'get'`
+     * @default 'get'
      */
     method?: HTTPVerb
-    params?: any
+    /** @deprecated use query instead */
+    params?: Record<string, string | string[]> | [string, string][]
+    query?: Record<string, string | string[]> | [string, string][]
     data?: any
+    resource?: Resource
   }): Promise<T>
   format: typeof utilsFormat
   navigate(location: string | { path: string }): Promise<boolean>
@@ -1056,31 +1059,16 @@ export type DitoContext<$Item = any> = {
 }
 
 export type View<$Item = any> = {
+  type: 'view',
   resource?: Form['resource']
   clipboard?: Form['clipboard']
-} & (
-  | InputSchema<$Item>
-  | RadioSchema<$Item>
-  | CheckboxSchema<$Item>
-  | CheckboxesSchema<$Item>
-  | ColorSchema<$Item>
-  | SelectSchema<$Item>
-  | MultiselectSchema<$Item>
-  | ListSchema<$Item>
-  | TextareaSchema<$Item>
-  | CodeSchema<$Item>
-  | NumberSchema<$Item>
-  | SliderSchema<$Item>
-  | UploadSchema<$Item>
-  | MarkupSchema<$Item>
-  | ButtonSchema<$Item>
-  | SwitchSchema<$Item>
-  | DateSchema<$Item>
-  | ComponentSchema<$Item>
-  | LabelSchema<$Item>
-  | SectionSchema<$Item>
-  | HiddenSchema<$Item>
-)
+  component?: Component<$Item>
+} | {
+  type: 'view',
+  resource?: Form['resource']
+  clipboard?: Form['clipboard']
+  components?: Components<$Item>
+}
 
 export type Component<$Item = any> =
   | InputSchema<$Item>
@@ -1105,7 +1093,7 @@ export type Component<$Item = any> =
   | SectionSchema<$Item>
   | HiddenSchema<$Item>
 
-export type Components<$Item = any> = {
+export type Components<$Item = any> =  Component<$Item>[] | {
   [$name: string]: Component<$Item>
 }
 
@@ -1115,6 +1103,8 @@ export type Buttons<$Item> = Record<
 >
 
 export type Form<$Item = any> = {
+  type: 'form'
+
   /**
    * The name of the item model produced by the form.
    */
@@ -1133,9 +1123,9 @@ export type Form<$Item = any> = {
    */
   tabs?: Record<
     string,
-    Omit<Form<$Item>, 'tabs'> & {
+    Omit<Form<$Item>, 'tabs' | 'type'> & {
       defaultTab?: OrItemAccessor<$Item, {}, boolean>
-    }
+  }
   >
   // TODO: document components
   components?: Components<$Item>