Skip to content

1.8.x #2010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Jun 12, 2025
Merged

1.8.x #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
03a94a9
added selector field for the string encrypted field
ArnabChatterjee20k May 22, 2025
6938834
updated the popover
ArnabChatterjee20k May 22, 2025
2455a4e
added checkbox and layout for pro and free users
ArnabChatterjee20k May 23, 2025
541b709
added condition for showing whether the attribute is encrypted or not
ArnabChatterjee20k May 23, 2025
fce1edf
added passing encrypt in the create string
ArnabChatterjee20k May 23, 2025
5719a9a
added icons and interactive text
ArnabChatterjee20k May 23, 2025
2a6ed29
added anchor to the upgrade
ArnabChatterjee20k May 23, 2025
09fa149
updated plans
ArnabChatterjee20k May 23, 2025
f425d0f
Merge branch 'main' into dat-534-string-encryption
ArnabChatterjee20k May 23, 2025
ed7935f
added reactive state for string size and the cloud and self hosted en…
ArnabChatterjee20k May 24, 2025
dda19ef
update: ui logic.
ItzNotABug May 27, 2025
b9c8cd7
Merge branch 'main' into 'dat-534-string-encryption'.
ItzNotABug May 27, 2025
7b46ad3
address design comments.
ItzNotABug May 27, 2025
0875889
update: array attribute type message.
ItzNotABug May 27, 2025
e65a4f7
Merge pull request #1882 from appwrite/dat-534-string-encryption
ItzNotABug May 28, 2025
04bfa73
Merge remote-tracking branch 'origin/main' into 1.8.x
abnegate Jun 10, 2025
655c85d
Merge remote-tracking branch 'origin/main' into 1.8.x
abnegate Jun 10, 2025
f6804f2
Update SDK
abnegate Jun 10, 2025
411fe28
Format
abnegate Jun 10, 2025
8a775c9
Fix lock
abnegate Jun 10, 2025
93937c3
Add lengths
abnegate Jun 10, 2025
fdef7a2
Revert "Update SDK"
abnegate Jun 10, 2025
6c05a61
Update SDK
abnegate Jun 10, 2025
de5b73d
Fix push
abnegate Jun 10, 2025
9255eb0
Fix condition
abnegate Jun 11, 2025
3f3aacc
Input length
abnegate Jun 11, 2025
9c3416d
Add encrypt feature flag
abnegate Jun 11, 2025
5e66755
Format
abnegate Jun 11, 2025
5d3ccc3
Fix index length input
abnegate Jun 11, 2025
af0d3f1
Add length to index overview
abnegate Jun 11, 2025
db809be
Format
abnegate Jun 11, 2025
199015b
Fix icon condition
abnegate Jun 11, 2025
9e118ab
Simplify
abnegate Jun 12, 2025
89cbf34
add: feature-flags for local env example file.
ItzNotABug Jun 12, 2025
cb096b4
Merge remote-tracking branch 'origin/main' into 1.8.x
abnegate Jun 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PUBLIC_CONSOLE_MODE=self-hosted
PUBLIC_CONSOLE_FEATURE_FLAGS=
PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt
PUBLIC_APPWRITE_MULTI_REGION=false
PUBLIC_APPWRITE_ENDPOINT=http://localhost/v1
PUBLIC_STRIPE_KEY=
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
"PUBLIC_CONSOLE_MODE=cloud"
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import"
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt"
"PUBLIC_APPWRITE_MULTI_REGION=true"
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
build-args: |
"PUBLIC_CONSOLE_MODE=self-hosted"
"PUBLIC_APPWRITE_MULTI_REGION=false"
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import"
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt"
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"

publish-cloud-no-regions:
Expand Down Expand Up @@ -156,6 +156,6 @@ jobs:
build-args: |
"PUBLIC_CONSOLE_MODE=cloud"
"PUBLIC_APPWRITE_MULTI_REGION=false"
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import"
"PUBLIC_CONSOLE_FEATURE_FLAGS=sites,csv-import,attribute-encrypt"
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@ai-sdk/svelte": "^1.1.24",
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@a5e5564",
"@appwrite.io/console": "^1.9.0",
"@appwrite.io/pink-icons": "0.25.0",
"@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
"@appwrite.io/pink-legacy": "^1.0.3",
Expand Down
19 changes: 9 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/lib/flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ function isFlagEnabled(name: string) {

export const flags = {
showSites: isFlagEnabled('sites'),
showCsvImport: isFlagEnabled('csv-import')
showCsvImport: isFlagEnabled('csv-import'),
showAttributeEncrypt: isFlagEnabled('attribute-encrypt')
};
1 change: 1 addition & 0 deletions src/lib/helpers/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export type Column = PinkColumn & {
format?: string;
exclude?: boolean;
elements?: string[] | { value: string | number; label: string }[];
encrypt?: boolean;
};

export function isValueOfStringEnum<T extends Record<string, string>>(
Expand Down
1 change: 1 addition & 0 deletions src/lib/sdk/billing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ export type Plan = {
users: number;
teams: number;
databases: number;
databasesAllowEncrypt: boolean;
buckets: number;
fileSize: number;
functions: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
Link,
Popover,
Table,
Tooltip,
Typography
} from '@appwrite.io/pink-svelte';
import Create from '../createAttribute.svelte';
import { isRelationship } from '../document-[document]/attributes/store';
import { isRelationship, isString } from '../document-[document]/attributes/store';
import FailedModal from '../failedModal.svelte';
import CreateIndex from '../indexes/createIndex.svelte';
import { attributes, type Attributes, isCsvImportInProgress } from '../store';
Expand All @@ -33,7 +34,8 @@
IconPlus,
IconSwitchHorizontal,
IconTrash,
IconViewList
IconViewList,
IconLockClosed
} from '@appwrite.io/pink-icons-svelte';
import type { ComponentProps } from 'svelte';
import { Click, trackEvent } from '$lib/actions/analytics';
Expand Down Expand Up @@ -112,25 +114,38 @@
{:else}
<Icon icon={option.icon} size="s" />
{/if}
<span class="text u-trim-1" data-private>{attribute.key}</span>
{#if attribute.status !== 'available'}
<Badge
size="s"
variant="secondary"
content={attribute.status}
type={getAttributeStatusBadge(attribute.status)} />
{#if attribute.error}
<Link.Button
variant="muted"
on:click={(e) => {
e.preventDefault();
error = attribute.error;
showFailed = true;
}}>Details</Link.Button>
<Layout.Stack direction="row" alignItems="center" gap="s">
<Layout.Stack inline direction="row" alignItems="center" gap="xxs">
<span class="text u-trim-1" data-private>{attribute.key}</span>
{#if isString(attribute) && attribute.encrypt}
<Tooltip>
<Icon
size="s"
icon={IconLockClosed}
color="--fgcolor-neutral-tertiary" />
<div slot="tooltip">Encrypted</div>
</Tooltip>
{/if}
</Layout.Stack>
{#if attribute.status !== 'available'}
<Badge
size="s"
variant="secondary"
content={attribute.status}
type={getAttributeStatusBadge(attribute.status)} />
{#if attribute.error}
<Link.Button
variant="muted"
on:click={(e) => {
e.preventDefault();
error = attribute.error;
showFailed = true;
}}>Details</Link.Button>
{/if}
{:else if attribute.required}
<Badge size="xs" variant="secondary" content="required" />
{/if}
{:else if attribute.required}
<Badge size="s" variant="secondary" content="required" />
{/if}
</Layout.Stack>
</Layout.Stack>
</Table.Cell>
<Table.Cell column="type" {root}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,4 @@
label="Array"
bind:checked={data.array}
disabled={data.required || editing}
description="Indicate whether this attribute should act as an array, with the default value set as an empty
array." />
description="Indicate whether this attribute is an array. Defaults to an empty array." />
Loading
Loading