Merge branch 'master' of https://github.com/appwrite/appwrite into feat-hooks-implementation

2024-06-03 11:24:48 +12:00 · 2022-07-27 05:59:52 +00:00 · 2022-07-27 05:59:52 +00:00 · 11ea71f7b9
parent 9e2cc6bb21 0bf39bd152
commit 11ea71f7b9
12 changed files with 91 additions and 66 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,14 @@
+# Version 0.15.3
+## Features
+- Added hint during Installation for DNS Configuration by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/2450
+## Bugs
+- Fixed Migration for Attributes and Indexes by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/3568
+- Fixed Closed Icon in the alerts to be centered by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/3594
+- Fixed Response Model for Get and Update Database Endpoint by @ishanvyas22 in https://github.com/appwrite/appwrite/pull/3553
+- Fixed Missing Usage on Functions exection by @Meldiron in https://github.com/appwrite/appwrite/pull/3543
+- Fixed Validation for Permissions to only accept a maximum of 100 Permissions for all endpoints by @Meldiron in https://github.com/appwrite/appwrite/pull/3532
+- Fixed backwards compatibility for Create Email Session Endpoint by @stnguyen90 in https://github.com/appwrite/appwrite/pull/3517
+
 # Version 0.15.2
 ## Bugs
 - Fixed Realtime Authentication for the Console by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/3506
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -317,7 +317,7 @@ The Runtimes for all supported cloud functions (multicore builds) can be found a

 For generating a new console SDK follow the next steps:

-1. Update the console spec file located at `app/config/specs/swagger2-0.12.x.console.json` from the dynamic version located at `https://localhost/specs/swagger2?platform=console`
+1. Update the console spec file located at `app/config/specs/swagger2-<version-number>.console.json` using Appwrite Tasks. Run the `php app/cli.php specs <version-number> normal` command in a running `appwrite/appwrite` container.
 2. Generate a new SDK using the command `php app/cli.php sdks`
 3. Change your working dir using `cd app/sdks/console-web`
 4. Build the new SDK `npm run build`
@ -462,4 +462,4 @@ Submitting documentation updates, enhancements, designs, or bug fixes. Spelling

 ### Helping Someone

-Searching for Appwrite on Discord, GitHub, or StackOverflow and helping someone else who needs help. You can also help by teaching others how to contribute to Appwrite's repo!
+Searching for Appwrite on Discord, GitHub, or StackOverflow and helping someone else who needs help. You can also help by teaching others how to contribute to Appwrite's repo!
--- a/README-CN.md
+++ b/README-CN.md
@ -59,7 +59,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:0.15.2
+    appwrite/appwrite:0.15.3
 ```

 ### Windows
@ -71,7 +71,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:0.15.2
+    appwrite/appwrite:0.15.3
 ```

 #### PowerShell
@ -81,7 +81,7 @@ docker run -it --rm ,
    --volume /var/run/docker.sock:/var/run/docker.sock ,
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
    --entrypoint="install" ,
-    appwrite/appwrite:0.15.2
+    appwrite/appwrite:0.15.3
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
--- a/README.md
+++ b/README.md
@ -65,7 +65,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:0.15.2
+    appwrite/appwrite:0.15.3
 ```

 ### Windows
@ -77,7 +77,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:0.15.2
+    appwrite/appwrite:0.15.3
 ```

 #### PowerShell
@ -87,7 +87,7 @@ docker run -it --rm ,
    --volume /var/run/docker.sock:/var/run/docker.sock ,
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
    --entrypoint="install" ,
-    appwrite/appwrite:0.15.2
+    appwrite/appwrite:0.15.3
 ```

 Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after installation completes.
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@ -180,7 +180,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '0.18.1',
+                'version' => '0.18.3',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
--- a/app/init.php
+++ b/app/init.php
@ -89,7 +89,7 @@ const APP_LIMIT_ARRAY_PARAMS_SIZE = 100; // Default maximum of how many elements
 const APP_LIMIT_ARRAY_ELEMENT_SIZE = 4096; // Default maximum length of element in array parameter represented by maximum URL length.
 const APP_LIMIT_SUBQUERY = 1000;
 const APP_CACHE_BUSTER = 402;
-const APP_VERSION_STABLE = '0.15.2';
+const APP_VERSION_STABLE = '0.15.3';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "ba7b34fde01f0df8d38d795caf6f6b7f",
+    "content-hash": "677b1b47c8567f0b7b05645e2bbc7bc7",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -5346,18 +5346,9 @@
            "time": "2022-05-17T05:48:52+00:00"
        }
    ],
-    "aliases": [
-        {
-            "package": "utopia-php/framework",
-            "version": "dev-fix-options-hook",
-            "alias": "0.19.21",
-            "alias_normalized": "0.19.21.0"
-        }
-    ],
+    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {
-        "utopia-php/framework": 20
-    },
+    "stability-flags": [],
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
--- a/public/dist/styles/default-ltr.css
+++ b/public/dist/styles/default-ltr.css
--- a/public/dist/styles/default-rtl.css
+++ b/public/dist/styles/default-rtl.css
--- a/public/styles/comps/alerts.less
+++ b/public/styles/comps/alerts.less
@ -41,14 +41,14 @@
        i {
          cursor: pointer;
          position: absolute;
-          font-size: 14px;
-          line-height: 20px;
-          top: 9px;
-          .func-start(9px);
+          font-size: 12px;
+          line-height: 24px;
+          top: 8px;
+          .func-start(8px);
          color: var(--config-color-background-dark);
          background: var(--config-color-normal);
-          width: 22px;
-          height: 22px;
+          width: 24px;
+          height: 24px;
          border-radius: 50%;
        }

--- a/src/Appwrite/Migration/Migration.php
+++ b/src/Appwrite/Migration/Migration.php
@ -47,7 +47,8 @@ abstract class Migration
        '0.14.2' => 'V13',
        '0.15.0' => 'V14',
        '0.15.1' => 'V14',
-        '0.15.2' => 'V14'
+        '0.15.2' => 'V14',
+        '0.15.3' => 'V14'
    ];

    /**
--- a/src/Appwrite/Migration/Version/V14.php
+++ b/src/Appwrite/Migration/Version/V14.php
@ -3,10 +3,11 @@
 namespace Appwrite\Migration\Version;

 use Appwrite\Migration\Migration;
-use Utopia\App;
+use Exception;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Query;

 class V14 extends Migration
 {
@ -208,6 +209,14 @@ class V14 extends Migration
                        } catch (\Throwable $th) {
                            Console::warning($th->getMessage());
                        }
+                        /**
+                         * Migrate Attributes
+                         */
+                        $this->migrateAttributesAndCollections('attributes', $collection);
+                        /**
+                         * Migrate Indexes
+                         */
+                        $this->migrateAttributesAndCollections('indexes', $collection);
                    }, $document);
                }
            }, $documents);
@ -220,6 +229,53 @@ class V14 extends Migration
        } while (!is_null($nextCollection));
    }

+    protected function migrateAttributesAndCollections(string $type, Document $collection): void
+    {
+        /**
+         * Offset pagination instead of cursor, since documents are re-created!
+         */
+        $offset = 0;
+        $attributesCount = $this->projectDB->count($type, queries: [new Query('collectionId', Query::TYPE_EQUAL, [$collection->getId()])]);
+
+        do {
+            $documents = $this->projectDB->find($type, limit: $this->limit, offset: $offset, queries: [new Query('collectionId', Query::TYPE_EQUAL, [$collection->getId()])]);
+            $offset += $this->limit;
+
+            foreach ($documents as $document) {
+                go(function (Document $document, string $internalId, string $type) {
+                    try {
+                        /**
+                         * Skip already migrated Documents.
+                         */
+                        if (!is_null($document->getAttribute('databaseId'))) {
+                            return;
+                        }
+                        /**
+                         * Add Internal ID 'collectionInternalId' for Subqueries.
+                         */
+                        $document->setAttribute('collectionInternalId', $internalId);
+                        /**
+                         * Add Internal ID 'databaseInternalId' for Subqueries.
+                         */
+                        $document->setAttribute('databaseInternalId', '1');
+                        /**
+                         * Add Internal ID 'databaseId'.
+                         */
+                        $document->setAttribute('databaseId', 'default');
+
+                        /**
+                         * Re-create Attribute.
+                         */
+                        $this->projectDB->deleteDocument($document->getCollection(), $document->getId());
+                        $this->projectDB->createDocument($document->getCollection(), $document->setAttribute('$id', "1_{$internalId}_{$document->getAttribute('key')}"));
+                    } catch (\Throwable $th) {
+                        Console::error("Failed to {$type} document: " . $th->getMessage());
+                    }
+                }, $document, $collection->getInternalId(), $type);
+            }
+        } while ($offset < $attributesCount);
+    }
+
    /**
     * Migrate all Collections.
     *
@ -580,40 +636,6 @@ class V14 extends Migration
                    $document->setAttribute('teamInternalId', $internalId);
                }

-                break;
-            case 'attributes':
-            case 'indexes':
-                /**
-                 * Add Internal ID 'collectionId' for Subqueries.
-                 */
-                if (!empty($document->getAttribute('collectionId')) && is_null($document->getAttribute('collectionInternalId'))) {
-                    $internalId = $this->projectDB->getDocument('database_1', $document->getAttribute('collectionId'))->getInternalId();
-                    $document->setAttribute('collectionInternalId', $internalId);
-                }
-                /**
-                 * Add Internal ID 'databaseInternalId' for Subqueries.
-                 */
-                if (is_null($document->getAttribute('databaseInternalId'))) {
-                    $document->setAttribute('databaseInternalId', '1');
-                }
-                /**
-                 * Add Internal ID 'databaseInternalId' for Subqueries.
-                 */
-                if (is_null($document->getAttribute('databaseId'))) {
-                    $document->setAttribute('databaseId', 'default');
-                }
-
-                try {
-                    /**
-                     * Re-create Collection Document
-                     */
-                    $internalId = $this->projectDB->getDocument('database_1', $document->getAttribute('collectionId'))->getInternalId();
-                    $this->projectDB->deleteDocument($document->getCollection(), $document->getId());
-                    $this->projectDB->createDocument($document->getCollection(), $document->setAttribute('$id', "1_{$internalId}_{$document->getAttribute('key')}"));
-                } catch (\Throwable $th) {
-                    Console::warning("Create Collection Document - {$th->getMessage()}");
-                }
-                $document = null;
                break;
            case 'platforms':
                /**