Merge branch 'main' of github.com:Rocket-admin/rocketadmin

rocket-admin · Aug 30, 2023 · b09bda7 · b09bda7
2 parents 0430ef6 + 3161114
commit b09bda7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/src/entities/table-actions/use-cases/find-all-table-actions.use.case.ts b/backend/src/entities/table-actions/use-cases/find-all-table-actions.use.case.ts
@@ -38,7 +38,7 @@ export class FindTableActionsUseCase
     const formedTableActionsDS = foundTableActions.map((action) => buildCreatedTableActionDS(action));
     return {
       table_name: tableName,
-      display_name: foundTableSettings.display_name,
+      display_name: foundTableSettings?.display_name ? foundTableSettings.display_name : null,
       table_actions: formedTableActionsDS,
     };
   }

diff --git a/frontend/src/config.json b/frontend/src/config.json
@@ -1,4 +1,4 @@
 {
   "#important to keep it /api for prod": true,
-  "baseURL": "/api"
+  "baseURL": "https://app.rocketadmin.com/api"
 }