diff --git a/src/app.ts b/src/app.ts index ebff6eed17..e341e84d17 100644 --- a/src/app.ts +++ b/src/app.ts @@ -14,13 +14,13 @@ import activityRouter from './routes/activity'; import assetsRouter from './routes/assets'; import authRouter from './routes/auth'; import collectionsRouter from './routes/collections'; -import collectionPresetsRouter from './routes/collection-presets'; import extensionsRouter from './routes/extensions'; import fieldsRouter from './routes/fields'; import filesRouter from './routes/files'; import foldersRouter from './routes/folders'; import itemsRouter from './routes/items'; import permissionsRouter from './routes/permissions'; +import presetsRouter from './routes/presets'; import relationsRouter from './routes/relations'; import revisionsRouter from './routes/revisions'; import rolesRouter from './routes/roles'; @@ -45,13 +45,13 @@ const app = express() .use('/activity', activityRouter) .use('/assets', assetsRouter) .use('/collections', collectionsRouter) - .use('/collection_presets', collectionPresetsRouter) .use('/extensions', extensionsRouter) .use('/fields', fieldsRouter) .use('/files', filesRouter) .use('/folders', foldersRouter) .use('/items', itemsRouter) .use('/permissions', permissionsRouter) + .use('/presets', presetsRouter) .use('/relations', relationsRouter) .use('/revisions', revisionsRouter) .use('/roles', rolesRouter) diff --git a/src/database/seeds/collection-presets.ts b/src/database/seeds/presets.ts similarity index 79% rename from src/database/seeds/collection-presets.ts rename to src/database/seeds/presets.ts index a56194bf1b..be352b605b 100644 --- a/src/database/seeds/collection-presets.ts +++ b/src/database/seeds/presets.ts @@ -1,9 +1,9 @@ import * as Knex from 'knex'; export async function seed(knex: Knex): Promise { - await knex.schema.dropTableIfExists('directus_collection_presets'); + await knex.schema.dropTableIfExists('directus_presets'); - await knex.schema.createTable('directus_collection_presets', (table) => { + await knex.schema.createTable('directus_presets', (table) => { table.increments().notNullable(); table.string('title').nullable(); table.uuid('user').nullable(); diff --git a/src/routes/collection-presets.ts b/src/routes/presets.ts similarity index 81% rename from src/routes/collection-presets.ts rename to src/routes/presets.ts index c5c3b5f21f..a5de105332 100644 --- a/src/routes/collection-presets.ts +++ b/src/routes/presets.ts @@ -2,7 +2,7 @@ import express from 'express'; import asyncHandler from 'express-async-handler'; import sanitizeQuery from '../middleware/sanitize-query'; import validateQuery from '../middleware/validate-query'; -import * as CollectionPresetsService from '../services/collection-presets'; +import * as CollectionPresetsService from '../services/presets'; import useCollection from '../middleware/use-collection'; import * as ActivityService from '../services/activity'; @@ -10,7 +10,7 @@ const router = express.Router(); router.post( '/', - useCollection('directus_collection_presets'), + useCollection('directus_presets'), asyncHandler(async (req, res) => { const record = await CollectionPresetsService.createCollectionPreset( req.body, @@ -19,7 +19,7 @@ router.post( ActivityService.createActivity({ action: ActivityService.Action.CREATE, - collection: 'directus_collection_presets', + collection: 'directus_presets', item: record.id, ip: req.ip, user_agent: req.get('user-agent'), @@ -32,7 +32,7 @@ router.post( router.get( '/', - useCollection('directus_collection_presets'), + useCollection('directus_presets'), sanitizeQuery, validateQuery, asyncHandler(async (req, res) => { @@ -43,7 +43,7 @@ router.get( router.get( '/:pk', - useCollection('directus_collection_presets'), + useCollection('directus_presets'), sanitizeQuery, validateQuery, asyncHandler(async (req, res) => { @@ -57,7 +57,7 @@ router.get( router.patch( '/:pk', - useCollection('directus_collection_presets'), + useCollection('directus_presets'), asyncHandler(async (req, res) => { const record = await CollectionPresetsService.updateCollectionPreset( req.params.pk, @@ -67,7 +67,7 @@ router.patch( ActivityService.createActivity({ action: ActivityService.Action.UPDATE, - collection: 'directus_collection_presets', + collection: 'directus_presets', item: record.id, ip: req.ip, user_agent: req.get('user-agent'), @@ -80,13 +80,13 @@ router.patch( router.delete( '/:pk', - useCollection('directus_collection_presets'), + useCollection('directus_presets'), asyncHandler(async (req, res) => { await CollectionPresetsService.deleteCollectionPreset(req.params.pk); ActivityService.createActivity({ action: ActivityService.Action.DELETE, - collection: 'directus_collection_presets', + collection: 'directus_presets', item: req.params.pk, ip: req.ip, user_agent: req.get('user-agent'), diff --git a/src/services/collection-presets.ts b/src/services/presets.ts similarity index 50% rename from src/services/collection-presets.ts rename to src/services/presets.ts index a3ade0dc93..01ed54eb74 100644 --- a/src/services/collection-presets.ts +++ b/src/services/presets.ts @@ -4,16 +4,16 @@ import * as ItemsService from './items'; /** @todo check if we want to save activity for collection presets */ export const createCollectionPreset = async (data: Record, query: Query) => { - const primaryKey = await ItemsService.createItem('directus_collection_presets', data); - return await ItemsService.readItem('directus_collection_presets', primaryKey, query); + const primaryKey = await ItemsService.createItem('directus_presets', data); + return await ItemsService.readItem('directus_presets', primaryKey, query); }; export const readCollectionPresets = async (query: Query) => { - return await ItemsService.readItems('directus_collection_presets', query); + return await ItemsService.readItems('directus_presets', query); }; export const readCollectionPreset = async (pk: string | number, query: Query) => { - return await ItemsService.readItem('directus_collection_presets', pk, query); + return await ItemsService.readItem('directus_presets', pk, query); }; export const updateCollectionPreset = async ( @@ -21,10 +21,10 @@ export const updateCollectionPreset = async ( data: Record, query: Query ) => { - const primaryKey = await ItemsService.updateItem('directus_collection_presets', pk, data); - return await ItemsService.readItem('directus_collection_presets', primaryKey, query); + const primaryKey = await ItemsService.updateItem('directus_presets', pk, data); + return await ItemsService.readItem('directus_presets', primaryKey, query); }; export const deleteCollectionPreset = async (pk: string | number) => { - await ItemsService.deleteItem('directus_collection_presets', pk); + await ItemsService.deleteItem('directus_presets', pk); };