Update dependencies and add array support to column attributes

This commit is contained in:
Arman committed 2024-02-06 16:26:43 +01:00
1 parent c81e5079fb
commit 95972888a5
6 files changed
+76 -32

No files matched your search

+9 -9
View File
@@ -7,8 +7,8 @@
"name": "@appwrite/console",
"dependencies": {
"@appwrite.io/console": "^0.6.0-rc.9",
"@appwrite.io/pink": "0.2.0",
"@appwrite.io/pink-icons": "0.2.0",
"@appwrite.io/pink": "0.3.0",
"@appwrite.io/pink-icons": "0.3.0",
"@popperjs/core": "^2.11.8",
"@sentry/svelte": "^7.66.0",
"@sentry/tracing": "^7.66.0",
@@ -168,19 +168,19 @@
}
},
"node_modules/@appwrite.io/pink": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.2.0.tgz",
"integrity": "sha512-ni6O/yPiWkCYQ68PNcbmus6QrPpIEl7xmzKHU2dkV2L19RVio8thtBtT9ckJJ8uBMGsczASWs0fUqOxIvBmtNw==",
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.3.0.tgz",
"integrity": "sha512-VTYCfcEGnqScwGta7ort/qoKN0Gnyq2h/ROYcp9meEFSCjYBWMgWZWbwSSXsL8vwwxnN9aTh1sO5mJX0zHAPVg==",
"dependencies": {
"@appwrite.io/pink-icons": "0.2.0",
"@appwrite.io/pink-icons": "0.3.0",
"normalize.css": "^8.0.1",
"the-new-css-reset": "^1.11.2"
}
},
"node_modules/@appwrite.io/pink-icons": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.2.0.tgz",
"integrity": "sha512-wThBUGdvpwT0q2fcUapiugfBiB4RFDvTlW6p+U7Dol61mmCpNteFSIoBPiPJzN5015n1v4UEWL/rdOia4CWdBQ=="
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.3.0.tgz",
"integrity": "sha512-Jus3jsWMidne02/mqXbRtLFsuiYQiB3fjZ2ip8auqwhvk65yzGtodPiTPA8Us1fD2vaRlNx/jER5MK0XmqXKxg=="
},
"node_modules/@babel/code-frame": {
"version": "7.23.5",
+2 -2
View File
@@ -19,8 +19,8 @@
},
"dependencies": {
"@appwrite.io/console": "^0.6.0-rc.9",
"@appwrite.io/pink": "0.2.0",
"@appwrite.io/pink-icons": "0.2.0",
"@appwrite.io/pink": "0.3.0",
"@appwrite.io/pink-icons": "0.3.0",
"@popperjs/core": "^2.11.8",
"@sentry/svelte": "^7.66.0",
"@sentry/tracing": "^7.66.0",
+51 -18
View File
@@ -1,7 +1,12 @@
<script lang="ts">
import { Button, InputNumber } from '$lib/elements/forms';
import InputSelect from '$lib/elements/forms/inputSelect.svelte';
import InputText from '$lib/elements/forms/inputText.svelte';
import {
Button,
InputNumber,
InputSelect,
InputText,
InputTags,
FormList
} from '$lib/elements/forms';
import { Query } from '@appwrite.io/console';
import { createEventDispatcher } from 'svelte';
import { tags, type Operator, queries } from './store';
@@ -17,6 +22,7 @@
let columnId: string | null = null;
$: column = $columns.find((c) => c.id === columnId) as Column;
let arrayValues = [];
dispatch('apply', { applied: $tags.length });
@@ -72,6 +78,12 @@
toTag: (attribute) => `**${attribute}** is null`,
types: ['string', 'integer', 'double', 'boolean', 'datetime', 'relationship'],
hideInput: true
},
contains: {
toQuery: Query.contains,
toTag: (attribute, input) =>
`**${attribute}** contains **${Array.isArray(input) ? input.join(' or') : input}**`,
types: ['string', 'integer', 'double', 'boolean', 'datetime', 'enum']
}
};
@@ -95,7 +107,7 @@
$: {
columnId;
value = null;
value = column?.array ? [] : null;
}
// This Map is keyed by tags, and has a query as the value
@@ -134,23 +146,44 @@
bind:value={operatorKey} />
</ul>
{#if column && operator && !operator?.hideInput}
<div class="u-margin-block-start-8">
{#if column.type === 'integer' || column.type === 'double'}
<InputNumber id="value" bind:value placeholder="Enter value" />
{:else if column.type === 'boolean'}
<InputSelect
{#if column?.array}
<FormList class="u-margin-block-start-8">
{#if column.type === 'enum'}
test
<!-- <InputSelect
id="value"
placeholder="Select a value"
required={true}
options={[
{ label: 'True', value: true },
{ label: 'False', value: false }
].filter(Boolean)}
bind:value />
{:else}
<InputText id="value" bind:value placeholder="Enter value" />
{/if}
</div>
options={column.enum.map((v) => ({ label: v, value: v }))}
bind:value /> -->
{:else}
<InputTags
label="values"
showLabel={false}
id="value"
bind:tags={arrayValues}
placeholder="Enter values" />
{/if}
</FormList>
{:else}
<ul class="u-margin-block-start-8">
{#if column.type === 'integer' || column.type === 'double'}
<InputNumber id="value" bind:value placeholder="Enter value" />
{:else if column.type === 'boolean'}
<InputSelect
id="value"
placeholder="Select a value"
required={true}
options={[
{ label: 'True', value: true },
{ label: 'False', value: false }
].filter(Boolean)}
bind:value />
{:else}
<InputText id="value" bind:value placeholder="Enter value" />
{/if}
</ul>
{/if}
{/if}
<Button text disabled={isDisabled} class="u-margin-block-start-4" submit>
<i class="icon-plus" />
+10 -1
View File
@@ -13,7 +13,15 @@ export function isHTMLInputElement(el: unknown): el is HTMLInputElement {
// eslint-disable-next-line @typescript-eslint/ban-types
export type Prettify<T> = T & {};
const columnTypes = ['string', 'integer', 'double', 'boolean', 'datetime', 'relationship'] as const;
const columnTypes = [
'string',
'integer',
'double',
'boolean',
'datetime',
'relationship',
'enum'
] as const;
export type ColumnType = (typeof columnTypes)[number];
export type Column = {
id: string;
@@ -28,6 +36,7 @@ export type Column = {
* Set to false to disable filtering for this column
*/
filter?: boolean;
array?: boolean;
};
export function isValueOfStringEnum<T extends Record<string, string>>(
@@ -28,7 +28,8 @@
id: attribute.key,
title: attribute.key,
type: attribute.type as ColumnType,
show: selected?.includes(attribute.key) ?? true
show: selected?.includes(attribute.key) ?? true,
array: attribute?.array
}))
);
@@ -91,7 +91,8 @@
id: attribute.key,
title: attribute.key,
type: attribute.type as ColumnType,
show: selected?.includes(attribute.key) ?? true
show: selected?.includes(attribute.key) ?? true,
array: attribute?.array
}))
);
}