diff --git a/backend/src/db/api/test2.js b/backend/src/db/api/test2.js new file mode 100644 index 0000000..d1f993d --- /dev/null +++ b/backend/src/db/api/test2.js @@ -0,0 +1,246 @@ +const db = require('../models'); +const FileDBApi = require('./file'); +const crypto = require('crypto'); +const Utils = require('../utils'); + +const Sequelize = db.Sequelize; +const Op = Sequelize.Op; + +module.exports = class Test2DBApi { + static async create(data, options) { + const currentUser = (options && options.currentUser) || { id: null }; + const transaction = (options && options.transaction) || undefined; + + const test2 = await db.test2.create( + { + id: data.id || undefined, + + name: data.name || null, + importHash: data.importHash || null, + createdById: currentUser.id, + updatedById: currentUser.id, + }, + { transaction }, + ); + + return test2; + } + + static async bulkImport(data, options) { + const currentUser = (options && options.currentUser) || { id: null }; + const transaction = (options && options.transaction) || undefined; + + // Prepare data - wrapping individual data transformations in a map() method + const test2Data = data.map((item, index) => ({ + id: item.id || undefined, + + name: item.name || null, + importHash: item.importHash || null, + createdById: currentUser.id, + updatedById: currentUser.id, + createdAt: new Date(Date.now() + index * 1000), + })); + + // Bulk create items + const test2 = await db.test2.bulkCreate(test2Data, { transaction }); + + // For each item created, replace relation files + + return test2; + } + + static async update(id, data, options) { + const currentUser = (options && options.currentUser) || { id: null }; + const transaction = (options && options.transaction) || undefined; + + const test2 = await db.test2.findByPk(id, {}, { transaction }); + + const updatePayload = {}; + + if (data.name !== undefined) updatePayload.name = data.name; + + updatePayload.updatedById = currentUser.id; + + await test2.update(updatePayload, { transaction }); + + return test2; + } + + static async deleteByIds(ids, options) { + const currentUser = (options && options.currentUser) || { id: null }; + const transaction = (options && options.transaction) || undefined; + + const test2 = await db.test2.findAll({ + where: { + id: { + [Op.in]: ids, + }, + }, + transaction, + }); + + await db.sequelize.transaction(async (transaction) => { + for (const record of test2) { + await record.update({ deletedBy: currentUser.id }, { transaction }); + } + for (const record of test2) { + await record.destroy({ transaction }); + } + }); + + return test2; + } + + static async remove(id, options) { + const currentUser = (options && options.currentUser) || { id: null }; + const transaction = (options && options.transaction) || undefined; + + const test2 = await db.test2.findByPk(id, options); + + await test2.update( + { + deletedBy: currentUser.id, + }, + { + transaction, + }, + ); + + await test2.destroy({ + transaction, + }); + + return test2; + } + + static async findBy(where, options) { + const transaction = (options && options.transaction) || undefined; + + const test2 = await db.test2.findOne({ where }, { transaction }); + + if (!test2) { + return test2; + } + + const output = test2.get({ plain: true }); + + return output; + } + + static async findAll(filter, options) { + const limit = filter.limit || 0; + let offset = 0; + let where = {}; + const currentPage = +filter.page; + + offset = currentPage * limit; + + const orderBy = null; + + const transaction = (options && options.transaction) || undefined; + + let include = []; + + if (filter) { + if (filter.id) { + where = { + ...where, + ['id']: Utils.uuid(filter.id), + }; + } + + if (filter.name) { + where = { + ...where, + [Op.and]: Utils.ilike('test2', 'name', filter.name), + }; + } + + if (filter.active !== undefined) { + where = { + ...where, + active: filter.active === true || filter.active === 'true', + }; + } + + if (filter.createdAtRange) { + const [start, end] = filter.createdAtRange; + + if (start !== undefined && start !== null && start !== '') { + where = { + ...where, + ['createdAt']: { + ...where.createdAt, + [Op.gte]: start, + }, + }; + } + + if (end !== undefined && end !== null && end !== '') { + where = { + ...where, + ['createdAt']: { + ...where.createdAt, + [Op.lte]: end, + }, + }; + } + } + } + + const queryOptions = { + where, + include, + distinct: true, + order: + filter.field && filter.sort + ? [[filter.field, filter.sort]] + : [['createdAt', 'desc']], + transaction: options?.transaction, + logging: console.log, + }; + + if (!options?.countOnly) { + queryOptions.limit = limit ? Number(limit) : undefined; + queryOptions.offset = offset ? Number(offset) : undefined; + } + + try { + const { rows, count } = await db.test2.findAndCountAll(queryOptions); + + return { + rows: options?.countOnly ? [] : rows, + count: count, + }; + } catch (error) { + console.error('Error executing query:', error); + throw error; + } + } + + static async findAllAutocomplete(query, limit, offset) { + let where = {}; + + if (query) { + where = { + [Op.or]: [ + { ['id']: Utils.uuid(query) }, + Utils.ilike('test2', 'id', query), + ], + }; + } + + const records = await db.test2.findAll({ + attributes: ['id', 'id'], + where, + limit: limit ? Number(limit) : undefined, + offset: offset ? Number(offset) : undefined, + orderBy: [['id', 'ASC']], + }); + + return records.map((record) => ({ + id: record.id, + label: record.id, + })); + } +}; diff --git a/backend/src/db/migrations/1773413811469.js b/backend/src/db/migrations/1773413811469.js new file mode 100644 index 0000000..cc6fb1a --- /dev/null +++ b/backend/src/db/migrations/1773413811469.js @@ -0,0 +1,83 @@ +module.exports = { + /** + * @param {QueryInterface} queryInterface + * @param {Sequelize} Sequelize + * @returns {Promise} + */ + async up(queryInterface, Sequelize) { + /** + * @type {Transaction} + */ + const transaction = await queryInterface.sequelize.transaction(); + try { + await queryInterface.createTable( + 'test2', + { + id: { + type: Sequelize.DataTypes.UUID, + defaultValue: Sequelize.DataTypes.UUIDV4, + primaryKey: true, + }, + createdById: { + type: Sequelize.DataTypes.UUID, + references: { + key: 'id', + model: 'users', + }, + }, + updatedById: { + type: Sequelize.DataTypes.UUID, + references: { + key: 'id', + model: 'users', + }, + }, + createdAt: { type: Sequelize.DataTypes.DATE }, + updatedAt: { type: Sequelize.DataTypes.DATE }, + deletedAt: { type: Sequelize.DataTypes.DATE }, + importHash: { + type: Sequelize.DataTypes.STRING(255), + allowNull: true, + unique: true, + }, + }, + { transaction }, + ); + + await queryInterface.addColumn( + 'test2', + 'name', + { + type: Sequelize.DataTypes.TEXT, + }, + { transaction }, + ); + + await transaction.commit(); + } catch (err) { + await transaction.rollback(); + throw err; + } + }, + /** + * @param {QueryInterface} queryInterface + * @param {Sequelize} Sequelize + * @returns {Promise} + */ + async down(queryInterface, Sequelize) { + /** + * @type {Transaction} + */ + const transaction = await queryInterface.sequelize.transaction(); + try { + await queryInterface.removeColumn('test2', 'name', { transaction }); + + await queryInterface.dropTable('test2', { transaction }); + + await transaction.commit(); + } catch (err) { + await transaction.rollback(); + throw err; + } + }, +}; diff --git a/backend/src/db/models/test2.js b/backend/src/db/models/test2.js new file mode 100644 index 0000000..53367aa --- /dev/null +++ b/backend/src/db/models/test2.js @@ -0,0 +1,49 @@ +const config = require('../../config'); +const providers = config.providers; +const crypto = require('crypto'); +const bcrypt = require('bcrypt'); +const moment = require('moment'); + +module.exports = function (sequelize, DataTypes) { + const test2 = sequelize.define( + 'test2', + { + id: { + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + primaryKey: true, + }, + + name: { + type: DataTypes.TEXT, + }, + + importHash: { + type: DataTypes.STRING(255), + allowNull: true, + unique: true, + }, + }, + { + timestamps: true, + paranoid: true, + freezeTableName: true, + }, + ); + + test2.associate = (db) => { + /// loop through entities and it's fields, and if ref === current e[name] and create relation has many on parent entity + + //end loop + + db.test2.belongsTo(db.users, { + as: 'createdBy', + }); + + db.test2.belongsTo(db.users, { + as: 'updatedBy', + }); + }; + + return test2; +}; diff --git a/backend/src/db/seeders/20200430130760-user-roles.js b/backend/src/db/seeders/20200430130760-user-roles.js index b2f42ec..76ddd1f 100644 --- a/backend/src/db/seeders/20200430130760-user-roles.js +++ b/backend/src/db/seeders/20200430130760-user-roles.js @@ -109,6 +109,7 @@ module.exports = { 'announcements', 'course_resources', 'test', + 'test2', , ]; await queryInterface.bulkInsert( @@ -1072,6 +1073,31 @@ primary key ("roles_permissionsId", "permissionId") permissionId: getId('DELETE_TEST'), }, + { + createdAt, + updatedAt, + roles_permissionsId: getId('Administrator'), + permissionId: getId('CREATE_TEST2'), + }, + { + createdAt, + updatedAt, + roles_permissionsId: getId('Administrator'), + permissionId: getId('READ_TEST2'), + }, + { + createdAt, + updatedAt, + roles_permissionsId: getId('Administrator'), + permissionId: getId('UPDATE_TEST2'), + }, + { + createdAt, + updatedAt, + roles_permissionsId: getId('Administrator'), + permissionId: getId('DELETE_TEST2'), + }, + { createdAt, updatedAt, diff --git a/backend/src/db/seeders/20231127130745-sample-data.js b/backend/src/db/seeders/20231127130745-sample-data.js index 22f6d33..f3c70b8 100644 --- a/backend/src/db/seeders/20231127130745-sample-data.js +++ b/backend/src/db/seeders/20231127130745-sample-data.js @@ -15,13 +15,41 @@ const CourseResources = db.course_resources; const Test = db.test; +const Test2 = db.test2; + const CoursesData = [ { - title: 'Frederick Sanger', + title: 'Jean Baptiste Lamarck', - subtitle: 'Willard Libby', + subtitle: 'Leonard Euler', - description: 'Isaac Newton', + description: 'Charles Lyell', + + // type code here for "images" field + + status: 'draft', + + level: 'intermediate', + + category: 'Max Born', + + language: 'Charles Darwin', + + price: 81.82, + + is_free: false, + + published_at: new Date(Date.now()), + + // type code here for "relation_one" field + }, + + { + title: 'Franz Boas', + + subtitle: 'Claude Bernard', + + description: 'Carl Linnaeus', // type code here for "images" field @@ -29,11 +57,11 @@ const CoursesData = [ level: 'all_levels', - category: 'Jonas Salk', + category: 'Leonard Euler', - language: 'Louis Victor de Broglie', + language: 'Alfred Binet', - price: 35.36, + price: 23.59, is_free: true, @@ -43,11 +71,11 @@ const CoursesData = [ }, { - title: 'Max von Laue', + title: 'Theodosius Dobzhansky', - subtitle: 'Albert Einstein', + subtitle: 'Hans Bethe', - description: 'Sigmund Freud', + description: 'William Herschel', // type code here for "images" field @@ -55,39 +83,13 @@ const CoursesData = [ level: 'all_levels', - category: 'Johannes Kepler', + category: 'Franz Boas', - language: 'Paul Dirac', + language: 'Murray Gell-Mann', - price: 42.83, + price: 67.44, - is_free: false, - - published_at: new Date(Date.now()), - - // type code here for "relation_one" field - }, - - { - title: 'Carl Linnaeus', - - subtitle: 'Jean Baptiste Lamarck', - - description: 'Arthur Eddington', - - // type code here for "images" field - - status: 'published', - - level: 'all_levels', - - category: 'Pierre Simon de Laplace', - - language: 'James Watson', - - price: 39.75, - - is_free: false, + is_free: true, published_at: new Date(Date.now()), @@ -99,83 +101,99 @@ const LessonsData = [ { // type code here for "relation_one" field - title: 'Louis Pasteur', + title: 'Max Born', - summary: 'Murray Gell-Mann', + summary: 'Edwin Hubble', - content_type: 'text', + content_type: 'quiz', - content: 'Frederick Gowland Hopkins', + content: 'J. Robert Oppenheimer', - video_url: 'Jean Piaget', + video_url: 'John Dalton', // type code here for "files" field - external_url: 'Jean Piaget', + external_url: 'Murray Gell-Mann', + + sort_order: 4, + + estimated_minutes: 9, + + status: 'draft', + + is_preview: true, + }, + + { + // type code here for "relation_one" field + + title: 'Francis Galton', + + summary: 'Michael Faraday', + + content_type: 'text', + + content: 'Rudolf Virchow', + + video_url: 'Jean Baptiste Lamarck', + + // type code here for "files" field + + external_url: 'Isaac Newton', sort_order: 2, estimated_minutes: 8, - status: 'draft', + status: 'published', - is_preview: true, + is_preview: false, }, { // type code here for "relation_one" field - title: 'Willard Libby', + title: 'Arthur Eddington', - summary: 'Johannes Kepler', + summary: 'Max Planck', - content_type: 'quiz', + content_type: 'video', - content: 'Edward Teller', + content: 'Michael Faraday', - video_url: 'Paul Dirac', + video_url: 'Edwin Hubble', // type code here for "files" field - external_url: 'Anton van Leeuwenhoek', + external_url: 'Linus Pauling', - sort_order: 8, + sort_order: 2, - estimated_minutes: 3, + estimated_minutes: 6, - status: 'archived', - - is_preview: true, - }, - - { - // type code here for "relation_one" field - - title: 'Rudolf Virchow', - - summary: 'Emil Fischer', - - content_type: 'quiz', - - content: 'Jonas Salk', - - video_url: 'William Harvey', - - // type code here for "files" field - - external_url: 'Charles Darwin', - - sort_order: 9, - - estimated_minutes: 8, - - status: 'draft', + status: 'published', is_preview: true, }, ]; const EnrollmentsData = [ + { + // type code here for "relation_one" field + + // type code here for "relation_one" field + + status: 'active', + + enrolled_at: new Date(Date.now()), + + completed_at: new Date(Date.now()), + + progress_percent: 91.68, + + last_activity_at: new Date(Date.now()), + }, + { // type code here for "relation_one" field @@ -187,7 +205,7 @@ const EnrollmentsData = [ completed_at: new Date(Date.now()), - progress_percent: 86.99, + progress_percent: 79.13, last_activity_at: new Date(Date.now()), }, @@ -203,23 +221,7 @@ const EnrollmentsData = [ completed_at: new Date(Date.now()), - progress_percent: 93.52, - - last_activity_at: new Date(Date.now()), - }, - - { - // type code here for "relation_one" field - - // type code here for "relation_one" field - - status: 'cancelled', - - enrolled_at: new Date(Date.now()), - - completed_at: new Date(Date.now()), - - progress_percent: 49.84, + progress_percent: 26.85, last_activity_at: new Date(Date.now()), }, @@ -233,7 +235,7 @@ const LessonProgressData = [ status: 'in_progress', - progress_percent: 37.73, + progress_percent: 68.85, started_at: new Date(Date.now()), @@ -251,7 +253,7 @@ const LessonProgressData = [ status: 'in_progress', - progress_percent: 99.73, + progress_percent: 61.04, started_at: new Date(Date.now()), @@ -259,7 +261,7 @@ const LessonProgressData = [ last_viewed_at: new Date(Date.now()), - time_spent_seconds: 8, + time_spent_seconds: 6, }, { @@ -267,9 +269,9 @@ const LessonProgressData = [ // type code here for "relation_one" field - status: 'completed', + status: 'in_progress', - progress_percent: 72.44, + progress_percent: 30.09, started_at: new Date(Date.now()), @@ -277,7 +279,7 @@ const LessonProgressData = [ last_viewed_at: new Date(Date.now()), - time_spent_seconds: 3, + time_spent_seconds: 7, }, ]; @@ -287,9 +289,9 @@ const AnnouncementsData = [ // type code here for "relation_one" field - title: 'John von Neumann', + title: 'Gustav Kirchhoff', - message: 'Hans Bethe', + message: 'Christiaan Huygens', published_at: new Date(Date.now()), @@ -301,9 +303,9 @@ const AnnouncementsData = [ // type code here for "relation_one" field - title: 'Sigmund Freud', + title: 'Alfred Wegener', - message: 'John Dalton', + message: 'Charles Darwin', published_at: new Date(Date.now()), @@ -315,9 +317,9 @@ const AnnouncementsData = [ // type code here for "relation_one" field - title: 'Lucretius', + title: 'J. Robert Oppenheimer', - message: 'Marie Curie', + message: 'Theodosius Dobzhansky', published_at: new Date(Date.now()), @@ -329,15 +331,15 @@ const CourseResourcesData = [ { // type code here for "relation_one" field - title: 'J. Robert Oppenheimer', + title: 'Max Delbruck', - description: 'Frederick Gowland Hopkins', + description: 'Ernest Rutherford', // type code here for "files" field - url: 'Nicolaus Copernicus', + url: 'Hermann von Helmholtz', - resource_type: 'link', + resource_type: 'file', sort_order: 7, }, @@ -345,53 +347,67 @@ const CourseResourcesData = [ { // type code here for "relation_one" field - title: 'J. Robert Oppenheimer', + title: 'Alfred Wegener', - description: 'August Kekule', + description: 'Justus Liebig', // type code here for "files" field - url: 'Stephen Hawking', + url: 'Noam Chomsky', resource_type: 'link', - sort_order: 5, + sort_order: 3, }, { // type code here for "relation_one" field - title: 'J. Robert Oppenheimer', + title: 'Max Planck', - description: 'Andreas Vesalius', + description: 'Michael Faraday', // type code here for "files" field - url: 'Albert Einstein', + url: 'Michael Faraday', resource_type: 'link', - sort_order: 9, + sort_order: 3, }, ]; const TestData = [ { - name: 'Johannes Kepler', + name: 'Claude Levi-Strauss', - amount: 'Francis Galton', + amount: 'Max Planck', }, { - name: 'Ernst Haeckel', + name: 'Christiaan Huygens', - amount: 'William Bayliss', + amount: 'Tycho Brahe', }, { - name: 'Konrad Lorenz', + name: 'Michael Faraday', - amount: 'Archimedes', + amount: 'Neils Bohr', + }, +]; + +const Test2Data = [ + { + name: 'Jean Piaget', + }, + + { + name: 'Willard Libby', + }, + + { + name: 'B. F. Skinner', }, ]; @@ -728,6 +744,8 @@ module.exports = { await Test.bulkCreate(TestData); + await Test2.bulkCreate(Test2Data); + await Promise.all([ // Similar logic for "relation_many" @@ -765,5 +783,7 @@ module.exports = { await queryInterface.bulkDelete('course_resources', null, {}); await queryInterface.bulkDelete('test', null, {}); + + await queryInterface.bulkDelete('test2', null, {}); }, }; diff --git a/backend/src/db/seeders/20260313145651.js b/backend/src/db/seeders/20260313145651.js new file mode 100644 index 0000000..bcb7b55 --- /dev/null +++ b/backend/src/db/seeders/20260313145651.js @@ -0,0 +1,87 @@ +const { v4: uuid } = require('uuid'); +const db = require('../models'); +const Sequelize = require('sequelize'); +const config = require('../../config'); + +module.exports = { + /** + * @param{import("sequelize").QueryInterface} queryInterface + * @return {Promise} + */ + async up(queryInterface) { + const createdAt = new Date(); + const updatedAt = new Date(); + + /** @type {Map} */ + const idMap = new Map(); + + /** + * @param {string} key + * @return {string} + */ + function getId(key) { + if (idMap.has(key)) { + return idMap.get(key); + } + const id = uuid(); + idMap.set(key, id); + return id; + } + + /** + * @param {string} name + */ + function createPermissions(name) { + return [ + { + id: getId(`CREATE_${name.toUpperCase()}`), + createdAt, + updatedAt, + name: `CREATE_${name.toUpperCase()}`, + }, + { + id: getId(`READ_${name.toUpperCase()}`), + createdAt, + updatedAt, + name: `READ_${name.toUpperCase()}`, + }, + { + id: getId(`UPDATE_${name.toUpperCase()}`), + createdAt, + updatedAt, + name: `UPDATE_${name.toUpperCase()}`, + }, + { + id: getId(`DELETE_${name.toUpperCase()}`), + createdAt, + updatedAt, + name: `DELETE_${name.toUpperCase()}`, + }, + ]; + } + + const entities = ['test2']; + + const createdPermissions = entities.flatMap(createPermissions); + + // Add permissions to database + await queryInterface.bulkInsert('permissions', createdPermissions); + // Get permissions ids + const permissionsIds = createdPermissions.map((p) => p.id); + // Get admin role + const adminRole = await db.roles.findOne({ + where: { name: config.roles.admin }, + }); + + if (adminRole) { + // Add permissions to admin role if it exists + await adminRole.addPermissions(permissionsIds); + } + }, + down: async (queryInterface, Sequelize) => { + await queryInterface.bulkDelete( + 'permissions', + entities.flatMap(createPermissions), + ); + }, +}; diff --git a/backend/src/index.js b/backend/src/index.js index d26cd63..6fe25dd 100644 --- a/backend/src/index.js +++ b/backend/src/index.js @@ -37,6 +37,8 @@ const course_resourcesRoutes = require('./routes/course_resources'); const testRoutes = require('./routes/test'); +const test2Routes = require('./routes/test2'); + const getBaseUrl = (url) => { if (!url) return ''; return url.endsWith('/api') ? url.slice(0, -4) : url; @@ -162,6 +164,12 @@ app.use( testRoutes, ); +app.use( + '/api/test2', + passport.authenticate('jwt', { session: false }), + test2Routes, +); + app.use( '/api/openai', passport.authenticate('jwt', { session: false }), diff --git a/backend/src/routes/test2.js b/backend/src/routes/test2.js new file mode 100644 index 0000000..2d0960b --- /dev/null +++ b/backend/src/routes/test2.js @@ -0,0 +1,433 @@ +const express = require('express'); + +const Test2Service = require('../services/test2'); +const Test2DBApi = require('../db/api/test2'); +const wrapAsync = require('../helpers').wrapAsync; + +const router = express.Router(); + +const { parse } = require('json2csv'); + +const { checkCrudPermissions } = require('../middlewares/check-permissions'); + +router.use(checkCrudPermissions('test2')); + +/** + * @swagger + * components: + * schemas: + * Test2: + * type: object + * properties: + + * name: + * type: string + * default: name + + */ + +/** + * @swagger + * tags: + * name: Test2 + * description: The Test2 managing API + */ + +/** + * @swagger + * /api/test2: + * post: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Add new item + * description: Add new item + * requestBody: + * required: true + * content: + * application/json: + * schema: + * properties: + * data: + * description: Data of the updated item + * type: object + * $ref: "#/components/schemas/Test2" + * responses: + * 200: + * description: The item was successfully added + * content: + * application/json: + * schema: + * $ref: "#/components/schemas/Test2" + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 405: + * description: Invalid input data + * 500: + * description: Some server error + */ +router.post( + '/', + wrapAsync(async (req, res) => { + const referer = + req.headers.referer || + `${req.protocol}://${req.hostname}${req.originalUrl}`; + const link = new URL(referer); + await Test2Service.create(req.body.data, req.currentUser, true, link.host); + const payload = true; + res.status(200).send(payload); + }), +); + +/** + * @swagger + * /api/budgets/bulk-import: + * post: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Bulk import items + * description: Bulk import items + * requestBody: + * required: true + * content: + * application/json: + * schema: + * properties: + * data: + * description: Data of the updated items + * type: array + * items: + * $ref: "#/components/schemas/Test2" + * responses: + * 200: + * description: The items were successfully imported + * content: + * application/json: + * schema: + * $ref: "#/components/schemas/Test2" + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 405: + * description: Invalid input data + * 500: + * description: Some server error + * + */ +router.post( + '/bulk-import', + wrapAsync(async (req, res) => { + const referer = + req.headers.referer || + `${req.protocol}://${req.hostname}${req.originalUrl}`; + const link = new URL(referer); + await Test2Service.bulkImport(req, res, true, link.host); + const payload = true; + res.status(200).send(payload); + }), +); + +/** + * @swagger + * /api/test2/{id}: + * put: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Update the data of the selected item + * description: Update the data of the selected item + * parameters: + * - in: path + * name: id + * description: Item ID to update + * required: true + * schema: + * type: string + * requestBody: + * description: Set new item data + * required: true + * content: + * application/json: + * schema: + * properties: + * id: + * description: ID of the updated item + * type: string + * data: + * description: Data of the updated item + * type: object + * $ref: "#/components/schemas/Test2" + * required: + * - id + * responses: + * 200: + * description: The item data was successfully updated + * content: + * application/json: + * schema: + * $ref: "#/components/schemas/Test2" + * 400: + * description: Invalid ID supplied + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Item not found + * 500: + * description: Some server error + */ +router.put( + '/:id', + wrapAsync(async (req, res) => { + await Test2Service.update(req.body.data, req.body.id, req.currentUser); + const payload = true; + res.status(200).send(payload); + }), +); + +/** + * @swagger + * /api/test2/{id}: + * delete: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Delete the selected item + * description: Delete the selected item + * parameters: + * - in: path + * name: id + * description: Item ID to delete + * required: true + * schema: + * type: string + * responses: + * 200: + * description: The item was successfully deleted + * content: + * application/json: + * schema: + * $ref: "#/components/schemas/Test2" + * 400: + * description: Invalid ID supplied + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Item not found + * 500: + * description: Some server error + */ +router.delete( + '/:id', + wrapAsync(async (req, res) => { + await Test2Service.remove(req.params.id, req.currentUser); + const payload = true; + res.status(200).send(payload); + }), +); + +/** + * @swagger + * /api/test2/deleteByIds: + * post: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Delete the selected item list + * description: Delete the selected item list + * requestBody: + * required: true + * content: + * application/json: + * schema: + * properties: + * ids: + * description: IDs of the updated items + * type: array + * responses: + * 200: + * description: The items was successfully deleted + * content: + * application/json: + * schema: + * $ref: "#/components/schemas/Test2" + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Items not found + * 500: + * description: Some server error + */ +router.post( + '/deleteByIds', + wrapAsync(async (req, res) => { + await Test2Service.deleteByIds(req.body.data, req.currentUser); + const payload = true; + res.status(200).send(payload); + }), +); + +/** + * @swagger + * /api/test2: + * get: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Get all test2 + * description: Get all test2 + * responses: + * 200: + * description: Test2 list successfully received + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: "#/components/schemas/Test2" + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Data not found + * 500: + * description: Some server error + */ +router.get( + '/', + wrapAsync(async (req, res) => { + const filetype = req.query.filetype; + + const currentUser = req.currentUser; + const payload = await Test2DBApi.findAll(req.query, { currentUser }); + if (filetype && filetype === 'csv') { + const fields = ['id', 'name']; + const opts = { fields }; + try { + const csv = parse(payload.rows, opts); + res.status(200).attachment(csv); + res.send(csv); + } catch (err) { + console.error(err); + } + } else { + res.status(200).send(payload); + } + }), +); + +/** + * @swagger + * /api/test2/count: + * get: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Count all test2 + * description: Count all test2 + * responses: + * 200: + * description: Test2 count successfully received + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: "#/components/schemas/Test2" + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Data not found + * 500: + * description: Some server error + */ +router.get( + '/count', + wrapAsync(async (req, res) => { + const currentUser = req.currentUser; + const payload = await Test2DBApi.findAll(req.query, null, { + countOnly: true, + currentUser, + }); + + res.status(200).send(payload); + }), +); + +/** + * @swagger + * /api/test2/autocomplete: + * get: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Find all test2 that match search criteria + * description: Find all test2 that match search criteria + * responses: + * 200: + * description: Test2 list successfully received + * content: + * application/json: + * schema: + * type: array + * items: + * $ref: "#/components/schemas/Test2" + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Data not found + * 500: + * description: Some server error + */ +router.get('/autocomplete', async (req, res) => { + const payload = await Test2DBApi.findAllAutocomplete( + req.query.query, + req.query.limit, + req.query.offset, + ); + + res.status(200).send(payload); +}); + +/** + * @swagger + * /api/test2/{id}: + * get: + * security: + * - bearerAuth: [] + * tags: [Test2] + * summary: Get selected item + * description: Get selected item + * parameters: + * - in: path + * name: id + * description: ID of item to get + * required: true + * schema: + * type: string + * responses: + * 200: + * description: Selected item successfully received + * content: + * application/json: + * schema: + * $ref: "#/components/schemas/Test2" + * 400: + * description: Invalid ID supplied + * 401: + * $ref: "#/components/responses/UnauthorizedError" + * 404: + * description: Item not found + * 500: + * description: Some server error + */ +router.get( + '/:id', + wrapAsync(async (req, res) => { + const payload = await Test2DBApi.findBy({ id: req.params.id }); + + res.status(200).send(payload); + }), +); + +router.use('/', require('../helpers').commonErrorHandler); + +module.exports = router; diff --git a/backend/src/services/search.js b/backend/src/services/search.js index 9b3535c..26db709 100644 --- a/backend/src/services/search.js +++ b/backend/src/services/search.js @@ -52,6 +52,8 @@ module.exports = class SearchService { course_resources: ['title', 'description', 'url'], test: ['name', 'amount'], + + test2: ['name'], }; const columnsInt = { courses: ['price'], diff --git a/backend/src/services/test2.js b/backend/src/services/test2.js new file mode 100644 index 0000000..2e94ab2 --- /dev/null +++ b/backend/src/services/test2.js @@ -0,0 +1,114 @@ +const db = require('../db/models'); +const Test2DBApi = require('../db/api/test2'); +const processFile = require('../middlewares/upload'); +const ValidationError = require('./notifications/errors/validation'); +const csv = require('csv-parser'); +const axios = require('axios'); +const config = require('../config'); +const stream = require('stream'); + +module.exports = class Test2Service { + static async create(data, currentUser) { + const transaction = await db.sequelize.transaction(); + try { + await Test2DBApi.create(data, { + currentUser, + transaction, + }); + + await transaction.commit(); + } catch (error) { + await transaction.rollback(); + throw error; + } + } + + static async bulkImport(req, res, sendInvitationEmails = true, host) { + const transaction = await db.sequelize.transaction(); + + try { + await processFile(req, res); + const bufferStream = new stream.PassThrough(); + const results = []; + + await bufferStream.end(Buffer.from(req.file.buffer, 'utf-8')); // convert Buffer to Stream + + await new Promise((resolve, reject) => { + bufferStream + .pipe(csv()) + .on('data', (data) => results.push(data)) + .on('end', async () => { + console.log('CSV results', results); + resolve(); + }) + .on('error', (error) => reject(error)); + }); + + await Test2DBApi.bulkImport(results, { + transaction, + ignoreDuplicates: true, + validate: true, + currentUser: req.currentUser, + }); + + await transaction.commit(); + } catch (error) { + await transaction.rollback(); + throw error; + } + } + + static async update(data, id, currentUser) { + const transaction = await db.sequelize.transaction(); + try { + let test2 = await Test2DBApi.findBy({ id }, { transaction }); + + if (!test2) { + throw new ValidationError('test2NotFound'); + } + + const updatedTest2 = await Test2DBApi.update(id, data, { + currentUser, + transaction, + }); + + await transaction.commit(); + return updatedTest2; + } catch (error) { + await transaction.rollback(); + throw error; + } + } + + static async deleteByIds(ids, currentUser) { + const transaction = await db.sequelize.transaction(); + + try { + await Test2DBApi.deleteByIds(ids, { + currentUser, + transaction, + }); + + await transaction.commit(); + } catch (error) { + await transaction.rollback(); + throw error; + } + } + + static async remove(id, currentUser) { + const transaction = await db.sequelize.transaction(); + + try { + await Test2DBApi.remove(id, { + currentUser, + transaction, + }); + + await transaction.commit(); + } catch (error) { + await transaction.rollback(); + throw error; + } + } +}; diff --git a/frontend/src/components/Test2/CardTest2.tsx b/frontend/src/components/Test2/CardTest2.tsx new file mode 100644 index 0000000..2fd57c0 --- /dev/null +++ b/frontend/src/components/Test2/CardTest2.tsx @@ -0,0 +1,105 @@ +import React from 'react'; +import ImageField from '../ImageField'; +import ListActionsPopover from '../ListActionsPopover'; +import { useAppSelector } from '../../stores/hooks'; +import dataFormatter from '../../helpers/dataFormatter'; +import { Pagination } from '../Pagination'; +import { saveFile } from '../../helpers/fileSaver'; +import LoadingSpinner from '../LoadingSpinner'; +import Link from 'next/link'; + +import { hasPermission } from '../../helpers/userPermissions'; + +type Props = { + test2: any[]; + loading: boolean; + onDelete: (id: string) => void; + currentPage: number; + numPages: number; + onPageChange: (page: number) => void; +}; + +const CardTest2 = ({ + test2, + loading, + onDelete, + currentPage, + numPages, + onPageChange, +}: Props) => { + const asideScrollbarsStyle = useAppSelector( + (state) => state.style.asideScrollbarsStyle, + ); + const bgColor = useAppSelector((state) => state.style.cardsColor); + const darkMode = useAppSelector((state) => state.style.darkMode); + const corners = useAppSelector((state) => state.style.corners); + const focusRing = useAppSelector((state) => state.style.focusRingColor); + + const currentUser = useAppSelector((state) => state.auth.currentUser); + const hasUpdatePermission = hasPermission(currentUser, 'UPDATE_TEST2'); + + return ( +
+ {loading && } +
    + {!loading && + test2.map((item, index) => ( +
  • +
    + + {item.id} + + +
    + +
    +
    +
    +
    +
    Name
    +
    +
    {item.name}
    +
    +
    +
    +
  • + ))} + {!loading && test2.length === 0 && ( +
    +

    No data to display

    +
    + )} +
+
+ +
+
+ ); +}; + +export default CardTest2; diff --git a/frontend/src/components/Test2/ListTest2.tsx b/frontend/src/components/Test2/ListTest2.tsx new file mode 100644 index 0000000..d44b09a --- /dev/null +++ b/frontend/src/components/Test2/ListTest2.tsx @@ -0,0 +1,87 @@ +import React from 'react'; +import CardBox from '../CardBox'; +import ImageField from '../ImageField'; +import dataFormatter from '../../helpers/dataFormatter'; +import { saveFile } from '../../helpers/fileSaver'; +import ListActionsPopover from '../ListActionsPopover'; +import { useAppSelector } from '../../stores/hooks'; +import { Pagination } from '../Pagination'; +import LoadingSpinner from '../LoadingSpinner'; +import Link from 'next/link'; + +import { hasPermission } from '../../helpers/userPermissions'; + +type Props = { + test2: any[]; + loading: boolean; + onDelete: (id: string) => void; + currentPage: number; + numPages: number; + onPageChange: (page: number) => void; +}; + +const ListTest2 = ({ + test2, + loading, + onDelete, + currentPage, + numPages, + onPageChange, +}: Props) => { + const currentUser = useAppSelector((state) => state.auth.currentUser); + const hasUpdatePermission = hasPermission(currentUser, 'UPDATE_TEST2'); + + const corners = useAppSelector((state) => state.style.corners); + const bgColor = useAppSelector((state) => state.style.cardsColor); + + return ( + <> +
+ {loading && } + {!loading && + test2.map((item) => ( +
+ +
+ dark:divide-dark-700 overflow-x-auto' + } + > +
+

Name

+

{item.name}

+
+ + +
+
+
+ ))} + {!loading && test2.length === 0 && ( +
+

No data to display

+
+ )} +
+
+ +
+ + ); +}; + +export default ListTest2; diff --git a/frontend/src/components/Test2/TableTest2.tsx b/frontend/src/components/Test2/TableTest2.tsx new file mode 100644 index 0000000..1a7b4b4 --- /dev/null +++ b/frontend/src/components/Test2/TableTest2.tsx @@ -0,0 +1,481 @@ +import React, { useEffect, useState, useMemo } from 'react'; +import { createPortal } from 'react-dom'; +import { ToastContainer, toast } from 'react-toastify'; +import BaseButton from '../BaseButton'; +import CardBoxModal from '../CardBoxModal'; +import CardBox from '../CardBox'; +import { + fetch, + update, + deleteItem, + setRefetch, + deleteItemsByIds, +} from '../../stores/test2/test2Slice'; +import { useAppDispatch, useAppSelector } from '../../stores/hooks'; +import { useRouter } from 'next/router'; +import { Field, Form, Formik } from 'formik'; +import { DataGrid, GridColDef } from '@mui/x-data-grid'; +import { loadColumns } from './configureTest2Cols'; +import _ from 'lodash'; +import dataFormatter from '../../helpers/dataFormatter'; +import { dataGridStyles } from '../../styles'; + +const perPage = 10; + +const TableSampleTest2 = ({ + filterItems, + setFilterItems, + filters, + showGrid, +}) => { + const notify = (type, msg) => toast(msg, { type, position: 'bottom-center' }); + + const dispatch = useAppDispatch(); + const router = useRouter(); + + const pagesList = []; + const [id, setId] = useState(null); + const [currentPage, setCurrentPage] = useState(0); + const [filterRequest, setFilterRequest] = React.useState(''); + const [columns, setColumns] = useState([]); + const [selectedRows, setSelectedRows] = useState([]); + const [sortModel, setSortModel] = useState([ + { + field: '', + sort: 'desc', + }, + ]); + + const { + test2, + loading, + count, + notify: test2Notify, + refetch, + } = useAppSelector((state) => state.test2); + const { currentUser } = useAppSelector((state) => state.auth); + const focusRing = useAppSelector((state) => state.style.focusRingColor); + const bgColor = useAppSelector((state) => state.style.bgLayoutColor); + const corners = useAppSelector((state) => state.style.corners); + const numPages = + Math.floor(count / perPage) === 0 ? 1 : Math.ceil(count / perPage); + for (let i = 0; i < numPages; i++) { + pagesList.push(i); + } + + const loadData = async (page = currentPage, request = filterRequest) => { + if (page !== currentPage) setCurrentPage(page); + if (request !== filterRequest) setFilterRequest(request); + const { sort, field } = sortModel[0]; + + const query = `?page=${page}&limit=${perPage}${request}&sort=${sort}&field=${field}`; + dispatch(fetch({ limit: perPage, page, query })); + }; + + useEffect(() => { + if (test2Notify.showNotification) { + notify(test2Notify.typeNotification, test2Notify.textNotification); + } + }, [test2Notify.showNotification]); + + useEffect(() => { + if (!currentUser) return; + loadData(); + }, [sortModel, currentUser]); + + useEffect(() => { + if (refetch) { + loadData(0); + dispatch(setRefetch(false)); + } + }, [refetch, dispatch]); + + const [isModalInfoActive, setIsModalInfoActive] = useState(false); + const [isModalTrashActive, setIsModalTrashActive] = useState(false); + + const handleModalAction = () => { + setIsModalInfoActive(false); + setIsModalTrashActive(false); + }; + + const handleDeleteModalAction = (id: string) => { + setId(id); + setIsModalTrashActive(true); + }; + const handleDeleteAction = async () => { + if (id) { + await dispatch(deleteItem(id)); + await loadData(0); + setIsModalTrashActive(false); + } + }; + + const generateFilterRequests = useMemo(() => { + let request = '&'; + filterItems.forEach((item) => { + const isRangeFilter = filters.find( + (filter) => + filter.title === item.fields.selectedField && + (filter.number || filter.date), + ); + + if (isRangeFilter) { + const from = item.fields.filterValueFrom; + const to = item.fields.filterValueTo; + if (from) { + request += `${item.fields.selectedField}Range=${from}&`; + } + if (to) { + request += `${item.fields.selectedField}Range=${to}&`; + } + } else { + const value = item.fields.filterValue; + if (value) { + request += `${item.fields.selectedField}=${value}&`; + } + } + }); + return request; + }, [filterItems, filters]); + + const deleteFilter = (value) => { + const newItems = filterItems.filter((item) => item.id !== value); + + if (newItems.length) { + setFilterItems(newItems); + } else { + loadData(0, ''); + + setFilterItems(newItems); + } + }; + + const handleSubmit = () => { + loadData(0, generateFilterRequests); + }; + + const handleChange = (id) => (e) => { + const value = e.target.value; + const name = e.target.name; + + setFilterItems( + filterItems.map((item) => { + if (item.id !== id) return item; + if (name === 'selectedField') return { id, fields: { [name]: value } }; + + return { id, fields: { ...item.fields, [name]: value } }; + }), + ); + }; + + const handleReset = () => { + setFilterItems([]); + loadData(0, ''); + }; + + const onPageChange = (page: number) => { + loadData(page); + setCurrentPage(page); + }; + + useEffect(() => { + if (!currentUser) return; + + loadColumns(handleDeleteModalAction, `test2`, currentUser).then((newCols) => + setColumns(newCols), + ); + }, [currentUser]); + + const handleTableSubmit = async (id: string, data) => { + if (!_.isEmpty(data)) { + await dispatch(update({ id, data })) + .unwrap() + .then((res) => res) + .catch((err) => { + throw new Error(err); + }); + } + }; + + const onDeleteRows = async (selectedRows) => { + await dispatch(deleteItemsByIds(selectedRows)); + await loadData(0); + }; + + const controlClasses = + 'w-full py-2 px-2 my-2 rounded dark:placeholder-gray-400 ' + + ` ${bgColor} ${focusRing} ${corners} ` + + 'dark:bg-slate-800 border'; + + const dataGrid = ( +
+ `datagrid--row`} + rows={test2 ?? []} + columns={columns} + initialState={{ + pagination: { + paginationModel: { + pageSize: 10, + }, + }, + }} + disableRowSelectionOnClick + onProcessRowUpdateError={(params) => { + console.log('Error', params); + }} + processRowUpdate={async (newRow, oldRow) => { + const data = dataFormatter.dataGridEditFormatter(newRow); + + try { + await handleTableSubmit(newRow.id, data); + return newRow; + } catch { + return oldRow; + } + }} + sortingMode={'server'} + checkboxSelection + onRowSelectionModelChange={(ids) => { + setSelectedRows(ids); + }} + onSortModelChange={(params) => { + params.length + ? setSortModel(params) + : setSortModel([{ field: '', sort: 'desc' }]); + }} + rowCount={count} + pageSizeOptions={[10]} + paginationMode={'server'} + loading={loading} + onPaginationModelChange={(params) => { + onPageChange(params.page); + }} + /> +
+ ); + + return ( + <> + {filterItems && Array.isArray(filterItems) && filterItems.length ? ( + + null} + > +
+ <> + {filterItems && + filterItems.map((filterItem) => { + return ( +
+
+
+ Filter +
+ + {filters.map((selectOption) => ( + + ))} + +
+ {filters.find( + (filter) => + filter.title === filterItem?.fields?.selectedField, + )?.type === 'enum' ? ( +
+
Value
+ + + {filters + .find( + (filter) => + filter.title === + filterItem?.fields?.selectedField, + ) + ?.options?.map((option) => ( + + ))} + +
+ ) : filters.find( + (filter) => + filter.title === + filterItem?.fields?.selectedField, + )?.number ? ( +
+
+
+ From +
+ +
+
+
+ To +
+ +
+
+ ) : filters.find( + (filter) => + filter.title === + filterItem?.fields?.selectedField, + )?.date ? ( +
+
+
+ From +
+ +
+
+
+ To +
+ +
+
+ ) : ( +
+
+ Contains +
+ +
+ )} +
+
+ Action +
+ { + deleteFilter(filterItem.id); + }} + /> +
+
+ ); + })} +
+ + +
+ +
+
+
+ ) : null} + +

Are you sure you want to delete this item?

+
+ + {dataGrid} + + {selectedRows.length > 0 && + createPortal( + onDeleteRows(selectedRows)} + />, + document.getElementById('delete-rows-button'), + )} + + + ); +}; + +export default TableSampleTest2; diff --git a/frontend/src/components/Test2/configureTest2Cols.tsx b/frontend/src/components/Test2/configureTest2Cols.tsx new file mode 100644 index 0000000..e18bdc1 --- /dev/null +++ b/frontend/src/components/Test2/configureTest2Cols.tsx @@ -0,0 +1,74 @@ +import React from 'react'; +import BaseIcon from '../BaseIcon'; +import { mdiEye, mdiTrashCan, mdiPencilOutline } from '@mdi/js'; +import axios from 'axios'; +import { + GridActionsCellItem, + GridRowParams, + GridValueGetterParams, +} from '@mui/x-data-grid'; +import ImageField from '../ImageField'; +import { saveFile } from '../../helpers/fileSaver'; +import dataFormatter from '../../helpers/dataFormatter'; +import DataGridMultiSelect from '../DataGridMultiSelect'; +import ListActionsPopover from '../ListActionsPopover'; + +import { hasPermission } from '../../helpers/userPermissions'; + +type Params = (id: string) => void; + +export const loadColumns = async ( + onDelete: Params, + entityName: string, + + user, +) => { + async function callOptionsApi(entityName: string) { + if (!hasPermission(user, 'READ_' + entityName.toUpperCase())) return []; + + try { + const data = await axios(`/${entityName}/autocomplete?limit=100`); + return data.data; + } catch (error) { + console.log(error); + return []; + } + } + + const hasUpdatePermission = hasPermission(user, 'UPDATE_TEST2'); + + return [ + { + field: 'name', + headerName: 'Name', + flex: 1, + minWidth: 120, + filterable: false, + headerClassName: 'datagrid--header', + cellClassName: 'datagrid--cell', + + editable: hasUpdatePermission, + }, + + { + field: 'actions', + type: 'actions', + minWidth: 30, + headerClassName: 'datagrid--header', + cellClassName: 'datagrid--cell', + getActions: (params: GridRowParams) => { + return [ +
+ +
, + ]; + }, + }, + ]; +}; diff --git a/frontend/src/menuAside.ts b/frontend/src/menuAside.ts index 7ad2a89..eb2db1f 100644 --- a/frontend/src/menuAside.ts +++ b/frontend/src/menuAside.ts @@ -106,6 +106,14 @@ const menuAside: MenuAsideItem[] = [ icon: icon.mdiTable ?? icon.mdiTable, permissions: 'READ_TEST', }, + { + href: '/test2/test2-list', + label: 'Test2', + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + icon: icon.mdiTable ?? icon.mdiTable, + permissions: 'READ_TEST2', + }, { href: '/profile', label: 'Profile', diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsx index a49c02a..b5fd66d 100644 --- a/frontend/src/pages/dashboard.tsx +++ b/frontend/src/pages/dashboard.tsx @@ -39,6 +39,7 @@ const Dashboard = () => { const [course_resources, setCourse_resources] = React.useState(loadingMessage); const [test, setTest] = React.useState(loadingMessage); + const [test2, setTest2] = React.useState(loadingMessage); const [widgetsRole, setWidgetsRole] = React.useState({ role: { value: '', label: '' }, @@ -60,6 +61,7 @@ const Dashboard = () => { 'announcements', 'course_resources', 'test', + 'test2', ]; const fns = [ setUsers, @@ -72,6 +74,7 @@ const Dashboard = () => { setAnnouncements, setCourse_resources, setTest, + setTest2, ]; const requests = entities.map((entity, index) => { @@ -529,6 +532,38 @@ const Dashboard = () => { )} + + {hasPermission(currentUser, 'READ_TEST2') && ( + +
+
+
+
+ Test2 +
+
+ {test2} +
+
+
+ +
+
+
+ + )} diff --git a/frontend/src/pages/test2/[test2Id].tsx b/frontend/src/pages/test2/[test2Id].tsx new file mode 100644 index 0000000..376a0c5 --- /dev/null +++ b/frontend/src/pages/test2/[test2Id].tsx @@ -0,0 +1,124 @@ +import { mdiChartTimelineVariant, mdiUpload } from '@mdi/js'; +import Head from 'next/head'; +import React, { ReactElement, useEffect, useState } from 'react'; +import DatePicker from 'react-datepicker'; +import 'react-datepicker/dist/react-datepicker.css'; +import dayjs from 'dayjs'; + +import CardBox from '../../components/CardBox'; +import LayoutAuthenticated from '../../layouts/Authenticated'; +import SectionMain from '../../components/SectionMain'; +import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'; +import { getPageTitle } from '../../config'; + +import { Field, Form, Formik } from 'formik'; +import FormField from '../../components/FormField'; +import BaseDivider from '../../components/BaseDivider'; +import BaseButtons from '../../components/BaseButtons'; +import BaseButton from '../../components/BaseButton'; +import FormCheckRadio from '../../components/FormCheckRadio'; +import FormCheckRadioGroup from '../../components/FormCheckRadioGroup'; +import FormFilePicker from '../../components/FormFilePicker'; +import FormImagePicker from '../../components/FormImagePicker'; +import { SelectField } from '../../components/SelectField'; +import { SelectFieldMany } from '../../components/SelectFieldMany'; +import { SwitchField } from '../../components/SwitchField'; +import { RichTextField } from '../../components/RichTextField'; + +import { update, fetch } from '../../stores/test2/test2Slice'; +import { useAppDispatch, useAppSelector } from '../../stores/hooks'; +import { useRouter } from 'next/router'; +import { saveFile } from '../../helpers/fileSaver'; +import dataFormatter from '../../helpers/dataFormatter'; +import ImageField from '../../components/ImageField'; + +const EditTest2 = () => { + const router = useRouter(); + const dispatch = useAppDispatch(); + const initVals = { + name: '', + }; + const [initialValues, setInitialValues] = useState(initVals); + + const { test2 } = useAppSelector((state) => state.test2); + + const { test2Id } = router.query; + + useEffect(() => { + dispatch(fetch({ id: test2Id })); + }, [test2Id]); + + useEffect(() => { + if (typeof test2 === 'object') { + setInitialValues(test2); + } + }, [test2]); + + useEffect(() => { + if (typeof test2 === 'object') { + const newInitialVal = { ...initVals }; + + Object.keys(initVals).forEach((el) => (newInitialVal[el] = test2[el])); + + setInitialValues(newInitialVal); + } + }, [test2]); + + const handleSubmit = async (data) => { + await dispatch(update({ id: test2Id, data })); + await router.push('/test2/test2-list'); + }; + + return ( + <> + + {getPageTitle('Edit test2')} + + + + {''} + + + handleSubmit(values)} + > +
+ + + + + + + + + router.push('/test2/test2-list')} + /> + + +
+
+
+ + ); +}; + +EditTest2.getLayout = function getLayout(page: ReactElement) { + return ( + + {page} + + ); +}; + +export default EditTest2; diff --git a/frontend/src/pages/test2/test2-edit.tsx b/frontend/src/pages/test2/test2-edit.tsx new file mode 100644 index 0000000..e8826b5 --- /dev/null +++ b/frontend/src/pages/test2/test2-edit.tsx @@ -0,0 +1,122 @@ +import { mdiChartTimelineVariant, mdiUpload } from '@mdi/js'; +import Head from 'next/head'; +import React, { ReactElement, useEffect, useState } from 'react'; +import DatePicker from 'react-datepicker'; +import 'react-datepicker/dist/react-datepicker.css'; +import dayjs from 'dayjs'; + +import CardBox from '../../components/CardBox'; +import LayoutAuthenticated from '../../layouts/Authenticated'; +import SectionMain from '../../components/SectionMain'; +import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'; +import { getPageTitle } from '../../config'; + +import { Field, Form, Formik } from 'formik'; +import FormField from '../../components/FormField'; +import BaseDivider from '../../components/BaseDivider'; +import BaseButtons from '../../components/BaseButtons'; +import BaseButton from '../../components/BaseButton'; +import FormCheckRadio from '../../components/FormCheckRadio'; +import FormCheckRadioGroup from '../../components/FormCheckRadioGroup'; +import FormFilePicker from '../../components/FormFilePicker'; +import FormImagePicker from '../../components/FormImagePicker'; +import { SelectField } from '../../components/SelectField'; +import { SelectFieldMany } from '../../components/SelectFieldMany'; +import { SwitchField } from '../../components/SwitchField'; +import { RichTextField } from '../../components/RichTextField'; + +import { update, fetch } from '../../stores/test2/test2Slice'; +import { useAppDispatch, useAppSelector } from '../../stores/hooks'; +import { useRouter } from 'next/router'; +import { saveFile } from '../../helpers/fileSaver'; +import dataFormatter from '../../helpers/dataFormatter'; +import ImageField from '../../components/ImageField'; + +const EditTest2Page = () => { + const router = useRouter(); + const dispatch = useAppDispatch(); + const initVals = { + name: '', + }; + const [initialValues, setInitialValues] = useState(initVals); + + const { test2 } = useAppSelector((state) => state.test2); + + const { id } = router.query; + + useEffect(() => { + dispatch(fetch({ id: id })); + }, [id]); + + useEffect(() => { + if (typeof test2 === 'object') { + setInitialValues(test2); + } + }, [test2]); + + useEffect(() => { + if (typeof test2 === 'object') { + const newInitialVal = { ...initVals }; + Object.keys(initVals).forEach((el) => (newInitialVal[el] = test2[el])); + setInitialValues(newInitialVal); + } + }, [test2]); + + const handleSubmit = async (data) => { + await dispatch(update({ id: id, data })); + await router.push('/test2/test2-list'); + }; + + return ( + <> + + {getPageTitle('Edit test2')} + + + + {''} + + + handleSubmit(values)} + > +
+ + + + + + + + + router.push('/test2/test2-list')} + /> + + +
+
+
+ + ); +}; + +EditTest2Page.getLayout = function getLayout(page: ReactElement) { + return ( + + {page} + + ); +}; + +export default EditTest2Page; diff --git a/frontend/src/pages/test2/test2-list.tsx b/frontend/src/pages/test2/test2-list.tsx new file mode 100644 index 0000000..ed48808 --- /dev/null +++ b/frontend/src/pages/test2/test2-list.tsx @@ -0,0 +1,160 @@ +import { mdiChartTimelineVariant } from '@mdi/js'; +import Head from 'next/head'; +import { uniqueId } from 'lodash'; +import React, { ReactElement, useState } from 'react'; +import CardBox from '../../components/CardBox'; +import LayoutAuthenticated from '../../layouts/Authenticated'; +import SectionMain from '../../components/SectionMain'; +import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'; +import { getPageTitle } from '../../config'; +import TableTest2 from '../../components/Test2/TableTest2'; +import BaseButton from '../../components/BaseButton'; +import axios from 'axios'; +import Link from 'next/link'; +import { useAppDispatch, useAppSelector } from '../../stores/hooks'; +import CardBoxModal from '../../components/CardBoxModal'; +import DragDropFilePicker from '../../components/DragDropFilePicker'; +import { setRefetch, uploadCsv } from '../../stores/test2/test2Slice'; + +import { hasPermission } from '../../helpers/userPermissions'; + +const Test2TablesPage = () => { + const [filterItems, setFilterItems] = useState([]); + const [csvFile, setCsvFile] = useState(null); + const [isModalActive, setIsModalActive] = useState(false); + const [showTableView, setShowTableView] = useState(false); + + const { currentUser } = useAppSelector((state) => state.auth); + + const dispatch = useAppDispatch(); + + const [filters] = useState([{ label: 'Name', title: 'name' }]); + + const hasCreatePermission = + currentUser && hasPermission(currentUser, 'CREATE_TEST2'); + + const addFilter = () => { + const newItem = { + id: uniqueId(), + fields: { + filterValue: '', + filterValueFrom: '', + filterValueTo: '', + selectedField: '', + }, + }; + newItem.fields.selectedField = filters[0].title; + setFilterItems([...filterItems, newItem]); + }; + + const getTest2CSV = async () => { + const response = await axios({ + url: '/test2?filetype=csv', + method: 'GET', + responseType: 'blob', + }); + const type = response.headers['content-type']; + const blob = new Blob([response.data], { type: type }); + const link = document.createElement('a'); + link.href = window.URL.createObjectURL(blob); + link.download = 'test2CSV.csv'; + link.click(); + }; + + const onModalConfirm = async () => { + if (!csvFile) return; + await dispatch(uploadCsv(csvFile)); + dispatch(setRefetch(true)); + setCsvFile(null); + setIsModalActive(false); + }; + + const onModalCancel = () => { + setCsvFile(null); + setIsModalActive(false); + }; + + return ( + <> + + {getPageTitle('Test2')} + + + + {''} + + + {hasCreatePermission && ( + + )} + + + + + {hasCreatePermission && ( + setIsModalActive(true)} + /> + )} + +
+
+
+
+ + + + +
+ + + + + ); +}; + +Test2TablesPage.getLayout = function getLayout(page: ReactElement) { + return ( + {page} + ); +}; + +export default Test2TablesPage; diff --git a/frontend/src/pages/test2/test2-new.tsx b/frontend/src/pages/test2/test2-new.tsx new file mode 100644 index 0000000..93e35cc --- /dev/null +++ b/frontend/src/pages/test2/test2-new.tsx @@ -0,0 +1,98 @@ +import { + mdiAccount, + mdiChartTimelineVariant, + mdiMail, + mdiUpload, +} from '@mdi/js'; +import Head from 'next/head'; +import React, { ReactElement } from 'react'; +import CardBox from '../../components/CardBox'; +import LayoutAuthenticated from '../../layouts/Authenticated'; +import SectionMain from '../../components/SectionMain'; +import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'; +import { getPageTitle } from '../../config'; + +import { Field, Form, Formik } from 'formik'; +import FormField from '../../components/FormField'; +import BaseDivider from '../../components/BaseDivider'; +import BaseButtons from '../../components/BaseButtons'; +import BaseButton from '../../components/BaseButton'; +import FormCheckRadio from '../../components/FormCheckRadio'; +import FormCheckRadioGroup from '../../components/FormCheckRadioGroup'; +import FormFilePicker from '../../components/FormFilePicker'; +import FormImagePicker from '../../components/FormImagePicker'; +import { SwitchField } from '../../components/SwitchField'; + +import { SelectField } from '../../components/SelectField'; +import { SelectFieldMany } from '../../components/SelectFieldMany'; +import { RichTextField } from '../../components/RichTextField'; + +import { create } from '../../stores/test2/test2Slice'; +import { useAppDispatch } from '../../stores/hooks'; +import { useRouter } from 'next/router'; +import moment from 'moment'; + +const initialValues = { + name: '', +}; + +const Test2New = () => { + const router = useRouter(); + const dispatch = useAppDispatch(); + + const handleSubmit = async (data) => { + await dispatch(create(data)); + await router.push('/test2/test2-list'); + }; + return ( + <> + + {getPageTitle('New Item')} + + + + {''} + + + handleSubmit(values)} + > +
+ + + + + + + + + router.push('/test2/test2-list')} + /> + + +
+
+
+ + ); +}; + +Test2New.getLayout = function getLayout(page: ReactElement) { + return ( + + {page} + + ); +}; + +export default Test2New; diff --git a/frontend/src/pages/test2/test2-table.tsx b/frontend/src/pages/test2/test2-table.tsx new file mode 100644 index 0000000..6355a47 --- /dev/null +++ b/frontend/src/pages/test2/test2-table.tsx @@ -0,0 +1,159 @@ +import { mdiChartTimelineVariant } from '@mdi/js'; +import Head from 'next/head'; +import { uniqueId } from 'lodash'; +import React, { ReactElement, useState } from 'react'; +import CardBox from '../../components/CardBox'; +import LayoutAuthenticated from '../../layouts/Authenticated'; +import SectionMain from '../../components/SectionMain'; +import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'; +import { getPageTitle } from '../../config'; +import TableTest2 from '../../components/Test2/TableTest2'; +import BaseButton from '../../components/BaseButton'; +import axios from 'axios'; +import Link from 'next/link'; +import { useAppDispatch, useAppSelector } from '../../stores/hooks'; +import CardBoxModal from '../../components/CardBoxModal'; +import DragDropFilePicker from '../../components/DragDropFilePicker'; +import { setRefetch, uploadCsv } from '../../stores/test2/test2Slice'; + +import { hasPermission } from '../../helpers/userPermissions'; + +const Test2TablesPage = () => { + const [filterItems, setFilterItems] = useState([]); + const [csvFile, setCsvFile] = useState(null); + const [isModalActive, setIsModalActive] = useState(false); + const [showTableView, setShowTableView] = useState(false); + + const { currentUser } = useAppSelector((state) => state.auth); + + const dispatch = useAppDispatch(); + + const [filters] = useState([{ label: 'Name', title: 'name' }]); + + const hasCreatePermission = + currentUser && hasPermission(currentUser, 'CREATE_TEST2'); + + const addFilter = () => { + const newItem = { + id: uniqueId(), + fields: { + filterValue: '', + filterValueFrom: '', + filterValueTo: '', + selectedField: '', + }, + }; + newItem.fields.selectedField = filters[0].title; + setFilterItems([...filterItems, newItem]); + }; + + const getTest2CSV = async () => { + const response = await axios({ + url: '/test2?filetype=csv', + method: 'GET', + responseType: 'blob', + }); + const type = response.headers['content-type']; + const blob = new Blob([response.data], { type: type }); + const link = document.createElement('a'); + link.href = window.URL.createObjectURL(blob); + link.download = 'test2CSV.csv'; + link.click(); + }; + + const onModalConfirm = async () => { + if (!csvFile) return; + await dispatch(uploadCsv(csvFile)); + dispatch(setRefetch(true)); + setCsvFile(null); + setIsModalActive(false); + }; + + const onModalCancel = () => { + setCsvFile(null); + setIsModalActive(false); + }; + + return ( + <> + + {getPageTitle('Test2')} + + + + {''} + + + {hasCreatePermission && ( + + )} + + + + + {hasCreatePermission && ( + setIsModalActive(true)} + /> + )} + +
+
+
+
+ + + +
+ + + + + ); +}; + +Test2TablesPage.getLayout = function getLayout(page: ReactElement) { + return ( + {page} + ); +}; + +export default Test2TablesPage; diff --git a/frontend/src/pages/test2/test2-view.tsx b/frontend/src/pages/test2/test2-view.tsx new file mode 100644 index 0000000..bc231cb --- /dev/null +++ b/frontend/src/pages/test2/test2-view.tsx @@ -0,0 +1,81 @@ +import React, { ReactElement, useEffect } from 'react'; +import Head from 'next/head'; +import DatePicker from 'react-datepicker'; +import 'react-datepicker/dist/react-datepicker.css'; +import dayjs from 'dayjs'; +import { useAppDispatch, useAppSelector } from '../../stores/hooks'; +import { useRouter } from 'next/router'; +import { fetch } from '../../stores/test2/test2Slice'; +import { saveFile } from '../../helpers/fileSaver'; +import dataFormatter from '../../helpers/dataFormatter'; +import ImageField from '../../components/ImageField'; +import LayoutAuthenticated from '../../layouts/Authenticated'; +import { getPageTitle } from '../../config'; +import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'; +import SectionMain from '../../components/SectionMain'; +import CardBox from '../../components/CardBox'; +import BaseButton from '../../components/BaseButton'; +import BaseDivider from '../../components/BaseDivider'; +import { mdiChartTimelineVariant } from '@mdi/js'; +import { SwitchField } from '../../components/SwitchField'; +import FormField from '../../components/FormField'; + +const Test2View = () => { + const router = useRouter(); + const dispatch = useAppDispatch(); + const { test2 } = useAppSelector((state) => state.test2); + + const { id } = router.query; + + function removeLastCharacter(str) { + console.log(str, `str`); + return str.slice(0, -1); + } + + useEffect(() => { + dispatch(fetch({ id })); + }, [dispatch, id]); + + return ( + <> + + {getPageTitle('View test2')} + + + + + + +
+

Name

+

{test2?.name}

+
+ + + + router.push('/test2/test2-list')} + /> +
+
+ + ); +}; + +Test2View.getLayout = function getLayout(page: ReactElement) { + return ( + {page} + ); +}; + +export default Test2View; diff --git a/frontend/src/stores/store.ts b/frontend/src/stores/store.ts index 75d5e47..f93e745 100644 --- a/frontend/src/stores/store.ts +++ b/frontend/src/stores/store.ts @@ -14,6 +14,7 @@ import lesson_progressSlice from './lesson_progress/lesson_progressSlice'; import announcementsSlice from './announcements/announcementsSlice'; import course_resourcesSlice from './course_resources/course_resourcesSlice'; import testSlice from './test/testSlice'; +import test2Slice from './test2/test2Slice'; export const store = configureStore({ reducer: { @@ -32,6 +33,7 @@ export const store = configureStore({ announcements: announcementsSlice, course_resources: course_resourcesSlice, test: testSlice, + test2: test2Slice, }, }); diff --git a/frontend/src/stores/test2/test2Slice.ts b/frontend/src/stores/test2/test2Slice.ts new file mode 100644 index 0000000..272f130 --- /dev/null +++ b/frontend/src/stores/test2/test2Slice.ts @@ -0,0 +1,236 @@ +import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit'; +import axios from 'axios'; +import { + fulfilledNotify, + rejectNotify, + resetNotify, +} from '../../helpers/notifyStateHandler'; + +interface MainState { + test2: any; + loading: boolean; + count: number; + refetch: boolean; + rolesWidgets: any[]; + notify: { + showNotification: boolean; + textNotification: string; + typeNotification: string; + }; +} + +const initialState: MainState = { + test2: [], + loading: false, + count: 0, + refetch: false, + rolesWidgets: [], + notify: { + showNotification: false, + textNotification: '', + typeNotification: 'warn', + }, +}; + +export const fetch = createAsyncThunk('test2/fetch', async (data: any) => { + const { id, query } = data; + const result = await axios.get(`test2${query || (id ? `/${id}` : '')}`); + return id + ? result.data + : { rows: result.data.rows, count: result.data.count }; +}); + +export const deleteItemsByIds = createAsyncThunk( + 'test2/deleteByIds', + async (data: any, { rejectWithValue }) => { + try { + await axios.post('test2/deleteByIds', { data }); + } catch (error) { + if (!error.response) { + throw error; + } + + return rejectWithValue(error.response.data); + } + }, +); + +export const deleteItem = createAsyncThunk( + 'test2/deleteTest2', + async (id: string, { rejectWithValue }) => { + try { + await axios.delete(`test2/${id}`); + } catch (error) { + if (!error.response) { + throw error; + } + + return rejectWithValue(error.response.data); + } + }, +); + +export const create = createAsyncThunk( + 'test2/createTest2', + async (data: any, { rejectWithValue }) => { + try { + const result = await axios.post('test2', { data }); + return result.data; + } catch (error) { + if (!error.response) { + throw error; + } + + return rejectWithValue(error.response.data); + } + }, +); + +export const uploadCsv = createAsyncThunk( + 'test2/uploadCsv', + async (file: File, { rejectWithValue }) => { + try { + const data = new FormData(); + data.append('file', file); + data.append('filename', file.name); + + const result = await axios.post('test2/bulk-import', data, { + headers: { + 'Content-Type': 'multipart/form-data', + }, + }); + + return result.data; + } catch (error) { + if (!error.response) { + throw error; + } + + return rejectWithValue(error.response.data); + } + }, +); + +export const update = createAsyncThunk( + 'test2/updateTest2', + async (payload: any, { rejectWithValue }) => { + try { + const result = await axios.put(`test2/${payload.id}`, { + id: payload.id, + data: payload.data, + }); + return result.data; + } catch (error) { + if (!error.response) { + throw error; + } + + return rejectWithValue(error.response.data); + } + }, +); + +export const test2Slice = createSlice({ + name: 'test2', + initialState, + reducers: { + setRefetch: (state, action: PayloadAction) => { + state.refetch = action.payload; + }, + }, + extraReducers: (builder) => { + builder.addCase(fetch.pending, (state) => { + state.loading = true; + resetNotify(state); + }); + builder.addCase(fetch.rejected, (state, action) => { + state.loading = false; + rejectNotify(state, action); + }); + + builder.addCase(fetch.fulfilled, (state, action) => { + if (action.payload.rows && action.payload.count >= 0) { + state.test2 = action.payload.rows; + state.count = action.payload.count; + } else { + state.test2 = action.payload; + } + state.loading = false; + }); + + builder.addCase(deleteItemsByIds.pending, (state) => { + state.loading = true; + resetNotify(state); + }); + + builder.addCase(deleteItemsByIds.fulfilled, (state) => { + state.loading = false; + fulfilledNotify(state, 'Test2 has been deleted'); + }); + + builder.addCase(deleteItemsByIds.rejected, (state, action) => { + state.loading = false; + rejectNotify(state, action); + }); + + builder.addCase(deleteItem.pending, (state) => { + state.loading = true; + resetNotify(state); + }); + + builder.addCase(deleteItem.fulfilled, (state) => { + state.loading = false; + fulfilledNotify(state, `${'Test2'.slice(0, -1)} has been deleted`); + }); + + builder.addCase(deleteItem.rejected, (state, action) => { + state.loading = false; + rejectNotify(state, action); + }); + + builder.addCase(create.pending, (state) => { + state.loading = true; + resetNotify(state); + }); + builder.addCase(create.rejected, (state, action) => { + state.loading = false; + rejectNotify(state, action); + }); + + builder.addCase(create.fulfilled, (state) => { + state.loading = false; + fulfilledNotify(state, `${'Test2'.slice(0, -1)} has been created`); + }); + + builder.addCase(update.pending, (state) => { + state.loading = true; + resetNotify(state); + }); + builder.addCase(update.fulfilled, (state) => { + state.loading = false; + fulfilledNotify(state, `${'Test2'.slice(0, -1)} has been updated`); + }); + builder.addCase(update.rejected, (state, action) => { + state.loading = false; + rejectNotify(state, action); + }); + + builder.addCase(uploadCsv.pending, (state) => { + state.loading = true; + resetNotify(state); + }); + builder.addCase(uploadCsv.fulfilled, (state) => { + state.loading = false; + fulfilledNotify(state, 'Test2 has been uploaded'); + }); + builder.addCase(uploadCsv.rejected, (state, action) => { + state.loading = false; + rejectNotify(state, action); + }); + }, +}); + +// Action creators are generated for each case reducer function +export const { setRefetch } = test2Slice.actions; + +export default test2Slice.reducer;