diff --git a/packages/nc-gui/components/shared-view/Calendar.vue b/packages/nc-gui/components/shared-view/Calendar.vue
new file mode 100644
index 0000000000..01cd692d47
--- /dev/null
+++ b/packages/nc-gui/components/shared-view/Calendar.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/shared-view/Gallery.vue b/packages/nc-gui/components/shared-view/Gallery.vue
index 6e6d0d7f71..890c52f229 100644
--- a/packages/nc-gui/components/shared-view/Gallery.vue
+++ b/packages/nc-gui/components/shared-view/Gallery.vue
@@ -1,4 +1,4 @@
-
+
+
+
+
+
+
+
diff --git a/packages/nocodb/src/controllers/calendars.controller.ts b/packages/nocodb/src/controllers/calendars.controller.ts
index 907064b9be..5a9d2df082 100644
--- a/packages/nocodb/src/controllers/calendars.controller.ts
+++ b/packages/nocodb/src/controllers/calendars.controller.ts
@@ -14,6 +14,7 @@ import { ViewCreateReqType } from 'nocodb-sdk';
import { GlobalGuard } from '~/guards/global/global.guard';
import { CalendarsService } from '~/services/calendars.service';
import { MetaApiLimiterGuard } from '~/guards/meta-api-limiter.guard';
+import { Acl } from '~/middlewares/extract-ids/extract-ids.middleware';
@Controller()
@UseGuards(MetaApiLimiterGuard, GlobalGuard)
@@ -24,6 +25,7 @@ export class CalendarsController {
'/api/v1/db/meta/calendars/:calendarViewId',
'/api/v2/meta/calendars/:calendarViewId',
])
+ // #TODO Enable ACL Later
// @Acl('calendarViewGet')
async calendarViewGet(@Param('calendarViewId') calendarViewId: string) {
return await this.calendarsService.calendarViewGet({
@@ -36,6 +38,7 @@ export class CalendarsController {
'/api/v2/meta/tables/:tableId/calendars',
])
@HttpCode(200)
+ // #TODO Enable ACL Later
// @Acl('calendarViewCreate')
async calendarViewCreate(
@Param('tableId') tableId: string,
diff --git a/packages/nocodb/src/meta/migrations/v2/nc_041_calander_view.ts b/packages/nocodb/src/meta/migrations/v2/nc_041_calander_view.ts
index 34a1e12c55..467ebd5291 100644
--- a/packages/nocodb/src/meta/migrations/v2/nc_041_calander_view.ts
+++ b/packages/nocodb/src/meta/migrations/v2/nc_041_calander_view.ts
@@ -49,6 +49,8 @@ const up = async (knex: Knex) => {
table.string('fk_to_column_id', 20);
+ table.string('label', 20);
+
table.string('fk_from_column_id', 20);
table.timestamps(true, true);
diff --git a/packages/nocodb/src/services/public-datas.service.ts b/packages/nocodb/src/services/public-datas.service.ts
index 5cc9abe635..a45e500086 100644
--- a/packages/nocodb/src/services/public-datas.service.ts
+++ b/packages/nocodb/src/services/public-datas.service.ts
@@ -36,7 +36,8 @@ export class PublicDatasService {
view.type !== ViewTypes.GRID &&
view.type !== ViewTypes.KANBAN &&
view.type !== ViewTypes.GALLERY &&
- view.type !== ViewTypes.MAP
+ view.type !== ViewTypes.MAP &&
+ view.type !== ViewTypes.CALENDAR
) {
NcError.notFound('Not found');
}
@@ -495,7 +496,8 @@ export class PublicDatasService {
if (
view.type !== ViewTypes.GRID &&
view.type !== ViewTypes.KANBAN &&
- view.type !== ViewTypes.GALLERY
+ view.type !== ViewTypes.GALLERY &&
+ view.type !== ViewTypes.CALENDAR
) {
NcError.notFound('Not found');
}
@@ -569,7 +571,8 @@ export class PublicDatasService {
if (
view.type !== ViewTypes.GRID &&
view.type !== ViewTypes.KANBAN &&
- view.type !== ViewTypes.GALLERY
+ view.type !== ViewTypes.GALLERY &&
+ view.type !== ViewTypes.CALENDAR
) {
NcError.notFound('Not found');
}