Bugfix/v2/multiple relation

.github/workflows/phpunit.yml

@@ -130,7 +130,8 @@ jobs:
           sed -i 's/DB_PASSWORD=/DB_PASSWORD=postgres/g' .env  &&
           sed -i 's/DB_HOST=127.0.0.1/DB_HOST=localhost/g' .env &&
           sed -i 's/DB_USERNAME=root/DB_USERNAME=postgres/g' .env &&
-          sed -i 's/DB_PORT=3306/DB_PORT=5432/g' .env
+          sed -i 's/DB_PORT=3306/DB_PORT=5432/g' .env 
+
 
       # Pgsql | Laravel setup
       - name: Pgsql | Laravel setup

src/Helpers/GetData.php

@@ -281,7 +281,6 @@ public static function getRelationData($data_type, $row)
         $relational_fields = collect($data_type->dataRows)->filter(function ($value, $key) {
             return $value->relation != null;
         })->all();
-
         foreach ($relational_fields as $field) {
             $relation_detail = [];
 
@@ -323,7 +322,11 @@ public static function getRelationData($data_type, $row)
 
                     switch ($relation_type) {
                         case 'belongs_to':
-                            $row->{$destination_table} = collect($relation_data)->first();
+                            if (isset($row->{$destination_table})) {
+                                array_push($row->{$destination_table}, collect($relation_data)->first());
+                            } else {
+                                $row->{$destination_table} = collect($relation_data)->toArray();
+                            }
                             break;
 
                         case 'has_many':

src/resources/js/pages/crud-generated/browse.vue

@@ -1032,12 +1032,12 @@ export default {
     handleSelect(data) {
       this.selected = data;
     },
-    displayRelationData(record, dataRow) {
+    displayRelationData(record, dataRow) {  
       if (dataRow.relation) {
         const relationType = dataRow.relation.relationType;
         const table = this.$caseConvert.stringSnakeToCamel(
           dataRow.relation.destinationTable
-        );
+            );
         this.$caseConvert.stringSnakeToCamel(
           dataRow.relation.destinationTableColumn
         );
@@ -1048,9 +1048,19 @@ export default {
         if (relationType == "has_many") {
           const list = record[table];
           const flatList = list.map((ls) => {
-            return ls[displayColumn];
+                return ls[displayColumn];
           });
           return flatList.join(", ");
+        } else if(relationType == "belongs_to"){
+          const list = record[table];
+          let field = this.$caseConvert.stringSnakeToCamel(dataRow.field)
+          const flatList = list.map((ls) => {
+            if(ls.id == record[field]){
+              return ls[displayColumn];
+            }
+            return null
+          });
+          return flatList.join(",").replace(",", "");
         } else {
           return record[table] ? record[table][displayColumn] : null;
         }