Release 0.11.1 (#578)

* fix patching entity type (#571)

* [0.11.1] Prevent duplicate entity attributes (#570)

* check if attribute is already added to entity type

* Added missing error messages and error handling

---------

Co-authored-by: Severino <severin.opel@hotmail.com>

* [0.11.1] Several Fixes (#575)

* fix csrf request

* fix last editor not visible in entity detail tab

* Removed 'base' default value

* Fixed modal not closing on entity delete

* Fixd absolute download paths

* Fixed entity type color not showing

* Excluded SQL attribute from export

* Fixed color function returning black if value is falsy

* fix migration for uploaded files

* Moved move logic into store

* load plugin pages directly

* Fixed missing color update on entity type update

* Updated composer to version 2

* added changelog

* Plugin un-/publishing now on disk public

* fix role update

* fix i18n for plugins

* fix geodata serialization

* fix displaying deleted entity references in attributes

* 0.11 fix pre loading time (#573)

* Moved all pre functions to a single call

* move functions from controller to helper class; fix redundant code

* re-add locale init

* fix pre-endpoint test

* Fixed missing return on  getGeometryTypes

* Added transaction wrapper for command tests

* fix missing cast after geo package update

* Fixed wrong language in search (was a0f4dc4)

* fix parsing of "malformed" input

* fix label ref

* Fixed undefined 'bootstrap'

* Added 'Bootstrap not defined' on InteractiveMap to changelog

* make plugin scripts downloadable

* Adjusted changelog

* plugin correct script src when plugin is un-/installed

* make store method more flexible; only add '/' if needed

* use src as param to match <script> attribute; fix adding/removing
scripts from <head>

* shorten function name; use existing add/delete logic from directory

* Moved download routes to api.php

* Fixed missing download link

* Changed plugin endpoint to use path instead of query param

* Directory changes, tests and plugin fix un-/install

* use single method to handle file storage again

* Fixed validation when non-top entity type is being imported as top-entity

* Fixed add attribute validation

* add vector tiles for maps

* Added env variable VITE_REVERB_AUTH_ENDPOINT

* fixed error when entity-type is not found

* Fixed when entity_type is undefined

* Added error message when entity-type does not exist

* Fixed data not returned in patch

* Fixed error when generating cite key where bibliography title contained a space separated part of non-alphanumerical characters

* Add pinia to spps

* Add subpath to session cookie

* Removed file routes from api.php

* use env(app_url) as cookie path

* Updated hot to use config

* small reverb improvements

* fix reply to comment from notification

* move reply to button to header

* Fixed avatar being deleted even when file does not exist

* Fixed avatar return type

---------

Signed-off-by: Vinzenz Rosenkranz <vinzenz.rosenkranz@uni-tuebingen.de>
Co-authored-by: Severino <severin.opel@hotmail.com>

---------

Signed-off-by: Vinzenz Rosenkranz <vinzenz.rosenkranz@uni-tuebingen.de>
Co-authored-by: Severino <severin.opel@hotmail.com>

Author: v1r0x

CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.11.1
+### Added
+- Unit Tests for Directory.php
+### Changed
+- Added path value to XSRF cookie to prevent overwriting by another instance at the same domain
+- _Show x replies_ button in comment list moved to header
+### Fixed
+- Login not possible on instances in subfolder
+- Last editor not visible in _Entity Detail_ tab
+- Modal not closing on deleting _Entity_
+- _Avatar_ image and literature download path were absolute
+- _Entity Type_ color not showing
+- Excluded _SQL_ attribute from export
+- Plugin script can now be loaded from private route
+- Attributes could be added multiple times to entity-type
+- Changing color of entity type
+- Changing _sub entity types_ only visible after page reload
+- 'Bootstrap not defined' on InteractiveMap
+- Fixed add/remove of plugin correctly setup in store and SpPS
+- Fixed error when generating cite key where bibliography title contained a space separated part of non-alphanumerical characters
+- Reply to comment from notification
+
 ## 0.11 - Kilcrea
 ### Added
 - Added websockets for various data synchronization

app/Attribute.php

@@ -84,6 +84,30 @@ public function getSelection() {
         }
     }
 
+    public static function getSelectionsFor(&$attributes): array {
+        $selections = [];
+        foreach($attributes as $a) {
+            $selection = $a->getSelection();
+            if(isset($selection)) {
+                // Workaround to check if it is a plain array or a assoc array (table columns)
+                // if assoc array, add each entry to their corresponding id
+                if(!isset($selection[0])) {
+                    foreach($selection as $id => $sel) {
+                        $selections[$id] = $sel;
+                    }
+                } else {
+                    $selections[$a->id] = $selection;
+                }
+            }
+
+            if($a->datatype == 'table') {
+                $a->columns = Attribute::where('parent_id', $a->id)->get()->keyBy('id');
+            }
+        }
+
+        return $selections;
+    }
+
     public function children() {
         return $this->hasMany('App\Attribute', 'parent_id');
     }

app/AttributeTypes/EntityAttribute.php

@@ -48,6 +48,7 @@ public static function serializeFromEntity(int $id, ?Entity $entity) : array {
        return [
             "id" => $id,
             "name" => isset($entity) ? $entity->name : self::$deleted_string,
+            "deleted" => !isset($entity),
         ];
     }
 }

app/AttributeTypes/EntityMultipleAttribute.php

@@ -55,7 +55,7 @@ public static function serialize(mixed $ids) : mixed {
         $decodedData = json_decode($ids);
         $entityList = Entity::without(['user'])->whereIn('id', $decodedData)->get()->keyBy('id');
         return array_map(function($id) use ($entityList) {
-            return EntityAttribute::serializeFromEntity($id, $entityList[$id]);
+            return EntityAttribute::serializeFromEntity($id, $entityList[$id] ?? null);
         }, $decodedData);
     }
 }

app/AttributeTypes/GeographyAttribute.php

@@ -5,7 +5,7 @@
 use App\Exceptions\InvalidDataException;
 use App\Geodata;
 use App\Utils\StringUtils;
-use Exception;
+use Clickbar\Magellan\Data\Geometries\Geometry;
 
 class GeographyAttribute extends AttributeBase
 {
@@ -33,10 +33,18 @@ public static function parseImport(int|float|bool|string $data): mixed {
     }
 
     public static function unserialize(mixed $data): mixed {
-        return Geodata::fromWKT($data);
+        if($data instanceof Geometry) {
+            return $data;
+        } else {
+            return Geodata::fromWKT($data);
+        }
     }
 
     public static function serialize(mixed $data): mixed {
-        return Geodata::toWKT($data);
+        if($data instanceof Geometry) {
+            return $data;
+        } else {
+            return Geodata::wkb2wkt($data);
+        }
     }
 }

app/AttributeValue.php

@@ -4,10 +4,10 @@
 
 use App\Geodata;
 use App\AttributeTypes\AttributeBase;
-use Illuminate\Database\Eloquent\Model;
-use Clickbar\Magellan\Database\Eloquent\HasPostgisColumns;
 use App\Traits\CommentTrait;
 use App\Traits\ModerationTrait;
+use Clickbar\Magellan\Data\Geometries\Geometry;
+use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Searchable\Searchable;
@@ -16,7 +16,6 @@
 
 class AttributeValue extends Model implements Searchable
 {
-    use HasPostgisColumns;
     use CommentTrait;
     use ModerationTrait;
     use LogsActivity;
@@ -55,8 +54,8 @@ class AttributeValue extends Model implements Searchable
         'thesaurus_val'
     ];
 
-    protected $postgisColumns = [
-        'geography_val',
+    protected $casts = [
+        'geography_val' => Geometry::class,
     ];
 
     protected $copyOn = [
@@ -166,27 +165,10 @@ public function setValueFromRaw($strValue, $type = null, $save = false) {
     public static function getValueColumn($type) {
         return AttributeBase::getFieldFromType($type);
     }
-    
+
     public static function generateObject($attributeValues) {
         $data = [];
         foreach($attributeValues as $attributeValue) {
-            switch($attributeValue->attribute->datatype) {
-                case 'entity':
-                    $attributeValue->name = Entity::find($attributeValue->entity_val)->name;
-                    break;
-                case 'entity-mc':
-                    $names = [];
-                    foreach(json_decode($attributeValue->json_val) as $dec) {
-                        $names[] = Entity::find($dec)->name;
-                    }
-                    $attributeValue->name = $names;
-                    break;
-                case 'sql':
-                    // SQL will not have any entries in the attribute_values table
-                    break;
-                default:
-                    break;
-            }
             $value = $attributeValue->getValue();
             if($attributeValue->moderation_state == 'pending-delete') {
                 $attributeValue->value = [];

app/Bibliography.php

@@ -635,6 +635,7 @@ public static function computeCitationKey($fields) {
             foreach($words as $word) {
                 // only keep (ascii) letters and numbers
                 $word = preg_replace('/[^A-Za-z0-9]/', '', Str::ascii(trim($word)));
+                if(strlen($word) == 0) continue;
                 if(strlen($firstWord) == 0 && strlen($word) > 3) {
                     $firstWord = $word;
                 }

app/Entity.php

@@ -90,6 +90,7 @@ public function getAllMetadata() {
             'creator' => $this->creator,
             'editors' => $this->editors,
             'metadata' => $this->metadata,
+            'user' => $this->user,
         ];
     }
 
@@ -268,6 +269,17 @@ private function moveOrFail(int | null $parentId) {
         }
         return $query;
     }
+    
+    public function move($parentId, $rank, $user) {
+        if($rank == null){
+            if(isset($parentId)) {
+                $rank = Entity::where('root_entity_id', $parentId)->max('rank') + 1;
+            }else{
+                $rank = Entity::whereNull('root_entity_id')->max('rank') + 1;
+            }
+        }
+        Entity::patchRanks($rank, $this->id, $parentId, $user);
+    }
 
     public static function patchRanks($rank, $id, $parent, $user) {
         $entity = Entity::find($id);

app/File/Directory.php

@@ -2,7 +2,8 @@
 
 namespace App\File;
 
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -21,6 +22,22 @@ public function __construct(string $directory, string $disk = 'local') {
         $this->directory = $directory;
     }
 
+    /**
+     * Returns the disk name.
+     * @return string The disk name, e.g. 'local', 'public', etc.
+     */
+    public function getDisk(): string {
+        return $this->disk;
+    }
+
+    /**
+     * Returns the directory path.
+     * @return string The directory path, e.g. 'avatars'
+     */
+    public function getDirectory(): string {
+        return $this->directory;
+    }
+
     /**
      * Validates if a file is inside the directory.
      *
@@ -52,27 +69,60 @@ public function delete(?string $filepath): bool {
         return false;
     }
 
+    // TODO: resource is not (php 8.3) allowed as type, thus $file only typehinted in docblock
     /**
      * Stores a file inside the directory.
      *
      * @param string $filename The filename
-     * @param $file The file
+     * @param UploadedFile|string|resource $file The file
      * @return string The path to the file
      */
-    public function store(string $filename, $file): string {
-        return $file->storeAs($this->directory, $filename, $this->disk);
+    public function store(string $filename, $file): string|false {
+        if($file instanceof UploadedFile) {
+            return $file->storeAs($this->directory, $filename, $this->disk);
+        } else {
+            $filepath = Str::finish($this->directory, DIRECTORY_SEPARATOR) . $filename;
+            Storage::disk($this->disk)->put($filepath, $file);
+            return $filepath;
+        }
     }
 
     /**
      * Downloads a file inside the directory.
      *
      * @param string $filepath The path to the file
-     * @return Response|BinaryFileResponse The file as BinaryFileResponse or Response if the file is not inside the directory.
+     * @return JsonResponse|BinaryFileResponse The file as BinaryFileResponse or Response if the file is not inside the directory.
      */
-    function download(string $filepath): Response | BinaryFileResponse {
-        if($this->contains($filepath)){
-            return DownloadHandler::makeFileResponse($filepath);
+    function download(string $filepath): JsonResponse | BinaryFileResponse {
+        if($this->contains($filepath)) {
+            return $this->createFileResponse($filepath);
         }
-        return response()->noContent();
+        return self::notFound();
+    }
+
+    /**
+     * Downloads a file relative to the directory.
+     *
+     * @param string $filepath The path to the file without the directory prefix.
+     * @return JsonResponse|BinaryFileResponse The file as BinaryFileResponse or Response if the file is not inside the directory.
+     */
+    function downloadRelative(string $filepath): JsonResponse | BinaryFileResponse {
+        $storagePath = Str::finish($this->directory, DIRECTORY_SEPARATOR) . $filepath;
+        return $this->download($storagePath);
+    }
+
+    function createFileResponse(string $filepath): JsonResponse | BinaryFileResponse {
+        $mime = Storage::disk($this->disk)->mimeType($filepath);
+        $path = Storage::disk($this->disk)->path($filepath);
+        return response()->file($path, [
+            'Content-Type' => $mime,
+            'Content-Disposition' => 'inline; filename="'. $filepath . '"'
+        ]);
+    }
+
+    private static function notFound(): JsonResponse {
+        return response()->json([
+            'error' => __('File not found.')
+        ], 404);
     }
 }