Merge remote-tracking branch 'origin/master' into fix-teams-roles-no-owner

2024-07-05 22:51:24 +12:00 · 2022-07-27 19:57:06 +12:00 · 2022-07-27 19:57:06 +12:00 · d92328dbb4
parent 9333efd3c3 0eb14052ec
commit d92328dbb4
16 changed files with 182 additions and 102 deletions
--- 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.md
+++ b/README.md
@ -99,6 +99,30 @@ For advanced production and custom installation, check out our Docker [environme

 If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/installation).

+
+## One-Click Setups
+
+In addition to running Appwrite locally, you can also launch Appwrite using a pre-configured setup. This allows you to get up and running with Appwrite quickly without installing Docker on your local machine.
+
+Choose from one of the providers below:
+
+<table border="0">
+  <tr>
+    <td align="center" width="100" height="100">
+      <a href="https://marketplace.digitalocean.com/apps/appwrite">
+        <img width="50" height="39" src="public/images/integrations/digitalocean-logo.svg" alt="DigitalOcean Logo" />
+          <br /><sub><b>DigitalOcean</b></sub></a>
+        </a>
+    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://gitpod.io/#https://github.com/appwrite/integration-for-gitpod">
+        <img width="50" height="39" src="public/images/integrations/gitpod-logo.svg" alt="Gitpod Logo" />
+          <br /><sub><b>Gitpod</b></sub></a>    
+      </a>
+    </td>
+  </tr>
+</table>
+
 ## Getting Started

 Getting started with Appwrite is as easy as creating a new project, choosing your platform, and integrating its SDK into your code. You can easily get started with your platform of choice by reading one of our Getting Started tutorials.
--- 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/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -284,7 +284,7 @@ App::get('/v1/databases/:databaseId')
    ->label('sdk.description', '/docs/references/databases/get.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_COLLECTION)
+    ->label('sdk.response.model', Response::MODEL_DATABASE)
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->inject('response')
    ->inject('dbForProject')
@ -392,7 +392,7 @@ App::put('/v1/databases/:databaseId')
    ->label('sdk.description', '/docs/references/databases/update.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_COLLECTION)
+    ->label('sdk.response.model', Response::MODEL_DATABASE)
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->param('name', null, new Text(128), 'Collection name. Max length: 128 chars.')
    ->inject('response')
--- 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": "380d806f7540199698d12a7abeb13534",
+    "content-hash": "677b1b47c8567f0b7b05645e2bbc7bc7",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -2051,16 +2051,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "0.18.7",
+            "version": "0.18.9",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "d542ee433f1a545d926ffaf707bdf952dc18a52e"
+                "reference": "227b3ca919149b7b0d6556c8effe9ee46ed081e6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/d542ee433f1a545d926ffaf707bdf952dc18a52e",
-                "reference": "d542ee433f1a545d926ffaf707bdf952dc18a52e",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/227b3ca919149b7b0d6556c8effe9ee46ed081e6",
+                "reference": "227b3ca919149b7b0d6556c8effe9ee46ed081e6",
                "shasum": ""
            },
            "require": {
@ -2109,9 +2109,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.18.7"
+                "source": "https://github.com/utopia-php/database/tree/0.18.9"
            },
-            "time": "2022-07-11T10:20:33+00:00"
+            "time": "2022-07-19T09:42:53+00:00"
        },
        {
            "name": "utopia-php/domains",
@ -2387,16 +2387,16 @@
        },
        {
            "name": "utopia-php/orchestration",
-            "version": "dev-cli-lib-upgrade",
+            "version": "0.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/orchestration.git",
-                "reference": "06f2afef516aca900ddb483689ebe6f8e7037d28"
+                "reference": "94263976413871efb6b16157a7101a81df3b6d78"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/06f2afef516aca900ddb483689ebe6f8e7037d28",
-                "reference": "06f2afef516aca900ddb483689ebe6f8e7037d28",
+                "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/94263976413871efb6b16157a7101a81df3b6d78",
+                "reference": "94263976413871efb6b16157a7101a81df3b6d78",
                "shasum": ""
            },
            "require": {
@ -2436,9 +2436,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/orchestration/issues",
-                "source": "https://github.com/utopia-php/orchestration/tree/cli-lib-upgrade"
+                "source": "https://github.com/utopia-php/orchestration/tree/0.6.0"
            },
-            "time": "2022-07-13T14:55:12+00:00"
+            "time": "2022-07-13T16:47:18+00:00"
        },
        {
            "name": "utopia-php/preloader",
@ -5346,18 +5346,9 @@
            "time": "2022-05-17T05:48:52+00:00"
        }
    ],
-    "aliases": [
-        {
-            "package": "utopia-php/orchestration",
-            "version": "dev-cli-lib-upgrade",
-            "alias": "0.4.1",
-            "alias_normalized": "0.4.1.0"
-        }
-    ],
+    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {
-        "utopia-php/orchestration": 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/images/integrations/digitalocean-logo.svg
+++ b/public/images/integrations/digitalocean-logo.svg
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="65.2 173.5 180 180" style="enable-background:new 65.2 173.5 180 180;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0080FF;}
+</style>
+<g id="XMLID_229_">
+	<g id="XMLID_690_">
+		<g id="XMLID_691_">
+			<g>
+				<g id="XMLID_44_">
+					<g id="XMLID_48_">
+						<path id="XMLID_49_" class="st0" d="M155.2,351.7v-34.2c36.2,0,64.3-35.9,50.4-74c-5.1-14.1-16.4-25.4-30.5-30.5
+							c-38.1-13.8-74,14.2-74,50.4l0,0H67c0-57.7,55.8-102.7,116.3-83.8c26.4,8.3,47.5,29.3,55.7,55.7
+							C257.9,295.9,213,351.7,155.2,351.7z"/>
+					</g>
+					<polygon id="XMLID_47_" class="st0" points="155.3,317.6 121.3,317.6 121.3,283.6 121.3,283.6 155.3,283.6 155.3,283.6 					
+						"/>
+					<polygon id="XMLID_46_" class="st0" points="121.3,343.8 95.1,343.8 95.1,343.8 95.1,317.6 121.3,317.6 					"/>
+					<path id="XMLID_45_" class="st0" d="M95.1,317.6H73.2l0,0v-21.9l0,0h21.9l0,0V317.6z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
--- a/public/images/integrations/gitpod-logo.svg
+++ b/public/images/integrations/gitpod-logo.svg
@ -0,0 +1,9 @@
+<svg viewBox="0 0 189 208" width="90" height="100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M112.287 10.3584C117.9 20.2129 114.487 32.7666 104.664 38.3978L43.5862 73.41C41.9693 74.3369 40.972 76.0577 40.972 77.9209V132.899C40.972 134.763 41.9693 136.483 43.5862 137.41L91.9123 165.113C93.515 166.032 95.485 166.032 97.0877 165.113L145.414 137.41C147.031 136.483 148.028 134.763 148.028 132.899V98.7091L104.567 123.309C94.7131 128.886 82.2179 125.394 76.6581 115.509C71.0983 105.624 74.5793 93.0891 84.4331 87.5117L146.62 52.3128C165.563 41.591 189 55.321 189 77.1398V137.066C189 151.102 181.503 164.062 169.355 171.026L113.844 202.847C101.858 209.718 87.1424 209.718 75.1558 202.847L19.6453 171.026C7.49714 164.062 0 151.102 0 137.066V73.7544C0 59.7184 7.49714 46.7585 19.6453 39.7947L84.3361 2.71125C94.1595 -2.91993 106.673 0.503802 112.287 10.3584Z" fill="url(#paint0_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="142.253" y1="31.4537" x2="44.8052" y2="184.17" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFB45B"/>
+<stop offset="1" stop-color="#FF8A00"/>
+</linearGradient>
+</defs>
+</svg>
--- 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/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':
                /**
--- a/src/Appwrite/Stats/Usage.php
+++ b/src/Appwrite/Stats/Usage.php
@ -95,7 +95,7 @@ class Usage
        ],
        'databases.databaseId.collections.collectionId.documents.create' => [
            'table' => 'appwrite_usage_databases_documents_create',
-            'groupBy' => ['collectionId'],
+            'groupBy' => ['databaseId', 'collectionId'],
        ],
        'databases.databaseId.collections.collectionId.documents.read' => [
            'table' => 'appwrite_usage_databases_documents_read',
@ -292,36 +292,43 @@ class Usage
        $query .= "GROUP BY time({$period['key']}), \"projectId\" {$groupBy} ";
        $query .= "FILL(null)";

-        $result = $this->influxDB->query($query);
+        try {
+            $result = $this->influxDB->query($query);
+            $points = $result->getPoints();
+            foreach ($points as $point) {
+                $projectId = $point['projectId'];

-        $points = $result->getPoints();
-        foreach ($points as $point) {
-            $projectId = $point['projectId'];
+                if (!empty($projectId) && $projectId !== 'console') {
+                    $metricUpdated = $metric;

-            if (!empty($projectId) && $projectId !== 'console') {
-                $metricUpdated = $metric;
-
-                if (!empty($groupBy)) {
-                    foreach ($options['groupBy'] as $groupBy) {
-                        $groupedBy = $point[$groupBy] ?? '';
-                        if (empty($groupedBy)) {
-                            continue;
+                    if (!empty($groupBy)) {
+                        foreach ($options['groupBy'] as $groupBy) {
+                            $groupedBy = $point[$groupBy] ?? '';
+                            if (empty($groupedBy)) {
+                                continue;
+                            }
+                            $metricUpdated = str_replace($groupBy, $groupedBy, $metricUpdated);
                        }
-                        $metricUpdated = str_replace($groupBy, $groupedBy, $metric);
                    }
+
+                    $time = \strtotime($point['time']);
+                    $value = (!empty($point['value'])) ? $point['value'] : 0;
+
+                    $this->createOrUpdateMetric(
+                        $projectId,
+                        $time,
+                        $period['key'],
+                        $metricUpdated,
+                        $value,
+                        0
+                    );
                }
-
-                $time = \strtotime($point['time']);
-                $value = (!empty($point['value'])) ? $point['value'] : 0;
-
-                $this->createOrUpdateMetric(
-                    $projectId,
-                    $time,
-                    $period['key'],
-                    $metricUpdated,
-                    $value,
-                    0
-                );
+            }
+        } catch (\Exception $e) { // if projects are deleted this might fail
+            if (is_callable($this->errorHandler)) {
+                call_user_func($this->errorHandler, $e, "sync_metric_{$metric}_influxdb");
+            } else {
+                throw $e;
            }
        }
    }