@globalbrain/sefirot 4.40.3 → 4.41.0

package/lib/blocks/lens/FilterOperator.ts

@@ -6,28 +6,19 @@ export type FilterOperator =
   | '<'
   | '<='
   | 'in'
+  | 'contains'
+  | 'startsWith'
+  | 'endsWith'
 
-export const FilterOperatorTextDict: Record<FilterOperator, string> = {
-  '=': 'Is',
-  '!=': 'Is not',
-  '>': 'Greater',
-  '>=': 'Greater or equal',
-  '<': 'Less',
-  '<=': 'Less or equal',
-  'in': 'In'
-}
-
-export interface FilterOperatorOption {
-  label: string
-  value: FilterOperator
-}
-
-export const FilterOperatorOptionDict: Record<FilterOperator, FilterOperatorOption> = {
-  '=': { label: 'Is', value: '=' },
-  '!=': { label: 'Is not', value: '!=' },
-  '>': { label: 'Greater', value: '>' },
-  '>=': { label: 'Greater or equal', value: '>=' },
-  '<': { label: 'Less', value: '<' },
-  '<=': { label: 'Less or equal', value: '<=' },
-  'in': { label: 'In', value: 'in' }
+export const FilterOperatorLabelDict: Record<FilterOperator, string> = {
+  '=': 'is',
+  '!=': 'is not',
+  '>': 'greater',
+  '>=': 'greater or equal',
+  '<': 'less',
+  '<=': 'less or equal',
+  'in': 'in',
+  'contains': 'contains',
+  'startsWith': 'starts with',
+  'endsWith': 'ends with'
 }

package/lib/blocks/lens/Rule.ts

@@ -1,6 +1,10 @@
 export type Rule =
   | MaxLengthRule
   | RequiredRule
+  | BeforeRule
+  | BeforeOrEqualRule
+  | AfterRule
+  | AfterOrEqualRule
 
 export interface MaxLengthRule {
   type: 'max_length'
@@ -10,3 +14,23 @@ export interface MaxLengthRule {
 export interface RequiredRule {
   type: 'required'
 }
+
+export interface BeforeRule {
+  type: 'before'
+  date: string
+}
+
+export interface BeforeOrEqualRule {
+  type: 'before_or_equal'
+  date: string
+}
+
+export interface AfterRule {
+  type: 'after'
+  date: string
+}
+
+export interface AfterOrEqualRule {
+  type: 'after_or_equal'
+  date: string
+}

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

@@ -135,7 +135,7 @@ const queryFilter = computed(() => {
     return []
   }
   return ['$or', props.queryKeys.map((key) => {
-    return [key, 'like', `%${query.value}%`]
+    return [key, 'contains', query.value]
   })]
 })
 

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

@@ -2,7 +2,7 @@
 import { computedAsync } from '@vueuse/core'
 import { computed } from 'vue'
 import { type FieldData } from '../FieldData'
-import { type FilterOperator, FilterOperatorTextDict } from '../FilterOperator'
+import { type FilterOperator, FilterOperatorLabelDict } from '../FilterOperator'
 import { useFieldFactory } from '../composables/FieldFactory'
 
 export interface Props {
@@ -33,7 +33,7 @@ const fieldText = computed(() => {
 })
 
 const operatorText = computed(() => {
-  return FilterOperatorTextDict[props.condition.operator]
+  return FilterOperatorLabelDict[props.condition.operator]
 })
 
 const valueText = computedAsync(async () => {

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

@@ -8,7 +8,7 @@ import { useTrans } from '../../../composables/Lang'
 import { useValidation } from '../../../composables/Validation'
 import { required } from '../../../validation/rules'
 import { type FieldData } from '../FieldData'
-import { type FilterOperator, FilterOperatorOptionDict } from '../FilterOperator'
+import { type FilterOperator, FilterOperatorLabelDict } from '../FilterOperator'
 import { useFieldFactory } from '../composables/FieldFactory'
 import { type FilterInput } from '../filter-inputs/FilterInput'
 
@@ -53,7 +53,7 @@ const field = computed(() => {
 
 const operatorOptions = computed(() => {
   return field.value?.availableFilterOperators().map((op) => {
-    return FilterOperatorOptionDict[op]
+    return { label: FilterOperatorLabelDict[op], value: op }
   }) ?? []
 })
 

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

@@ -20,7 +20,10 @@ export class TextField extends Field<TextFieldData> {
 
     return {
       '=': text,
-      '!=': text
+      '!=': text,
+      'contains': text,
+      'startsWith': text,
+      'endsWith': text
     }
   }
 

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

@@ -20,7 +20,10 @@ export class TextareaField extends Field<TextareaFieldData> {
 
     return {
       '=': text,
-      '!=': text
+      '!=': text,
+      'contains': text,
+      'startsWith': text,
+      'endsWith': text
     }
   }
 

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

@@ -1,5 +1,6 @@
 import { type ValidationArgs, type ValidationRuleWithParams } from '@vuelidate/core'
-import { maxLength, required } from '../../../validation/rules'
+import { type Day, day } from '../../../support/Day'
+import { after, afterOrEqual, before, beforeOrEqual, maxLength, required } from '../../../validation/rules'
 import { type Rule } from '../Rule'
 
 /**
@@ -18,5 +19,42 @@ function mapRule(rule: Rule): ValidationRuleWithParams {
       return maxLength(rule.length)
     case 'required':
       return required()
+    case 'before':
+      return before(resolveDate(rule.date))
+    case 'before_or_equal':
+      return beforeOrEqual(resolveDate(rule.date))
+    case 'after':
+      return after(resolveDate(rule.date))
+    case 'after_or_equal':
+      return afterOrEqual(resolveDate(rule.date))
+    default: {
+      const _exhaustive: never = rule
+      throw new Error(`Unsupported rule type: ${(_exhaustive as Rule).type}`)
+    }
+  }
+}
+
+/**
+ * Resolves a date string from the backend rule definition into a `Day`. The
+ * keywords mirror the relative date strings accepted by Laravel's `before`
+ * and `after` validators.
+ */
+function resolveDate(date: string): Day {
+  switch (date) {
+    case 'now':
+      return day()
+    case 'today':
+      return day().startOf('day')
+    case 'tomorrow':
+      return day().add(1, 'day').startOf('day')
+    case 'yesterday':
+      return day().subtract(1, 'day').startOf('day')
+    default: {
+      const parsed = day(date)
+      if (!parsed.isValid()) {
+        throw new Error(`Invalid date string in validation rule: "${date}"`)
+      }
+      return parsed
+    }
   }
 }

package/lib/components/SButton.vue

@@ -119,6 +119,7 @@ function onClick(): void {
       :class="classes"
       :href
       role="button"
+      :tabindex="props.disabled ? -1 : 0"
       @click="onClick"
     >
       <span class="content">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@globalbrain/sefirot",
-  "version": "4.40.3",
+  "version": "4.41.0",
   "description": "Vue Components for Global Brain Design System.",
   "keywords": [
     "components",
@@ -48,11 +48,10 @@
     "type": "vue-tsc --noEmit",
     "lint": "eslint --fix",
     "lint:fail": "eslint --max-warnings 0",
-    "vitest": "vitest",
-    "vitest:run": "vitest run",
-    "coverage": "vitest run --coverage",
-    "test": "pnpm run type && pnpm run lint && pnpm run coverage",
-    "test:fail": "pnpm run type && pnpm run lint:fail && pnpm run coverage",
+    "test": "vitest",
+    "test:fail": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "check": "pnpm run type && pnpm run lint:fail && pnpm run test:fail",
     "release": "pnpm whoami >/dev/null 2>&1 || pnpm login && release-it"
   },
   "dependencies": {