mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
Merge branch '1.8.x' into ser-377
This commit is contained in:
Hemachandar
+1
-4
@@ -108,10 +108,7 @@ class XList extends Action
|
||||
$audit = new Audit($dbForProject);
|
||||
$type = $this->getCollectionsEventsContext();
|
||||
$context = $this->getContext();
|
||||
$resource = match ($context) {
|
||||
ROWS => "database/$databaseId/grid/$type/$collectionId/$context/{$document->getId()}",
|
||||
default => "database/$databaseId/$type/$collectionId/$context/{$document->getId()}",
|
||||
};
|
||||
$resource = "database/$databaseId/$type/$collectionId/$context/{$document->getId()}";
|
||||
|
||||
$logs = $audit->getLogsByResource($resource, $queries);
|
||||
|
||||
|
||||
@@ -104,11 +104,7 @@ class XList extends Action
|
||||
|
||||
$audit = new Audit($dbForProject);
|
||||
$context = $this->getContext();
|
||||
$resource = match ($context) {
|
||||
TABLES => "database/$databaseId/grid/$context/$collectionId",
|
||||
default => "database/$databaseId/$context/$collectionId",
|
||||
};
|
||||
|
||||
$resource = "database/$databaseId/$context/$collectionId";
|
||||
$logs = $audit->getLogsByResource($resource, $queries);
|
||||
|
||||
$output = [];
|
||||
|
||||
@@ -686,6 +686,7 @@ class Builds extends Action
|
||||
if ($version === 'v2') {
|
||||
$command = 'tar -zxf /tmp/code.tar.gz -C /usr/code && cd /usr/local/src/ && ./build.sh';
|
||||
} else {
|
||||
$outputDirectory = $deployment->getAttribute('buildOutput') ?? $resource->getAttribute('outputDirectory');
|
||||
if ($resource->getCollection() === 'sites') {
|
||||
$listFilesCommand = '';
|
||||
|
||||
@@ -693,8 +694,8 @@ class Builds extends Action
|
||||
$listFilesCommand .= 'echo "{APPWRITE_DETECTION_SEPARATOR_START}" && cd /usr/local/build';
|
||||
|
||||
// Enter output directory, if set
|
||||
if (!empty($resource->getAttribute('outputDirectory', ''))) {
|
||||
$listFilesCommand .= ' && cd ' . \escapeshellarg($resource->getAttribute('outputDirectory', ''));
|
||||
if (!empty($outputDirectory)) {
|
||||
$listFilesCommand .= ' && cd ' . \escapeshellarg($outputDirectory);
|
||||
}
|
||||
|
||||
// Print files, and end separation
|
||||
@@ -725,7 +726,7 @@ class Builds extends Action
|
||||
destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
|
||||
variables: $vars,
|
||||
command: $command,
|
||||
outputDirectory: $resource->getAttribute('outputDirectory', '')
|
||||
outputDirectory: $outputDirectory ?? ''
|
||||
);
|
||||
|
||||
Console::log('createRuntime finished');
|
||||
|
||||
@@ -624,6 +624,84 @@ abstract class Format
|
||||
return 'AttributeStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnString':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnInteger':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnFloat':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnBoolean':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnEmail':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnEnum':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnIp':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnUrl':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnDatetime':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnRelationship':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnPoint':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnLine':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'columnPolygon':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
return 'ColumnStatus';
|
||||
}
|
||||
break;
|
||||
case 'healthStatus':
|
||||
switch ($param) {
|
||||
case 'status':
|
||||
|
||||
@@ -62,7 +62,7 @@ class Preview extends Adapter
|
||||
position: fixed;
|
||||
right: 16px;
|
||||
bottom: 16px;
|
||||
z-index: 1;
|
||||
z-index: calc(infinity);
|
||||
border-radius: var(--border-radius-S, 8px);
|
||||
border: var(--border-width-S, 1px) solid var(--color-border-neutral, #EDEDF0);
|
||||
background: var(--color-bgColor-neutral-primary, #FFF);
|
||||
|
||||
@@ -23,10 +23,11 @@ class Column extends Model
|
||||
'example' => 'string',
|
||||
])
|
||||
->addRule('status', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'type' => self::TYPE_ENUM,
|
||||
'description' => 'Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`',
|
||||
'default' => '',
|
||||
'example' => 'available',
|
||||
'enum' => ['available', 'processing', 'deleting', 'stuck', 'failed'],
|
||||
])
|
||||
->addRule('error', [
|
||||
'type' => self::TYPE_STRING,
|
||||
|
||||
@@ -41,10 +41,11 @@ class Database extends Model
|
||||
'example' => false,
|
||||
])
|
||||
->addRule('type', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'type' => self::TYPE_ENUM,
|
||||
'description' => 'Database type.',
|
||||
'default' => 'legacy',
|
||||
'example' => 'legacy',
|
||||
'enum' => ['legacy', 'tablesdb'],
|
||||
])
|
||||
;
|
||||
}
|
||||
|
||||
@@ -41,10 +41,10 @@ class Platform extends Model
|
||||
])
|
||||
->addRule('type', [
|
||||
'type' => self::TYPE_ENUM,
|
||||
'description' => 'Platform type. Possible values are: web, flutter-web, flutter-ios, flutter-android, ios, android, and unity.',
|
||||
'description' => 'Platform type. Possible values are: web, flutter-web, flutter-ios, flutter-android, flutter-linux, flutter-macos, flutter-windows, apple-ios, apple-macos, apple-watchos, apple-tvos, android, unity, react-native-ios, react-native-android.',
|
||||
'default' => '',
|
||||
'example' => 'web',
|
||||
'enum' => ['web', 'flutter-web', 'flutter-ios', 'flutter-android', 'ios', 'android', 'unity'],
|
||||
'enum' => ['web', 'flutter-web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'apple-ios', 'apple-macos', 'apple-watchos', 'apple-tvos', 'android', 'unity', 'react-native-ios', 'react-native-android'],
|
||||
])
|
||||
->addRule('key', [
|
||||
'type' => self::TYPE_STRING,
|
||||
|
||||
Reference in New Issue
Block a user