Update types/structure

api/src/utils/get-cache-key.ts

@@ -13,6 +13,7 @@ export function getCacheKey(req: Request): string {
 		query: isGraphQl ? pick(req.query, ['query', 'variables']) : req.sanitizedQuery,
 	};
 
-	const key = hash(info);
+	const key = hash(info) as string;
+
 	return key;
 }

api/src/utils/get-column.ts

@@ -34,7 +34,7 @@ export function getColumn(
 		}
 	}
 
-	if (column !== alias) {
+	if (alias && column !== alias) {
 		return knex.ref(`${table}.${column}`).as(alias);
 	}
 

app/src/lang/translations/en-US.yaml

@@ -30,7 +30,6 @@ item_revision: Item Revision
 duplicate_field: Duplicate Field
 half_width: Half Width
 full_width: Full Width
-limit: Limit
 group: Group
 and: And
 or: Or

app/src/modules/insights/index.ts

@@ -1,7 +1,7 @@
-import { defineModule } from '@/modules/define';
 import InsightsOverview from './routes/overview.vue';
 import InsightsDashboard from './routes/dashboard.vue';
 import InsightsPanelConfiguration from './routes/panel-configuration.vue';
+import { defineModule } from '@directus/shared/utils';
 
 export default defineModule({
 	id: 'insights',

app/src/panels/define.ts

@@ -1,13 +0,0 @@
-import { PanelConfig, PanelDefineParam } from './types';
-
-export function definePanel(config: PanelDefineParam): PanelConfig {
-	let options: PanelConfig;
-
-	if (typeof config === 'function') {
-		options = config();
-	} else {
-		options = config;
-	}
-
-	return options;
-}

app/src/panels/index.ts

@@ -1,5 +1,5 @@
 import { shallowRef, Ref } from 'vue';
-import { PanelConfig } from './types';
+import { PanelConfig } from '@directus/shared/types';
 
 const panelsRaw: Ref<PanelConfig[]> = shallowRef([]);
 const panels: Ref<PanelConfig[]> = shallowRef([]);

app/src/panels/label/index.ts

@@ -1,5 +1,5 @@
-import { definePanel } from '../define';
 import PanelLabel from './label.vue';
+import { definePanel } from '@directus/shared/utils';
 
 export default definePanel({
 	id: 'label',

app/src/panels/metric/index.ts

@@ -1,4 +1,4 @@
-import { definePanel } from '../define';
+import { definePanel } from '@directus/shared/utils';
 import PanelMetric from './metric.vue';
 
 export default definePanel({

app/src/panels/register.ts

@@ -1,7 +1,7 @@
 import { getRootPath } from '@/utils/get-root-path';
 import { App } from 'vue';
 import { getPanels } from './index';
-import { PanelConfig } from './types';
+import { PanelConfig } from '@directus/shared/types';
 
 const { panelsRaw } = getPanels();
 

app/src/panels/time-series/index.ts

@@ -1,4 +1,4 @@
-import { definePanel } from '../define';
+import { definePanel } from '@directus/shared/utils';
 import PanelTimeSeries from './time-series.vue';
 
 export default definePanel({

app/src/shims.d.ts

@@ -54,3 +54,9 @@ declare module '@directus-extensions-module' {
 	const modules: ModuleConfig[];
 	export default modules;
 }
+
+declare module '@directus-extensions-panel' {
+	import { PanelConfig } from '@directus/shared/types';
+	const modules: PanelConfig[];
+	export default modules;
+}

packages/shared/src/constants/extensions.ts

@@ -1,7 +1,7 @@
 export const APP_SHARED_DEPS = ['@directus/extensions-sdk', 'vue', 'vue-router'];
 export const API_SHARED_DEPS = ['@directus/extensions-sdk', 'axios'];
 
-export const APP_EXTENSION_TYPES = ['interface', 'display', 'layout', 'module'] as const;
+export const APP_EXTENSION_TYPES = ['interface', 'display', 'layout', 'module', 'panel'] as const;
 export const API_EXTENSION_TYPES = ['hook', 'endpoint'] as const;
 export const EXTENSION_TYPES = [...APP_EXTENSION_TYPES, ...API_EXTENSION_TYPES] as const;
 

packages/shared/src/types/index.ts

@@ -11,6 +11,7 @@ export * from './items';
 export * from './layouts';
 export * from './misc';
 export * from './modules';
+export * from './panels';
 export * from './permissions';
 export * from './presets';
 export * from './users';

packages/shared/src/types/panels.ts

@@ -0,0 +1,14 @@
+import { Component } from 'vue';
+import { DeepPartial } from './misc';
+import { Field } from './fields';
+
+export interface PanelConfig {
+	id: string;
+	name: string;
+	icon: string;
+	description?: string;
+	component: Component;
+	options: DeepPartial<Field>[] | Component;
+	minWidth: number;
+	minHeight: number;
+}

packages/shared/src/utils/define-extension.ts

@@ -1,4 +1,12 @@
-import { InterfaceConfig, DisplayConfig, LayoutConfig, ModuleConfig, HookConfig, EndpointConfig } from '../types';
+import {
+	InterfaceConfig,
+	DisplayConfig,
+	LayoutConfig,
+	ModuleConfig,
+	HookConfig,
+	EndpointConfig,
+	PanelConfig,
+} from '../types';
 
 export function defineInterface(config: InterfaceConfig): InterfaceConfig {
 	return config;
@@ -25,3 +33,7 @@ export function defineHook(config: HookConfig): HookConfig {
 export function defineEndpoint(config: EndpointConfig): EndpointConfig {
 	return config;
 }
+
+export function definePanel(config: PanelConfig): PanelConfig {
+	return config;
+}