Merge remote-tracking branch 'origin/1.8.x' into documents-db-api

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php

@@ -64,7 +64,7 @@ class Update extends Action
             ))
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
             ->param('collectionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Collection ID.', false, ['dbForProject'])
-            ->param('name', null, new Text(128), 'Collection name. Max length: 128 chars.')
+            ->param('name', null, new Text(128), 'Collection name. Max length: 128 chars.', true)
             ->param('permissions', null, new Nullable(new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE)), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
             ->param('documentSecurity', false, new Boolean(true), 'Enables configuring permissions for individual documents. A user needs one of document or collection level permissions to access a document. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
             ->param('enabled', true, new Boolean(), 'Is collection enabled? When set to \'disabled\', users cannot access the collection but Server SDKs with and API key can still read and write to the collection. No data is lost when this is toggled.', true)
@@ -76,7 +76,7 @@ class Update extends Action
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $name, ?array $permissions, bool $documentSecurity, bool $enabled, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, ?string $name, ?array $permissions, bool $documentSecurity, bool $enabled, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Event $queueForEvents, Authorization $authorization): void
     {
         $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
         if ($database->isEmpty()) {
@@ -88,6 +88,12 @@ class Update extends Action
             throw new Exception($this->getNotFoundException(), params: [$collectionId]);
         }
 
+        if ($name) {
+            $collection = $collection->setAttribute('name', $name);
+        }
+
+        $searchName = $name ?? $collection->getAttribute('name');
+
         $permissions ??= $collection->getPermissions();
 
         // Map aggregate permissions into the multiple permissions they represent.
@@ -99,11 +105,10 @@ class Update extends Action
             'database_' . $database->getSequence(),
             $collectionId,
             $collection
-                ->setAttribute('name', $name)
                 ->setAttribute('$permissions', $permissions)
                 ->setAttribute('documentSecurity', $documentSecurity)
                 ->setAttribute('enabled', $enabled)
-                ->setAttribute('search', \implode(' ', [$collectionId, $name]))
+                ->setAttribute('search', \implode(' ', [$collectionId, $searchName]))
         );
 
         $dbForDatabases = $getDatabasesDB($database);

src/Appwrite/Platform/Modules/Databases/Http/Databases/Update.php

@@ -57,7 +57,7 @@ class Update extends Action
                 ),
             ])
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
-            ->param('name', null, new Text(128), 'Database name. Max length: 128 chars.')
+            ->param('name', null, new Text(128), 'Database name. Max length: 128 chars.', true)
             ->param('enabled', true, new Boolean(), 'Is database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
             ->inject('response')
             ->inject('dbForProject')
@@ -65,7 +65,7 @@ class Update extends Action
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $name, bool $enabled, UtopiaResponse $response, Database $dbForProject, Event $queueForEvents): void
+    public function action(string $databaseId, ?string $name, bool $enabled, UtopiaResponse $response, Database $dbForProject, Event $queueForEvents): void
     {
         $database = $dbForProject->getDocument('databases', $databaseId);
 
@@ -73,10 +73,15 @@ class Update extends Action
             throw new Exception(Exception::DATABASE_NOT_FOUND, params: [$databaseId]);
         }
 
+        if ($name) {
+            $database = $database->setAttribute('name', $name);
+        }
+
+        $searchName = $name ?? $database->getAttribute('name');
+
         $database = $dbForProject->updateDocument('databases', $databaseId, $database
-            ->setAttribute('name', $name)
             ->setAttribute('enabled', $enabled)
-            ->setAttribute('search', implode(' ', [$databaseId, $name])));
+            ->setAttribute('search', implode(' ', [$databaseId, $searchName])));
 
         $queueForEvents->setParam('databaseId', $database->getId());
 

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php

@@ -56,7 +56,7 @@ class Update extends CollectionUpdate
             ))
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
             ->param('tableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Table ID.', false, ['dbForProject'])
-            ->param('name', null, new Text(128), 'Table name. Max length: 128 chars.')
+            ->param('name', null, new Text(128), 'Table name. Max length: 128 chars.', true)
             ->param('permissions', null, new Nullable(new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE)), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
             ->param('rowSecurity', false, new Boolean(true), 'Enables configuring permissions for individual rows. A user needs one of row or table-level permissions to access a row. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
             ->param('enabled', true, new Boolean(), 'Is table enabled? When set to \'disabled\', users cannot access the table but Server SDKs with and API key can still read and write to the table. No data is lost when this is toggled.', true)

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Update.php

@@ -48,7 +48,7 @@ class Update extends DatabaseUpdate
                 contentType: ContentType::JSON
             ))
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
-            ->param('name', null, new Text(128), 'Database name. Max length: 128 chars.')
+            ->param('name', null, new Text(128), 'Database name. Max length: 128 chars.', true)
             ->param('enabled', true, new Boolean(), 'Is database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
             ->inject('response')
             ->inject('dbForProject')

src/Appwrite/Platform/Tasks/SDKs.php

@@ -12,6 +12,7 @@ use Appwrite\SDK\Language\Flutter;
 use Appwrite\SDK\Language\Go;
 use Appwrite\SDK\Language\GraphQL;
 use Appwrite\SDK\Language\Kotlin;
+use Appwrite\SDK\Language\Markdown;
 use Appwrite\SDK\Language\Node;
 use Appwrite\SDK\Language\PHP;
 use Appwrite\SDK\Language\Python;
@@ -31,6 +32,27 @@ use Utopia\Validator\WhiteList;
 
 class SDKs extends Action
 {
+    protected array $supportedSDKS = [
+        'web',
+        'cli',
+        'php',
+        'nodejs',
+        'deno',
+        'python',
+        'ruby',
+        'flutter',
+        'react-native',
+        'dart',
+        'go',
+        'swift',
+        'apple',
+        'dotnet',
+        'android',
+        'graphql',
+        'rest',
+        'markdown',
+    ];
+
     public static function getName(): string
     {
         return 'sdks';
@@ -61,6 +83,9 @@ class SDKs extends Action
         if (!$sdks) {
             $selectedPlatform ??= Console::confirm('Choose Platform ("' . implode('", "', static::getPlatforms()) . '" or "*" for all):');
             $selectedSDK ??= \strtolower(Console::confirm('Choose SDK ("*" for all):'));
+            if ($selectedSDK !== '*' && !\in_array($selectedSDK, $this->supportedSDKS)) {
+                throw new \Exception('Unknown SDK "' . $selectedSDK . '" given. Options are: ' . implode(', ', $this->supportedSDKS));
+            }
         } else {
             $sdks = explode(',', $sdks);
         }
@@ -252,6 +277,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     case 'rest':
                         $config = new REST();
                         break;
+                    case 'markdown':
+                        $config = new Markdown();
+                        $config->setNPMPackage('@appwrite.io/docs');
+                        break;
                     default:
                         throw new \Exception('Language "' . $language['key'] . '" not supported');
                 }

src/Appwrite/Platform/Workers/Certificates.php

@@ -276,7 +276,7 @@ class Certificates extends Action
             ]));
 
         // Rule not found (or) not in the expected state
-        if ($rule->isEmpty() || $rule->getAttribute('status') !== RULE_STATUS_CERTIFICATE_GENERATING) {
+        if ($rule->isEmpty() || !\in_array($rule->getAttribute('status'), [RULE_STATUS_CERTIFICATE_GENERATING, RULE_STATUS_VERIFIED])) {
             Console::warning('Certificate generation for ' . $domain->get() . ' is skipped as the associated rule is either empty or not in the expected state.');
             return;
         }

src/Appwrite/Utopia/Response/Model/Deployment.php

@@ -96,10 +96,10 @@ class Deployment extends Model
             ])
             ->addRule('status', [
                 'type' => self::TYPE_ENUM,
-                'description' => 'The deployment status. Possible values are "waiting", "processing", "building", "ready", and "failed".',
+                'description' => 'The deployment status. Possible values are "waiting", "processing", "building", "ready", "canceled" and "failed".',
                 'default' => '',
                 'example' => 'ready',
-                'enum' => ['waiting', 'processing', 'building', 'ready', 'failed'],
+                'enum' => ['waiting', 'processing', 'building', 'ready', 'canceled', 'failed'],
             ])
             ->addRule('buildLogs', [
                 'type' => self::TYPE_STRING,