@globalbrain/sefirot 4.53.0 → 4.55.0

package/lib/blocks/lens/Rule.ts

@@ -21,6 +21,7 @@ export type Rule =
   | AfterRule
   | AfterOrEqualRule
   | FileExtensionRule
+  | MimeTypesRule
   | MaxFileSizeRule
   | EachRule
 
@@ -122,6 +123,11 @@ export interface FileExtensionRule {
   extensions: string[]
 }
 
+export interface MimeTypesRule {
+  type: 'mime_types'
+  mimeTypes: string[]
+}
+
 export interface MaxFileSizeRule {
   type: 'max_file_size'
   size: string

package/lib/blocks/lens/components/LensCatalogStateSort.vue

@@ -39,9 +39,17 @@ const orderTextDict = {
 }
 
 function getFieldName(sort: LensQuerySort): string {
-  return lang === 'ja'
-    ? props.fields[sort[0]].labelJa
-    : props.fields[sort[0]].labelEn
+  // A still-applied sort can reference a field that's not in the field set — a
+  // stale saved/URL sort, or a sort emitted under a companion key (e.g. an
+  // avatar sorting by its display-name field). Fall back to the raw key rather
+  // than crash, mirroring how the filter chip handles an unknown field.
+  const field = props.fields[sort[0]]
+
+  if (!field) {
+    return sort[0]
+  }
+
+  return lang === 'ja' ? field.labelJa : field.labelEn
 }
 
 function getOrderText(sort: LensQuerySort): string {

package/lib/blocks/lens/fields/AvatarField.ts

@@ -29,6 +29,13 @@ export class AvatarField extends Field<AvatarFieldData> {
     return {}
   }
 
+  // Sort by the display-name companion (resolved by the active language), since
+  // the field value itself is the image URL. With no companion configured there's
+  // nothing meaningful to sort on, so the field stays unsortable (no sort menu).
+  protected override sortKey(): string | null {
+    return this.nameKey()
+  }
+
   override dataListItemComponent(): any {
     return this.defineDataListItemComponent((value) => {
       // Render nothing for a missing image so SDataListItem shows its empty

package/lib/blocks/lens/fields/Field.ts

@@ -81,12 +81,25 @@ export abstract class Field<T extends FieldData> {
     }
   }
 
+  /**
+   * The field key sorts are emitted under — the catalog sends it to the backend,
+   * which orders by that field's column. Defaults to the field's own key; a
+   * subtype whose own value isn't meaningful to sort on can redirect it (e.g. an
+   * avatar sorts by its display-name companion). A `null` makes the field
+   * unsortable, so no sort menu is shown.
+   */
+  protected sortKey(): string | null {
+    return this.data.key
+  }
+
   /**
    * Renders the table sort menu for the field. The sort maybe null when
-   * the field `sortable` option is false.
+   * the field `sortable` option is false (or it has no sortable key).
    */
   tableSortMenu(onSortUpdated: (sort: LensQuerySort) => void): DropdownSection | null {
-    if (!this.data.sortable) {
+    const sortKey = this.sortKey()
+
+    if (!this.data.sortable || sortKey === null) {
       return null
     }
 
@@ -100,8 +113,8 @@ export abstract class Field<T extends FieldData> {
     return {
       type: 'menu',
       options: [
-        { label: t.sort_asc, onClick: () => onSortUpdated?.([this.data.key, 'asc']) },
-        { label: t.sort_desc, onClick: () => onSortUpdated?.([this.data.key, 'desc']) }
+        { label: t.sort_asc, onClick: () => onSortUpdated?.([sortKey, 'asc']) },
+        { label: t.sort_desc, onClick: () => onSortUpdated?.([sortKey, 'desc']) }
       ]
     }
   }

package/lib/blocks/lens/validation/RuleMapper.ts

@@ -13,6 +13,7 @@ import {
   maxFileSize,
   maxLength,
   maxValue,
+  mimeTypes,
   minLength,
   minValue,
   negativeInteger,
@@ -130,6 +131,8 @@ function mapRule(rule: Exclude<Rule, EachRule>): ValidationRuleWithParams | null
       return afterOrEqual(resolveDate(rule.date))
     case 'file_extension':
       return fileExtension(rule.extensions)
+    case 'mime_types':
+      return mimeTypes(rule.mimeTypes)
     case 'max_file_size':
       return maxFileSize(rule.size)
     default: {

package/lib/validation/rules/index.ts

@@ -12,6 +12,7 @@ export { maxFileSize } from './maxFileSize'
 export { maxLength } from './maxLength'
 export { maxTotalFileSize } from './maxTotalFileSize'
 export { maxValue } from './maxValue'
+export { mimeTypes } from './mimeTypes'
 export { minLength } from './minLength'
 export { minValue } from './minValue'
 export { month } from './month'

package/lib/validation/rules/mimeTypes.ts

@@ -0,0 +1,15 @@
+import { createRule } from '../Rule'
+import { mimeTypes as baseMimeTypes } from '../validators/mimeTypes'
+
+export const message = {
+  en: 'The file type is invalid.',
+  ja: 'ファイル形式が正しくありません。'
+}
+
+export function mimeTypes(patterns: string[], msg?: string) {
+  return createRule({
+    message: ({ lang }) => msg ?? message[lang],
+    optional: true,
+    validation: (value) => baseMimeTypes(value, patterns)
+  })
+}

package/lib/validation/validators/index.ts

@@ -12,6 +12,7 @@ export * from './maxFileSize'
 export * from './maxLength'
 export * from './maxTotalFileSize'
 export * from './maxValue'
+export * from './mimeTypes'
 export * from './minLength'
 export * from './minValue'
 export * from './month'

package/lib/validation/validators/mimeTypes.ts

@@ -0,0 +1,19 @@
+export function mimeTypes(value: unknown, patterns: string[]): boolean {
+  if (!(value instanceof File)) { return false }
+
+  // The browser doesn't always report a type (e.g. some drag-and-drop or
+  // clipboard sources); defer to the server's content-based check in that case
+  // rather than rejecting a possibly-valid file outright.
+  if (value.type === '') { return true }
+
+  const type = value.type.toLowerCase()
+
+  return patterns.some((pattern) => {
+    const p = pattern.toLowerCase()
+
+    // A `type/*` wildcard (e.g. `image/*`) matches any subtype of that
+    // top-level type, mirroring the HTML accept attribute and Laravel's
+    // `mimetypes` rule.
+    return p.endsWith('/*') ? type.startsWith(p.slice(0, -1)) : type === p
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalbrain/sefirot",
-  "version": "4.53.0",
+  "version": "4.55.0",
   "description": "Vue Components for Global Brain Design System.",
   "keywords": [
     "components",