Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🗨️ feat: Prompts (#3131)
Danny Avila0cd3c83328af
diff --git a/api/cache/getLogStores.js b/api/cache/getLogStores.jsindex b1385f1087..9a7282e25a 100644--- a/api/cache/getLogStores.js+++ b/api/cache/getLogStores.js@@ -25,6 +25,10 @@ const config = isEnabled(USE_REDIS)? new Keyv({ store: keyvRedis }): new Keyv({ namespace: CacheKeys.CONFIG_STORE });+const roles = isEnabled(USE_REDIS)+ ? new Keyv({ store: keyvRedis })+ : new Keyv({ namespace: CacheKeys.ROLES });+const audioRuns = isEnabled(USE_REDIS) // ttl: 30 minutes? new Keyv({ store: keyvRedis, ttl: TEN_MINUTES }): new Keyv({ namespace: CacheKeys.AUDIO_RUNS, ttl: TEN_MINUTES });@@ -46,6 +50,7 @@ const abortKeys = isEnabled(USE_REDIS): new Keyv({ namespace: CacheKeys.ABORT_KEYS, ttl: 600000 });const namespaces = {+ [CacheKeys.ROLES]: roles,[CacheKeys.CONFIG_STORE]: config,pending_req,[ViolationTypes.BAN]: new Keyv({ store: keyvMongo, namespace: CacheKeys.BANS, ttl: duration }),diff --git a/api/models/Categories.js b/api/models/Categories.jsnew file mode 100644index 0000000000..fc2cbdd98b--- /dev/null+++ b/api/models/Categories.js@@ -0,0 +1,61 @@+const { logger } = require('~/config');+// const { Categories } = require('./schema/categories');+const options = [+ {+ label: '',+ value: '',+ },+ {+ label: 'idea',+ value: 'idea',+ },+ {+ label: 'travel',+ value: 'travel',+ },+ {+ label: 'teach_or_explain',+ value: 'teach_or_explain',+ },+ {+ label: 'write',+ value: 'write',+ },+ {+ label: 'shop',+ value: 'shop',+ },+ {+ label: 'code',+ value: 'code',+ },+ {+ label: 'misc',+ value: 'misc',+ },+ {+ label: 'roleplay',+ value: 'roleplay',+ },+ {+ label: 'finance',+ value: 'finance',+ },+];++module.exports = {+ /**+ * Retrieves the categories asynchronously.+ * @returns {Promise<TGetCategoriesResponse>} An array of category objects.+ * @throws {Error} If there is an error retrieving the categories.+ */+ getCategories: async () => {+ try {+ // const categories = await Categories.find();+ return options;+ } catch (error) {+ logger.error('Error getting categories', error);+ return [];+ }+ },+};diff --git a/api/models/Project.js b/api/models/Project.jsnew file mode 100644index 0000000000..e982e34b5d--- /dev/null+++ b/api/models/Project.js@@ -0,0 +1,90 @@+const { model } = require('mongoose');+const projectSchema = require('~/models/schema/projectSchema');++const Project = model('Project', projectSchema);++/**+ * Retrieve a project by ID and convert the found project document to a plain object.+ *+ * @param {string} projectId - The ID of the project to find and return as a plain object.+ * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.+ * @returns {Promise<MongoProject>} A plain object representing the project document, or `null` if no project is found.+ */+const getProjectById = async function (projectId, fieldsToSelect = null) {+ const query = Project.findById(projectId);++ if (fieldsToSelect) {+ query.select(fieldsToSelect);+ }++ return await query.lean();+};++/**+ * Retrieve a project by name and convert the found project document to a plain object.+ * If the project with the given name doesn't exist and the name is "instance", create it and return the lean version.+ *+ * @param {string} projectName - The name of the project to find or create.+ * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.+ * @returns {Promise<MongoProject>} A plain object representing the project document.+ */+const getProjectByName = async function (projectName, fieldsToSelect = null) {+ const query = { name: projectName };+ const update = { $setOnInsert: { name: projectName } };+ const options = {+ new: true,+ upsert: projectName === 'instance',+ lean: true,+ select: fieldsToSelect,+ };++ return await Project.findOneAndUpdate(query, update, options);+};++/**+ * Add an array of prompt group IDs to a project's promptGroupIds array, ensuring uniqueness.+ *+ * @param {string} projectId - The ID of the project to update.+ * @param {string[]} promptGroupIds - The array of prompt group IDs to add to the project.+ * @returns {Promise<MongoProject>} The updated project document.+ */+const addGroupIdsToProject = async function (projectId, promptGroupIds) {+ return await Project.findByIdAndUpdate(+ projectId,+ { $addToSet: { promptGroupIds: { $each: promptGroupIds } } },+ { new: true },+ );+};++/**+ * Remove an array of prompt group IDs from a project's promptGroupIds array.+ *+ * @param {string} projectId - The ID of the project to update.+ * @param {string[]} promptGroupIds - The array of prompt group IDs to remove from the project.+ * @returns {Promise<MongoProject>} The updated project document.+ */+const removeGroupIdsFromProject = async function (projectId, promptGroupIds) {+ return await Project.findByIdAndUpdate(+ projectId,+ { $pull: { promptGroupIds: { $in: promptGroupIds } } },+ { new: true },+ );+};++/**+ * Remove a prompt group ID from all projects.+ *+ * @param {string} promptGroupId - The ID of the prompt group to remove from projects.+ * @returns {Promise<void>}+ */+const removeGroupFromAllProjects = async (promptGroupId) => {+ await Project.updateMany({}, { $pull: { promptGroupIds: promptGroupId } });+};++module.exports = {+ getProjectById,+ getProjectByName,+ addGroupIdsToProject,+ removeGroupIdsFromProject,+ removeGroupFromAllProjects,+};diff --git a/api/models/Prompt.js b/api/models/Prompt.jsindex f2759472b6..fbc661addf 100644--- a/api/models/Prompt.js+++ b/api/models/Prompt.js@@ -1,52 +1,435 @@-const mongoose = require('mongoose');+const { ObjectId } = require('mongodb');+const { SystemRoles, SystemCategories } = require('librechat-data-provider');+const {+ getProjectByName,+ addGroupIdsToProject,+ removeGroupIdsFromProject,+ removeGroupFromAllProjects,+} = require('./Project');+const { Prompt, PromptGroup } = require('./schema/promptSchema');const { logger } = require('~/config');-const promptSchema = mongoose.Schema(- {- title: {- type: String,- required: true,+/**+ * Create a pipeline for the aggregation to get prompt groups+ * @param {Object} query+ * @param {number} skip+ * @param {number} limit+ * @returns {[Object]} - The pipeline for the aggregation+ */+const createGroupPipeline = (query, skip, limit) => {+ return [+ { $match: query },+ { $sort: { createdAt: -1 } },+ { $skip: skip },+ { $limit: limit },+ {+ $lookup: {+ from: 'prompts',+ localField: 'productionId',+ foreignField: '_id',+ as: 'productionPrompt',+ },},- prompt: {- type: String,- required: true,+ { $unwind: { path: '$productionPrompt', preserveNullAndEmptyArrays: true } },+ {+ $project: {+ name: 1,+ numberOfGenerations: 1,+ oneliner: 1,+ category: 1,+ projectIds: 1,+ productionId: 1,+ author: 1,+ authorName: 1,+ createdAt: 1,+ updatedAt: 1,+ 'productionPrompt.prompt': 1,+ // 'productionPrompt._id': 1,+ // 'productionPrompt.type': 1,+ },},- category: {- type: String,- },- },- { timestamps: true },-);+ ];+};++/**+ * Get prompt groups with filters+ * @param {Object} req+ * @param {TPromptGroupsWithFilterRequest} filter+ * @returns {Promise<PromptGroupListResponse>}+ */+const getPromptGroups = async (req, filter) => {+ try {+ const { pageNumber = 1, pageSize = 10, name, ...query } = filter;+ if (!query.author) {+ throw new Error('Author is required');+ }-const Prompt = mongoose.models.Prompt || mongoose.model('Prompt', promptSchema);+ let searchShared = true;+ let searchSharedOnly = false;+ if (name) {+ query.name = new RegExp(name, 'i');+ }+ if (!query.category) {+ delete query.category;+ } else if (query.category === SystemCategories.MY_PROMPTS) {+ searchShared = false;+ delete query.category;+ } else if (query.category === SystemCategories.NO_CATEGORY) {+ query.category = '';+ } else if (query.category === SystemCategories.SHARED_PROMPTS) {+ searchSharedOnly = true;+ delete query.category;+ }++ let combinedQuery = query;++ if (searchShared) {+ // const projects = req.user.projects || []; // TODO: handle multiple projects+ const project = await getProjectByName('instance', 'promptGroupIds');+ if (project && project.promptGroupIds.length > 0) {+ const projectQuery = { _id: { $in: project.promptGroupIds }, ...query };+ delete projectQuery.author;+ combinedQuery = searchSharedOnly ? projectQuery : { $or: [projectQuery, query] };+ }+ }++ const skip = (parseInt(pageNumber, 10) - 1) * parseInt(pageSize, 10);+ const limit = parseInt(pageSize, 10);++ const promptGroupsPipeline = createGroupPipeline(combinedQuery, skip, limit);+ const totalPromptGroupsPipeline = [{ $match: combinedQuery }, { $count: 'total' }];++ const [promptGroupsResults, totalPromptGroupsResults] = await Promise.all([+ PromptGroup.aggregate(promptGroupsPipeline).exec(),+ PromptGroup.aggregate(totalPromptGroupsPipeline).exec(),+ ]);++ const promptGroups = promptGroupsResults;+ const totalPromptGroups =+ totalPromptGroupsResults.length > 0 ? totalPromptGroupsResults[0].total : 0;++ return {+ promptGroups,+ pageNumber: pageNumber.toString(),+ pageSize: pageSize.toString(),+ pages: Math.ceil(totalPromptGroups / pageSize).toString(),+ };+ } catch (error) {+ console.error('Error getting prompt groups', error);+ return { message: 'Error getting prompt groups' };+ }+};module.exports = {- savePrompt: async ({ title, prompt }) => {+ getPromptGroups,+ /**+ * Create a prompt and its respective group+ * @param {TCreatePromptRecord} saveData+ * @returns {Promise<TCreatePromptResponse>}+ */+ createPromptGroup: async (saveData) => {try {- await Prompt.create({- title,- prompt,- });- return { title, prompt };+ const { prompt, group, author, authorName } = saveData;++ let newPromptGroup = await PromptGroup.findOneAndUpdate(+ { ...group, author, authorName, productionId: null },+ { $setOnInsert: { ...group, author, authorName, productionId: null } },+ { new: true, upsert: true },+ )+ .lean()+ .select('-__v')+ .exec();++ const newPrompt = await Prompt.findOneAndUpdate(+ { ...prompt, author, groupId: newPromptGroup._id },+ { $setOnInsert: { ...prompt, author, groupId: newPromptGroup._id } },+ { new: true, upsert: true },+ )+ .lean()+ .select('-__v')+ .exec();++ newPromptGroup = await PromptGroup.findByIdAndUpdate(+ newPromptGroup._id,+ { productionId: newPrompt._id },+ { new: true },+ )+ .lean()+ .select('-__v')+ .exec();++ return {+ prompt: newPrompt,+ group: {+ ...newPromptGroup,+ productionPrompt: { prompt: newPrompt.prompt },+ },+ };+ } catch (error) {+ logger.error('Error saving prompt group', error);+ throw new Error('Error saving prompt group');+ }+ },+ /**+ * Save a prompt+ * @param {TCreatePromptRecord} saveData+ * @returns {Promise<TCreatePromptResponse>}+ */+ savePrompt: async (saveData) => {+ try {+ const { prompt, author } = saveData;+ const newPromptData = {+ ...prompt,+ author,+ };++ /** @type {TPrompt} */+ let newPrompt;+ try {+ newPrompt = await Prompt.create(newPromptData);+ } catch (error) {+ if (error?.message?.includes('groupId_1_version_1')) {+ await Prompt.db.collection('prompts').dropIndex('groupId_1_version_1');+ } else {+ throw error;+ }+ newPrompt = await Prompt.create(newPromptData);+ }++ return { prompt: newPrompt };} catch (error) {logger.error('Error saving prompt', error);- return { prompt: 'Error saving prompt' };+ return { message: 'Error saving prompt' };}},getPrompts: async (filter) => {try {- return await Prompt.find(filter).lean();+ return await Prompt.find(filter).sort({ createdAt: -1 }).lean();} catch (error) {logger.error('Error getting prompts', error);- return { prompt: 'Error getting prompts' };+ return { message: 'Error getting prompts' };}},- deletePrompts: async (filter) => {+ getPrompt: async (filter) => {try {- return await Prompt.deleteMany(filter);+ if (filter.groupId) {+ filter.groupId = new ObjectId(filter.groupId);+ }+ return await Prompt.findOne(filter).lean();+ } catch (error) {+ logger.error('Error getting prompt', error);+ return { message: 'Error getting prompt' };+ }+ },+ /**+ * Get prompt groups with filters+ * @param {TGetRandomPromptsRequest} filter+ * @returns {Promise<TGetRandomPromptsResponse>}+ */+ getRandomPromptGroups: async (filter) => {+ try {+ const result = await PromptGroup.aggregate([+ {+ $match: {+ category: { $ne: '' },+ },+ },+ {+ $group: {+ _id: '$category',+ promptGroup: { $first: '$$ROOT' },+ },+ },+ {+ $replaceRoot: { newRoot: '$promptGroup' },+ },+ {+ $sample: { size: +filter.limit + +filter.skip },+ },+ {+ $skip: +filter.skip,+ },+ {+ $limit: +filter.limit,+ },+ ]);+ return { prompts: result };+ } catch (error) {+ logger.error('Error getting prompt groups', error);+ return { message: 'Error getting prompt groups' };+ }+ },+ getPromptGroupsWithPrompts: async (filter) => {+ try {+ return await PromptGroup.findOne(filter)+ .populate({+ path: 'prompts',+ select: '-_id -__v -user',+ })+ .select('-_id -__v -user')+ .lean();+ } catch (error) {+ logger.error('Error getting prompt groups', error);+ return { message: 'Error getting prompt groups' };+ }+ },+ getPromptGroup: async (filter) => {+ try {+ return await PromptGroup.findOne(filter).lean();+ } catch (error) {+ logger.error('Error getting prompt group', error);+ return { message: 'Error getting prompt group' };+ }+ },+ /**+ * Deletes a prompt and its corresponding prompt group if it is the last prompt in the group.+ *+ * @param {Object} options - The options for deleting the prompt.+ * @param {ObjectId|string} options.promptId - The ID of the prompt to delete.+ * @param {ObjectId|string} options.groupId - The ID of the prompt's group.+ * @param {ObjectId|string} options.author - The ID of the prompt's author.+ * @param {string} options.role - The role of the prompt's author.+ * @return {Promise<TDeletePromptResponse>} An object containing the result of the deletion.+ * If the prompt was deleted successfully, the object will have a property 'prompt' with the value 'Prompt deleted successfully'.+ * If the prompt group was deleted successfully, the object will have a property 'promptGroup' with the message 'Prompt group deleted successfully' and id of the deleted group.+ * If there was an error deleting the prompt, the object will have a property 'message' with the value 'Error deleting prompt'.+ */+ deletePrompt: async ({ promptId, groupId, author, role }) => {+ const query = { _id: promptId, groupId, author };+ if (role === SystemRoles.ADMIN) {+ delete query.author;+ }+ const { deletedCount } = await Prompt.deleteOne(query);+ if (deletedCount === 0) {+ throw new Error('Failed to delete the prompt');+ }++ const remainingPrompts = await Prompt.find({ groupId })+ .select('_id')+ .sort({ createdAt: 1 })+ .lean();++ if (remainingPrompts.length === 0) {+ await PromptGroup.deleteOne({ _id: groupId });+ await removeGroupFromAllProjects(groupId);++ return {+ prompt: 'Prompt deleted successfully',+ promptGroup: {+ message: 'Prompt group deleted successfully',+ id: groupId,+ },+ };+ } else {+ const promptGroup = await PromptGroup.findById(groupId).lean();+ if (promptGroup.productionId.toString() === promptId.toString()) {+ await PromptGroup.updateOne(+ { _id: groupId },+ { productionId: remainingPrompts[remainingPrompts.length - 1]._id },+ );+ }++ return { prompt: 'Prompt deleted successfully' };+ }+ },+ /**+ * Update prompt group+ * @param {Partial<MongoPromptGroup>} filter - Filter to find prompt group+ * @param {Partial<MongoPromptGroup>} data - Data to update+ * @returns {Promise<TUpdatePromptGroupResponse>}+ */+ updatePromptGroup: async (filter, data) => {+ try {+ const updateOps = {};+ if (data.removeProjectIds) {+ for (const projectId of data.removeProjectIds) {+ await removeGroupIdsFromProject(projectId, [filter._id]);+ }++ updateOps.$pull = { projectIds: { $in: data.removeProjectIds } };+ delete data.removeProjectIds;+ }++ if (data.projectIds) {+ for (const projectId of data.projectIds) {+ await addGroupIdsToProject(projectId, [filter._id]);+ }++ updateOps.$addToSet = { projectIds: { $each: data.projectIds } };+ delete data.projectIds;+ }++ const updateData = { ...data, ...updateOps };+ const updatedDoc = await PromptGroup.findOneAndUpdate(filter, updateData, {+ new: true,+ upsert: false,+ });++ if (!updatedDoc) {+ throw new Error('Prompt group not found');+ }++ return updatedDoc;+ } catch (error) {+ logger.error('Error updating prompt group', error);+ return { message: 'Error updating prompt group' };+ }+ },+ /**+ * Function to make a prompt production based on its ID.+ * @param {String} promptId - The ID of the prompt to make production.+ * @returns {Object} The result of the production operation.+ */+ makePromptProduction: async (promptId) => {+ try {+ const prompt = await Prompt.findById(promptId).lean();++ if (!prompt) {+ throw new Error('Prompt not found');+ }++ await PromptGroup.findByIdAndUpdate(+ prompt.groupId,+ { productionId: prompt._id },+ { new: true },+ )+ .lean()+ .exec();++ return {+ message: 'Prompt production made successfully',+ };+ } catch (error) {+ logger.error('Error making prompt production', error);+ return { message: 'Error making prompt production' };+ }+ },+ updatePromptLabels: async (_id, labels) => {+ try {+ const response = await Prompt.updateOne({ _id }, { $set: { labels } });+ if (response.matchedCount === 0) {+ return { message: 'Prompt not found' };+ }+ return { message: 'Prompt labels updated successfully' };+ } catch (error) {+ logger.error('Error updating prompt labels', error);+ return { message: 'Error updating prompt labels' };+ }+ },+ deletePromptGroup: async (_id) => {+ try {+ const response = await PromptGroup.deleteOne({ _id });++ if (response.deletedCount === 0) {+ return { promptGroup: 'Prompt group not found' };+ }++ await Prompt.deleteMany({ groupId: new ObjectId(_id) });+ await removeGroupFromAllProjects(_id);+ return { promptGroup: 'Prompt group deleted successfully' };} catch (error) {- logger.error('Error deleting prompts', error);- return { prompt: 'Error deleting prompts' };+ logger.error('Error deleting prompt group', error);+ return { message: 'Error deleting prompt group' };}},};diff --git a/api/models/Role.js b/api/models/Role.jsnew file mode 100644index 0000000000..af02e5cac4--- /dev/null+++ b/api/models/Role.js@@ -0,0 +1,86 @@+const { SystemRoles, CacheKeys, roleDefaults } = require('librechat-data-provider');+const getLogStores = require('~/cache/getLogStores');+const Role = require('~/models/schema/roleSchema');++/**+ * Retrieve a role by name and convert the found role document to a plain object.+ * If the role with the given name doesn't exist and the name is a system defined role, create it and return the lean version.+ *+ * @param {string} roleName - The name of the role to find or create.+ * @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.+ * @returns {Promise<Object>} A plain object representing the role document.+ */+const getRoleByName = async function (roleName, fieldsToSelect = null) {+ try {+ const cache = getLogStores(CacheKeys.ROLES);+ const cachedRole = await cache.get(roleName);+ if (cachedRole) {+ return cachedRole;+ }+ let query = Role.findOne({ name: roleName });+ if (fieldsToSelect) {+ query = query.select(fieldsToSelect);+ }+ let role = await query.lean().exec();++ if (!role && SystemRoles[roleName]) {+ role = roleDefaults[roleName];+ role = await new Role(role).save();+ await cache.set(roleName, role);+ return role.toObject();+ }+ await cache.set(roleName, role);+ return role;+ } catch (error) {+ throw new Error(`Failed to retrieve or create role: ${error.message}`);+ }+};++/**+ * Update role values by name.+ *+ * @param {string} roleName - The name of the role to update.+ * @param {Partial<TRole>} updates - The fields to update.+ * @returns {Promise<TRole>} Updated role document.+ */+const updateRoleByName = async function (roleName, updates) {+ try {+ const cache = getLogStores(CacheKeys.ROLES);+ const role = await Role.findOneAndUpdate(+ { name: roleName },+ { $set: updates },+ { new: true, lean: true },+ )+ .select('-__v')+ .lean()+ .exec();+ await cache.set(roleName, role);+ return role;+ } catch (error) {+ throw new Error(`Failed to update role: ${error.message}`);+ }+};++/**+ * Initialize default roles in the system.+ * Creates the default roles (ADMIN, USER) if they don't exist in the database.+ *+ * @returns {Promise<void>}+ */+const initializeRoles = async function () {+ const defaultRoles = [SystemRoles.ADMIN, SystemRoles.USER];++ for (const roleName of defaultRoles) {+ let role = await Role.findOne({ name: roleName }).select('name').lean();+ if (!role) {+ role = new Role(roleDefaults[roleName]);+ await role.save();+ }+ }+};++module.exports = {+ getRoleByName,+ initializeRoles,+ updateRoleByName,+};diff --git a/api/models/schema/categories.js b/api/models/schema/categories.jsnew file mode 100644index 0000000000..3167685667--- /dev/null+++ b/api/models/schema/categories.js@@ -0,0 +1,19 @@+const mongoose = require('mongoose');+const Schema = mongoose.Schema;++const categoriesSchema = new Schema({+ label: {+ type: String,+ required: true,+ unique: true,+ },+ value: {+ type: String,+ required: true,+ unique: true,+ },+});++const categories = mongoose.model('categories', categoriesSchema);++module.exports = { Categories: categories };diff --git a/api/models/schema/projectSchema.js b/api/models/schema/projectSchema.jsnew file mode 100644index 0000000000..0e27c6a8f9--- /dev/null+++ b/api/models/schema/projectSchema.js@@ -0,0 +1,30 @@+const { Schema } = require('mongoose');++/**+ * @typedef {Object} MongoProject+ * @property {ObjectId} [_id] - MongoDB Document ID+ * @property {string} name - The name of the project+ * @property {ObjectId[]} promptGroupIds - Array of PromptGroup IDs associated with the project+ * @property {Date} [createdAt] - Date when the project was created (added by timestamps)+ * @property {Date} [updatedAt] - Date when the project was last updated (added by timestamps)+ */++const projectSchema = new Schema(+ {+ name: {+ type: String,+ required: true,+ index: true,+ },+ promptGroupIds: {+ type: [Schema.Types.ObjectId],+ ref: 'PromptGroup',+ default: [],+ },+ },+ {+ timestamps: true,+ },+);++module.exports = projectSchema;diff --git a/api/models/schema/promptSchema.js b/api/models/schema/promptSchema.jsnew file mode 100644index 0000000000..4aeb1deb28--- /dev/null+++ b/api/models/schema/promptSchema.js@@ -0,0 +1,101 @@+const mongoose = require('mongoose');+const Schema = mongoose.Schema;++/**+ * @typedef {Object} MongoPromptGroup+ * @property {ObjectId} [_id] - MongoDB Document ID+ * @property {string} name - The name of the prompt group+ * @property {ObjectId} author - The author of the prompt group+ * @property {ObjectId} [projectId=null] - The project ID of the prompt group+ * @property {ObjectId} [productionId=null] - The project ID of the prompt group+ * @property {string} authorName - The name of the author of the prompt group+ * @property {number} [numberOfGenerations=0] - Number of generations the prompt group has+ * @property {string} [oneliner=''] - Oneliner description of the prompt group+ * @property {string} [category=''] - Category of the prompt group+ * @property {Date} [createdAt] - Date when the prompt group was created (added by timestamps)+ * @property {Date} [updatedAt] - Date when the prompt group was last updated (added by timestamps)+ */++const promptGroupSchema = new Schema(+ {+ name: {+ type: String,+ required: true,+ index: true,+ },+ numberOfGenerations: {+ type: Number,+ default: 0,+ },+ oneliner: {+ type: String,+ default: '',+ },+ category: {+ type: String,+ default: '',+ index: true,+ },+ projectIds: {+ type: [Schema.Types.ObjectId],+ ref: 'Project',+ index: true,+ },+ productionId: {+ type: Schema.Types.ObjectId,+ ref: 'Prompt',+ required: true,+ index: true,+ },+ author: {+ type: Schema.Types.ObjectId,+ ref: 'User',+ required: true,+ index: true,+ },+ authorName: {+ type: String,+ required: true,+ },+ },+ {+ timestamps: true,+ },+);++const PromptGroup = mongoose.model('PromptGroup', promptGroupSchema);++const promptSchema = new Schema(+ {+ groupId: {+ type: Schema.Types.ObjectId,+ ref: 'PromptGroup',+ required: true,+ index: true,+ },+ author: {+ type: Schema.Types.ObjectId,+ ref: 'User',+ required: true,+ },+ prompt: {+ type: String,+ required: true,+ },+ type: {+ type: String,+ enum: ['text', 'chat'],+ required: true,+ },+ },+ {+ timestamps: true,+ },+);++const Prompt = mongoose.model('Prompt', promptSchema);++promptSchema.index({ createdAt: 1, updatedAt: 1 });+promptGroupSchema.index({ createdAt: 1, updatedAt: 1 });++module.exports = { Prompt, PromptGroup };diff --git a/api/models/schema/roleSchema.js b/api/models/schema/roleSchema.jsnew file mode 100644index 0000000000..0387f44ad3--- /dev/null+++ b/api/models/schema/roleSchema.js@@ -0,0 +1,29 @@+const { PermissionTypes, Permissions } = require('librechat-data-provider');+const mongoose = require('mongoose');++const roleSchema = new mongoose.Schema({+ name: {+ type: String,+ required: true,+ unique: true,+ index: true,+ },+ [PermissionTypes.PROMPTS]: {+ [Permissions.SHARED_GLOBAL]: {+ type: Boolean,+ default: false,+ },+ [Permissions.USE]: {+ type: Boolean,+ default: true,+ },+ [Permissions.CREATE]: {+ type: Boolean,+ default: true,+ },+ },+});++const Role = mongoose.model('Role', roleSchema);++module.exports = Role;diff --git a/api/models/schema/userSchema.js b/api/models/schema/userSchema.jsindex f32da48cc9..715d823516 100644--- a/api/models/schema/userSchema.js+++ b/api/models/schema/userSchema.js@@ -1,4 +1,5 @@const mongoose = require('mongoose');+const { SystemRoles } = require('librechat-data-provider');/*** @typedef {Object} MongoSession@@ -78,7 +79,7 @@ const userSchema = mongoose.Schema(},role: {type: String,- default: 'USER',+ default: SystemRoles.USER,},googleId: {type: String,diff --git a/api/package.json b/api/package.jsonindex f06384e594..52413f7ac2 100644--- a/api/package.json+++ b/api/package.json@@ -1,6 +1,6 @@{"name": "@librechat/backend",- "version": "0.7.3",+ "version": "0.7.4-rc1","description": "","scripts": {"start": "echo 'please run this from the root directory'",diff --git a/api/server/controllers/assistants/helpers.js b/api/server/controllers/assistants/helpers.jsindex e91a3dc528..715bb02ed2 100644--- a/api/server/controllers/assistants/helpers.js+++ b/api/server/controllers/assistants/helpers.js@@ -1,8 +1,9 @@const {- EModelEndpoint,CacheKeys,- defaultAssistantsVersion,+ SystemRoles,+ EModelEndpoint,defaultOrderQuery,+ defaultAssistantsVersion,} = require('librechat-data-provider');const {initializeClient: initAzureClient,@@ -227,7 +228,7 @@ const fetchAssistants = async ({ req, res, overrideEndpoint }) => {body = await listAssistantsForAzure({ req, res, version, azureConfig, query });}- if (req.user.role === 'ADMIN') {+ if (req.user.role === SystemRoles.ADMIN) {return body;} else if (!req.app.locals[endpoint]) {return body;diff --git a/api/server/index.js b/api/server/index.jsindex 0aa8cb2760..d99340a1fb 100644--- a/api/server/index.js+++ b/api/server/index.js@@ -81,6 +81,7 @@ const startServer = async () => {app.use('/api/convos', routes.convos);app.use('/api/presets', routes.presets);app.use('/api/prompts', routes.prompts);+ app.use('/api/categories', routes.categories);app.use('/api/tokenizer', routes.tokenizer);app.use('/api/endpoints', routes.endpoints);app.use('/api/balance', routes.balance);@@ -91,6 +92,7 @@ const startServer = async () => {app.use('/api/files', await routes.files.initialize());app.use('/images/', validateImageRequest, routes.staticRoute);app.use('/api/share', routes.share);+ app.use('/api/roles', routes.roles);app.use((req, res) => {res.sendFile(path.join(app.locals.paths.dist, 'index.html'));diff --git a/api/server/middleware/assistants/validateAuthor.js b/api/server/middleware/assistants/validateAuthor.jsindex 749b309cbe..a17448211e 100644--- a/api/server/middleware/assistants/validateAuthor.js+++ b/api/server/middleware/assistants/validateAuthor.js@@ -1,3 +1,4 @@+const { SystemRoles } = require('librechat-data-provider');const { getAssistant } = require('~/models/Assistant');/**@@ -11,7 +12,7 @@ const { getAssistant } = require('~/models/Assistant');* @returns {Promise<void>}*/const validateAuthor = async ({ req, openai, overrideEndpoint, overrideAssistantId }) => {- if (req.user.role === 'ADMIN') {+ if (req.user.role === SystemRoles.ADMIN) {return;}diff --git a/api/server/middleware/canDeleteAccount.js b/api/server/middleware/canDeleteAccount.jsindex 1abfbc9f8c..5f2479fb54 100644--- a/api/server/middleware/canDeleteAccount.js+++ b/api/server/middleware/canDeleteAccount.js@@ -1,3 +1,4 @@+const { SystemRoles } = require('librechat-data-provider');const { isEnabled } = require('~/server/utils');const { logger } = require('~/config');@@ -16,7 +17,7 @@ const { logger } = require('~/config');const canDeleteAccount = async (req, res, next = () => {}) => {const { user } = req;const { ALLOW_ACCOUNT_DELETION = true } = process.env;- if (user?.role === 'ADMIN' || isEnabled(ALLOW_ACCOUNT_DELETION)) {+ if (user?.role === SystemRoles.ADMIN || isEnabled(ALLOW_ACCOUNT_DELETION)) {return next();} else {logger.error(`[User] [Delete Account] [User cannot delete account] [User: ${user?.id}]`);diff --git a/api/server/middleware/index.js b/api/server/middleware/index.jsindex 8d3455af34..75aab961b5 100644--- a/api/server/middleware/index.js+++ b/api/server/middleware/index.js@@ -18,10 +18,12 @@ const limiters = require('./limiters');const uaParser = require('./uaParser');const checkBan = require('./checkBan');const noIndex = require('./noIndex');+const roles = require('./roles');module.exports = {...abortMiddleware,...limiters,+ ...roles,noIndex,checkBan,uaParser,diff --git a/api/server/middleware/roles/checkAdmin.js b/api/server/middleware/roles/checkAdmin.jsnew file mode 100644index 0000000000..3cb93fab53--- /dev/null+++ b/api/server/middleware/roles/checkAdmin.js@@ -0,0 +1,14 @@+const { SystemRoles } = require('librechat-data-provider');++function checkAdmin(req, res, next) {+ try {+ if (req.user.role !== SystemRoles.ADMIN) {+ return res.status(403).json({ message: 'Forbidden' });+ }+ next();+ } catch (error) {+ res.status(500).json({ message: 'Internal Server Error' });+ }+}++module.exports = checkAdmin;diff --git a/api/server/middleware/roles/generateCheckAccess.js b/api/server/middleware/roles/generateCheckAccess.jsnew file mode 100644index 0000000000..900921ef80--- /dev/null+++ b/api/server/middleware/roles/generateCheckAccess.js@@ -0,0 +1,52 @@+const { SystemRoles } = require('librechat-data-provider');+const { getRoleByName } = require('~/models/Role');++/**+ * Middleware to check if a user has one or more required permissions, optionally based on `req.body` properties.+ *+ * @param {PermissionTypes} permissionType - The type of permission to check.+ * @param {Permissions[]} permissions - The list of specific permissions to check.+ * @param {Record<Permissions, string[]>} [bodyProps] - An optional object where keys are permissions and values are arrays of `req.body` properties to check.+ * @returns {Function} Express middleware function.+ */+const generateCheckAccess = (permissionType, permissions, bodyProps = {}) => {+ return async (req, res, next) => {+ try {+ const { user } = req;+ if (!user) {+ return res.status(401).json({ message: 'Authorization required' });+ }++ if (user.role === SystemRoles.ADMIN) {+ return next();+ }++ const role = await getRoleByName(user.role);+ if (role && role[permissionType]) {+ const hasAnyPermission = permissions.some((permission) => {+ if (role[permissionType][permission]) {+ return true;+ }++ if (bodyProps[permission] && req.body) {+ return bodyProps[permission].some((prop) =>+ Object.prototype.hasOwnProperty.call(req.body, prop),+ );+ }++ return false;+ });++ if (hasAnyPermission) {+ return next();+ }+ }++ return res.status(403).json({ message: 'Forbidden: Insufficient permissions' });+ } catch (error) {+ return res.status(500).json({ message: `Server error: ${error.message}` });+ }+ };+};++module.exports = generateCheckAccess;diff --git a/api/server/middleware/roles/index.js b/api/server/middleware/roles/index.jsnew file mode 100644index 0000000000..999c36481e--- /dev/null+++ b/api/server/middleware/roles/index.js@@ -0,0 +1,7 @@+const checkAdmin = require('./checkAdmin');+const generateCheckAccess = require('./generateCheckAccess');++module.exports = {+ checkAdmin,+ generateCheckAccess,+};diff --git a/api/server/routes/categories.js b/api/server/routes/categories.jsnew file mode 100644index 0000000000..da1828b3ce--- /dev/null+++ b/api/server/routes/categories.js@@ -0,0 +1,15 @@+const express = require('express');+const router = express.Router();+const { requireJwtAuth } = require('~/server/middleware');+const { getCategories } = require('~/models/Categories');++router.get('/', requireJwtAuth, async (req, res) => {+ try {+ const categories = await getCategories();+ res.status(200).send(categories);+ } catch (error) {+ res.status(500).send({ message: 'Failed to retrieve categories', error: error.message });+ }+});++module.exports = router;diff --git a/api/server/routes/config.js b/api/server/routes/config.jsindex de3c0d89c9..4c2fd28d24 100644--- a/api/server/routes/config.js+++ b/api/server/routes/config.js@@ -1,6 +1,8 @@const express = require('express');-const { defaultSocialLogins } = require('librechat-data-provider');+const { CacheKeys, defaultSocialLogins } = require('librechat-data-provider');+const { getProjectByName } = require('~/models/Project');const { isEnabled } = require('~/server/utils');+const { getLogStores } = require('~/cache');const { logger } = require('~/config');const router = express.Router();@@ -17,11 +19,20 @@ const publicSharedLinksEnabled =isEnabled(process.env.ALLOW_SHARED_LINKS_PUBLIC));router.get('/', async function (req, res) {+ const cache = getLogStores(CacheKeys.CONFIG_STORE);+ const cachedStartupConfig = await cache.get(CacheKeys.STARTUP_CONFIG);+ if (cachedStartupConfig) {+ res.send(cachedStartupConfig);+ return;+ }+const isBirthday = () => {const today = new Date();return today.getMonth() === 1 && today.getDate() === 11;};+ const instanceProject = await getProjectByName('instance', '_id');+const ldapLoginEnabled =!!process.env.LDAP_URL && !!process.env.LDAP_BIND_DN && !!process.env.LDAP_USER_SEARCH_BASE;try {@@ -63,12 +74,14 @@ router.get('/', async function (req, res) {sharedLinksEnabled,publicSharedLinksEnabled,analyticsGtmId: process.env.ANALYTICS_GTM_ID,+ instanceProjectId: instanceProject._id.toString(),};if (typeof process.env.CUSTOM_FOOTER === 'string') {payload.customFooter = process.env.CUSTOM_FOOTER;}+ await cache.set(CacheKeys.STARTUP_CONFIG, payload);return res.status(200).send(payload);} catch (err) {logger.error('Error in startup config', err);diff --git a/api/server/routes/index.js b/api/server/routes/index.jsindex 958cf0aed5..f8a3d25848 100644--- a/api/server/routes/index.js+++ b/api/server/routes/index.js@@ -19,6 +19,8 @@ const assistants = require('./assistants');const files = require('./files');const staticRoute = require('./static');const share = require('./share');+const categories = require('./categories');+const roles = require('./roles');module.exports = {search,@@ -42,4 +44,6 @@ module.exports = {files,staticRoute,share,+ categories,+ roles,};diff --git a/api/server/routes/prompts.js b/api/server/routes/prompts.jsindex 753feb262a..38a9e51ba1 100644--- a/api/server/routes/prompts.js+++ b/api/server/routes/prompts.js@@ -1,14 +1,218 @@const express = require('express');+const { PermissionTypes, Permissions, SystemRoles } = require('librechat-data-provider');+const {+ getPrompt,+ getPrompts,+ savePrompt,+ deletePrompt,+ getPromptGroup,+ getPromptGroups,+ updatePromptGroup,+ deletePromptGroup,+ createPromptGroup,+ // updatePromptLabels,+ makePromptProduction,+} = require('~/models/Prompt');+const { requireJwtAuth, generateCheckAccess } = require('~/server/middleware');+const { logger } = require('~/config');+const router = express.Router();-const { getPrompts } = require('../../models/Prompt');++const checkPromptAccess = generateCheckAccess(PermissionTypes.PROMPTS, [Permissions.USE]);+const checkPromptCreate = generateCheckAccess(PermissionTypes.PROMPTS, [+ Permissions.USE,+ Permissions.CREATE,+]);+const checkGlobalPromptShare = generateCheckAccess(+ PermissionTypes.PROMPTS,+ [Permissions.USE, Permissions.CREATE],+ {+ [Permissions.SHARED_GLOBAL]: ['projectIds', 'removeProjectIds'],+ },+);++router.use(requireJwtAuth);+router.use(checkPromptAccess);++/**+ * Route to get single prompt group by its ID+ * GET /groups/:groupId+ */+router.get('/groups/:groupId', async (req, res) => {+ let groupId = req.params.groupId;+ const author = req.user.id;++ const query = {+ _id: groupId,+ $or: [{ projectIds: { $exists: true, $ne: [], $not: { $size: 0 } } }, { author }],+ };++ if (req.user.role === SystemRoles.ADMIN) {+ delete query.$or;+ }++ try {+ const group = await getPromptGroup(query);++ if (!group) {+ return res.status(404).send({ message: 'Prompt group not found' });+ }++ res.status(200).send(group);+ } catch (error) {+ logger.error('Error getting prompt group', error);+ res.status(500).send({ message: 'Error getting prompt group' });+ }+});++/**+ * Route to fetch paginated prompt groups with filters+ * GET /groups+ */+router.get('/groups', async (req, res) => {+ try {+ const filter = req.query;+ /* Note: The aggregation requires an ObjectId */+ filter.author = req.user._id;+ const groups = await getPromptGroups(req, filter);+ res.status(200).send(groups);+ } catch (error) {+ logger.error(error);+ res.status(500).send({ error: 'Error getting prompt groups' });+ }+});++/**+ * Updates or creates a prompt + promptGroup+ * @param {object} req+ * @param {TCreatePrompt} req.body+ * @param {Express.Response} res+ */+const createPrompt = async (req, res) => {+ try {+ const { prompt, group } = req.body;+ if (!prompt) {+ return res.status(400).send({ error: 'Prompt is required' });+ }++ const saveData = {+ prompt,+ group,+ author: req.user.id,+ authorName: req.user.name,+ };++ /** @type {TCreatePromptResponse} */+ let result;+ if (group && group.name) {+ result = await createPromptGroup(saveData);+ } else {+ result = await savePrompt(saveData);+ }+ res.status(200).send(result);+ } catch (error) {+ logger.error(error);+ res.status(500).send({ error: 'Error saving prompt' });+ }+};++router.post('/', createPrompt);++/**+ * Updates a prompt group+ * @param {object} req+ * @param {object} req.params - The request parameters+ * @param {string} req.params.groupId - The group ID+ * @param {TUpdatePromptGroupPayload} req.body - The request body+ * @param {Express.Response} res+ */+const patchPromptGroup = async (req, res) => {+ try {+ const { groupId } = req.params;+ const author = req.user.id;+ const filter = { _id: groupId, author };+ if (req.user.role === SystemRoles.ADMIN) {+ delete filter.author;+ }+ const promptGroup = await updatePromptGroup(filter, req.body);+ res.status(200).send(promptGroup);+ } catch (error) {+ logger.error(error);+ res.status(500).send({ error: 'Error updating prompt group' });+ }+};++router.patch('/groups/:groupId', checkGlobalPromptShare, patchPromptGroup);++router.patch('/:promptId/tags/production', checkPromptCreate, async (req, res) => {+ try {+ const { promptId } = req.params;+ const result = await makePromptProduction(promptId);+ res.status(200).send(result);+ } catch (error) {+ logger.error(error);+ res.status(500).send({ error: 'Error updating prompt production' });+ }+});++router.get('/:promptId', async (req, res) => {+ const { promptId } = req.params;+ const author = req.user.id;+ const query = { _id: promptId, author };+ if (req.user.role === SystemRoles.ADMIN) {+ delete query.author;+ }+ const prompt = await getPrompt(query);+ res.status(200).send(prompt);+});router.get('/', async (req, res) => {- let filter = {};- // const { search } = req.body.arg;- // if (!!search) {- // filter = { conversationId };- // }- res.status(200).send(await getPrompts(filter));+ try {+ const author = req.user.id;+ const { groupId } = req.query;+ const query = { groupId, author };+ if (req.user.role === SystemRoles.ADMIN) {+ delete query.author;+ }+ const prompts = await getPrompts(query);+ res.status(200).send(prompts);+ } catch (error) {+ logger.error(error);+ res.status(500).send({ error: 'Error getting prompts' });+ }+});++/**+ * Deletes a prompt+ *+ * @param {Express.Request} req - The request object.+ * @param {TDeletePromptVariables} req.params - The request parameters+ * @param {import('mongoose').ObjectId} req.params.promptId - The prompt ID+ * @param {Express.Response} res - The response object.+ * @return {TDeletePromptResponse} A promise that resolves when the prompt is deleted.+ */+const deletePromptController = async (req, res) => {+ try {+ const { promptId } = req.params;+ const { groupId } = req.query;+ const author = req.user.id;+ const query = { promptId, groupId, author, role: req.user.role };+ if (req.user.role === SystemRoles.ADMIN) {+ delete query.author;+ }+ const result = await deletePrompt(query);+ res.status(200).send(result);+ } catch (error) {+ logger.error(error);+ res.status(500).send({ error: 'Error deleting prompt' });+ }+};++router.delete('/:promptId', checkPromptCreate, deletePromptController);++router.delete('/groups/:groupId', checkPromptCreate, async (req, res) => {+ const { groupId } = req.params;+ res.status(200).send(await deletePromptGroup(groupId));});module.exports = router;diff --git a/api/server/routes/roles.js b/api/server/routes/roles.jsnew file mode 100644index 0000000000..06005ad40e--- /dev/null+++ b/api/server/routes/roles.js@@ -0,0 +1,72 @@+const express = require('express');+const {+ promptPermissionsSchema,+ PermissionTypes,+ roleDefaults,+ SystemRoles,+} = require('librechat-data-provider');+const { checkAdmin, requireJwtAuth } = require('~/server/middleware');+const { updateRoleByName, getRoleByName } = require('~/models/Role');++const router = express.Router();+router.use(requireJwtAuth);++/**+ * GET /api/roles/:roleName+ * Get a specific role by name+ */+router.get('/:roleName', async (req, res) => {+ const { roleName: _r } = req.params;+ // TODO: TEMP, use a better parsing for roleName+ const roleName = _r.toUpperCase();++ if (req.user.role !== SystemRoles.ADMIN && !roleDefaults[roleName]) {+ return res.status(403).send({ message: 'Unauthorized' });+ }++ try {+ const role = await getRoleByName(roleName, '-_id -__v');+ if (!role) {+ return res.status(404).send({ message: 'Role not found' });+ }++ res.status(200).send(role);+ } catch (error) {+ return res.status(500).send({ message: 'Failed to retrieve role', error: error.message });+ }+});++/**+ * PUT /api/roles/:roleName/prompts+ * Update prompt permissions for a specific role+ */+router.put('/:roleName/prompts', checkAdmin, async (req, res) => {+ const { roleName: _r } = req.params;+ // TODO: TEMP, use a better parsing for roleName+ const roleName = _r.toUpperCase();+ /** @type {TRole['PROMPTS']} */+ const updates = req.body;++ try {+ const parsedUpdates = promptPermissionsSchema.partial().parse(updates);++ const role = await getRoleByName(roleName);+ if (!role) {+ return res.status(404).send({ message: 'Role not found' });+ }++ const mergedUpdates = {+ [PermissionTypes.PROMPTS]: {+ ...role[PermissionTypes.PROMPTS],+ ...parsedUpdates,+ },+ };++ const updatedRole = await updateRoleByName(roleName, mergedUpdates);+ res.status(200).send(updatedRole);+ } catch (error) {+ return res.status(400).send({ message: 'Invalid prompt permissions.', error: error.errors });+ }+});++module.exports = router;diff --git a/api/server/services/AppService.js b/api/server/services/AppService.jsindex bbb3880b31..e416d5f6e7 100644--- a/api/server/services/AppService.js+++ b/api/server/services/AppService.js@@ -7,6 +7,7 @@ const handleRateLimits = require('./Config/handleRateLimits');const { loadDefaultInterface } = require('./start/interface');const { azureConfigSetup } = require('./start/azureOpenAI');const { loadAndFormatTools } = require('./ToolService');+const { initializeRoles } = require('~/models/Role');const paths = require('~/config/paths');/**@@ -16,6 +17,7 @@ const paths = require('~/config/paths');* @param {Express.Application} app - The Express application object.*/const AppService = async (app) => {+ await initializeRoles();/** @type {TCustomConfig}*/const config = (await loadCustomConfig()) ?? {};const configDefaults = getConfigDefaults();diff --git a/api/server/services/AppService.spec.js b/api/server/services/AppService.spec.jsindex 6bcf4754e1..cab6d8e2a4 100644--- a/api/server/services/AppService.spec.js+++ b/api/server/services/AppService.spec.js@@ -21,6 +21,9 @@ jest.mock('./Config/loadCustomConfig', () => {jest.mock('./Files/Firebase/initialize', () => ({initializeFirebase: jest.fn(),}));+jest.mock('~/models/Role', () => ({+ initializeRoles: jest.fn(),+}));jest.mock('./ToolService', () => ({loadAndFormatTools: jest.fn().mockReturnValue({ExampleTool: {diff --git a/api/server/services/AuthService.js b/api/server/services/AuthService.jsindex 06dd0d0e72..9efc42b5ce 100644--- a/api/server/services/AuthService.js+++ b/api/server/services/AuthService.js@@ -1,6 +1,6 @@const crypto = require('crypto');const bcrypt = require('bcryptjs');-const { errorsToString } = require('librechat-data-provider');+const { SystemRoles, errorsToString } = require('librechat-data-provider');const {findUser,countUsers,@@ -169,7 +169,7 @@ const registerUser = async (user) => {username,name,avatar: null,- role: isFirstRegisteredUser ? 'ADMIN' : 'USER',+ role: isFirstRegisteredUser ? SystemRoles.ADMIN : SystemRoles.USER,password: bcrypt.hashSync(password, salt),};diff --git a/api/strategies/jwtStrategy.js b/api/strategies/jwtStrategy.jsindex 01eb8da2ca..e65b284950 100644--- a/api/strategies/jwtStrategy.js+++ b/api/strategies/jwtStrategy.js@@ -1,5 +1,6 @@+const { SystemRoles } = require('librechat-data-provider');const { Strategy: JwtStrategy, ExtractJwt } = require('passport-jwt');-const { getUserById } = require('~/models');+const { getUserById, updateUser } = require('~/models');const { logger } = require('~/config');// JWT strategy@@ -14,6 +15,10 @@ const jwtLogin = async () =>const user = await getUserById(payload?.id, '-password -__v');if (user) {user.id = user._id.toString();+ if (!user.role) {+ user.role = SystemRoles.USER;+ await updateUser(user.id, { role: user.role });+ }done(null, user);} else {logger.warn('[jwtLogin] JwtStrategy => no user found: ' + payload?.id);diff --git a/api/typedefs.js b/api/typedefs.jsindex 445ab4f904..cdb2c531f2 100644--- a/api/typedefs.js+++ b/api/typedefs.js@@ -248,6 +248,110 @@* @memberof typedefs*/+/** Prompts */+/**+ * @exports TPrompt+ * @typedef {import('librechat-data-provider').TPrompt} TPrompt+ * @memberof typedefs+ */++/**+ * @exports TPromptGroup+ * @typedef {import('librechat-data-provider').TPromptGroup} TPromptGroup+ * @memberof typedefs+ */++/**+ * @exports TCreatePrompt+ * @typedef {import('librechat-data-provider').TCreatePrompt} TCreatePrompt+ * @memberof typedefs+ */++/**+ * @exports TCreatePromptRecord+ * @typedef {import('librechat-data-provider').TCreatePromptRecord} TCreatePromptRecord+ * @memberof typedefs+ */+/**+ * @exports TCreatePromptResponse+ * @typedef {import('librechat-data-provider').TCreatePromptResponse} TCreatePromptResponse+ * @memberof typedefs+ */+/**+ * @exports TUpdatePromptGroupResponse+ * @typedef {import('librechat-data-provider').TUpdatePromptGroupResponse} TUpdatePromptGroupResponse+ * @memberof typedefs+ */++/**+ * @exports TPromptGroupsWithFilterRequest+ * @typedef {import('librechat-data-provider').TPromptGroupsWithFilterRequest } TPromptGroupsWithFilterRequest+ * @memberof typedefs+ */++/**+ * @exports PromptGroupListResponse+ * @typedef {import('librechat-data-provider').PromptGroupListResponse } PromptGroupListResponse+ * @memberof typedefs+ */++/**+ * @exports TGetCategoriesResponse+ * @typedef {import('librechat-data-provider').TGetCategoriesResponse } TGetCategoriesResponse+ * @memberof typedefs+ */++/**+ * @exports TGetRandomPromptsResponse+ * @typedef {import('librechat-data-provider').TGetRandomPromptsResponse } TGetRandomPromptsResponse+ * @memberof typedefs+ */++/**+ * @exports TGetRandomPromptsRequest+ * @typedef {import('librechat-data-provider').TGetRandomPromptsRequest } TGetRandomPromptsRequest+ * @memberof typedefs+ */++/**+ * @exports TUpdatePromptGroupPayload+ * @typedef {import('librechat-data-provider').TUpdatePromptGroupPayload } TUpdatePromptGroupPayload+ * @memberof typedefs+ */++/**+ * @exports TDeletePromptVariables+ * @typedef {import('librechat-data-provider').TDeletePromptVariables } TDeletePromptVariables+ * @memberof typedefs+ */++/**+ * @exports TDeletePromptResponse+ * @typedef {import('librechat-data-provider').TDeletePromptResponse } TDeletePromptResponse+ * @memberof typedefs+ */++/* Roles */++/**+ * @exports TRole+ * @typedef {import('librechat-data-provider').TRole } TRole+ * @memberof typedefs+ */++/**+ * @exports PermissionTypes+ * @typedef {import('librechat-data-provider').PermissionTypes } PermissionTypes+ * @memberof typedefs+ */++/**+ * @exports Permissions+ * @typedef {import('librechat-data-provider').Permissions } Permissions+ * @memberof typedefs+ */++/** Assistants *//*** @exports Assistant* @typedef {import('librechat-data-provider').Assistant} Assistant@@ -500,6 +604,18 @@* @memberof typedefs*/+/**+ * @exports MongoProject+ * @typedef {import('~/models/schema/projectSchema.js').MongoProject} MongoProject+ * @memberof typedefs+ */++/**+ * @exports MongoPromptGroup+ * @typedef {import('~/models/schema/promptSchema.js').MongoPromptGroup} MongoPromptGroup+ * @memberof typedefs+ */+/*** @exports uploadImageBuffer* @typedef {import('~/server/services/Files/process').uploadImageBuffer} uploadImageBufferdiff --git a/client/package.json b/client/package.jsonindex 3571d94bf8..80c33d85b0 100644--- a/client/package.json+++ b/client/package.json@@ -1,6 +1,6 @@{"name": "@librechat/frontend",- "version": "0.7.3",+ "version": "0.7.4-rc1","description": "","type": "module","scripts": {@@ -66,7 +66,7 @@"image-blob-reduce": "^4.1.0","librechat-data-provider": "*","lodash": "^4.17.21",- "lucide-react": "^0.220.0",+ "lucide-react": "^0.394.0","match-sorter": "^6.3.4","rc-input-number": "^7.4.2","react": "^18.2.0",diff --git a/client/src/Providers/ChatFormContext.tsx b/client/src/Providers/ChatFormContext.tsxnew file mode 100644index 0000000000..33940077bb--- /dev/null+++ b/client/src/Providers/ChatFormContext.tsx@@ -0,0 +1,6 @@+import { createFormContext } from './CustomFormContext';+import type { ChatFormValues } from '~/common';++const { CustomFormProvider, useCustomFormContext } = createFormContext<ChatFormValues>();++export { CustomFormProvider as ChatFormProvider, useCustomFormContext as useChatFormContext };diff --git a/client/src/Providers/CustomFormContext.tsx b/client/src/Providers/CustomFormContext.tsxnew file mode 100644index 0000000000..cb62b0d402--- /dev/null+++ b/client/src/Providers/CustomFormContext.tsx@@ -0,0 +1,56 @@+import React, { createContext, PropsWithChildren, ReactElement, useContext, useMemo } from 'react';+import type {+ Control,+ // FieldErrors,+ FieldValues,+ UseFormReset,+ UseFormRegister,+ UseFormGetValues,+ UseFormHandleSubmit,+ UseFormSetValue,+} from 'react-hook-form';++interface FormContextValue<TFieldValues extends FieldValues> {+ register: UseFormRegister<TFieldValues>;+ control: Control<TFieldValues>;+ // errors: FieldErrors<TFieldValues>;+ getValues: UseFormGetValues<TFieldValues>;+ setValue: UseFormSetValue<TFieldValues>;+ handleSubmit: UseFormHandleSubmit<TFieldValues>;+ reset: UseFormReset<TFieldValues>;+}++function createFormContext<TFieldValues extends FieldValues>() {+ const context = createContext<FormContextValue<TFieldValues> | undefined>(undefined);++ const useCustomFormContext = (): FormContextValue<TFieldValues> => {+ const value = useContext(context);+ if (!value) {+ throw new Error('useCustomFormContext must be used within a CustomFormProvider');+ }+ return value;+ };++ const CustomFormProvider = ({+ register,+ control,+ setValue,+ // errors,+ getValues,+ handleSubmit,+ reset,+ children,+ }: PropsWithChildren<FormContextValue<TFieldValues>>): ReactElement => {+ const value = useMemo(+ () => ({ register, control, getValues, setValue, handleSubmit, reset }),+ [register, control, setValue, getValues, handleSubmit, reset],+ );++ return <context.Provider value={value}>{children}</context.Provider>;+ };++ return { CustomFormProvider, useCustomFormContext };+}++export type { FormContextValue };+export { createFormContext };diff --git a/client/src/Providers/DashboardContext.tsx b/client/src/Providers/DashboardContext.tsxnew file mode 100644index 0000000000..f33a240d00--- /dev/null+++ b/client/src/Providers/DashboardContext.tsx@@ -0,0 +1,7 @@+import { createContext, useContext } from 'react';+type TDashboardContext = {+ prevLocationPath: string;+};++export const DashboardContext = createContext<TDashboardContext>({} as TDashboardContext);+export const useDashboardContext = () => useContext(DashboardContext);diff --git a/client/src/Providers/index.ts b/client/src/Providers/index.tsindex 4085113e1a..836bbde90b 100644--- a/client/src/Providers/index.ts+++ b/client/src/Providers/index.ts@@ -5,5 +5,7 @@ export * from './ShareContext';export * from './ToastContext';export * from './SearchContext';export * from './FileMapContext';+export * from './ChatFormContext';+export * from './DashboardContext';export * from './AssistantsContext';export * from './AssistantsMapContext';diff --git a/client/src/common/types.ts b/client/src/common/types.tsindex d0cc345615..fc515f138a 100644--- a/client/src/common/types.ts+++ b/client/src/common/types.ts@@ -1,8 +1,10 @@-import { FileSources } from 'librechat-data-provider';+import React from 'react';+import { FileSources, SystemRoles } from 'librechat-data-provider';import type * as InputNumberPrimitive from 'rc-input-number';import type { ColumnDef } from '@tanstack/react-table';import type { SetterOrUpdater } from 'recoil';import type {+ TRole,TUser,Action,TPreset,@@ -52,6 +54,8 @@ export type LastSelectedModels = Record<EModelEndpoint, string>;export type LocalizeFunction = (phraseKey: string, ...values: string[]) => string;+export type ChatFormValues = { text: string };+export const mainTextareaId = 'prompt-textarea';export const globalAudioId = 'global-audio';@@ -75,7 +79,7 @@ export type IconMapProps = {export type NavLink = {title: string;label?: string;- icon: LucideIcon;+ icon: LucideIcon | React.FC;Component?: React.ComponentType;onClick?: () => void;variant?: 'default' | 'ghost';@@ -325,6 +329,7 @@ export type TAuthContext = {login: (data: TLoginUser) => void;logout: () => void;setError: React.Dispatch<React.SetStateAction<string | undefined>>;+ roles?: Record<string, TRole | null | undefined>;};export type TUserContext = {@@ -394,7 +399,6 @@ export interface SwitcherProps {endpointKeyProvided: boolean;isCollapsed: boolean;}-export type TLoginLayoutContext = {startupConfig: TStartupConfig | null;startupConfigError: unknown;@@ -404,3 +408,19 @@ export type TLoginLayoutContext = {headerText: string;setHeaderText: React.Dispatch<React.SetStateAction<string>>;};+export type TVectorStore = {+ _id: string;+ object: 'vector_store';+ created_at: string | Date;+ name: string;+ bytes?: number;+ file_counts?: {+ in_progress: number;+ completed: number;+ failed: number;+ cancelled: number;+ total: number;+ };+};++export type TThread = { id: string; createdAt: string };diff --git a/client/src/components/Auth/AuthLayout.tsx b/client/src/components/Auth/AuthLayout.tsxindex c2d4a6303c..6d99a00489 100644--- a/client/src/components/Auth/AuthLayout.tsx+++ b/client/src/components/Auth/AuthLayout.tsx@@ -1,8 +1,8 @@-import { ThemeSelector } from '~/components/ui';import { useLocalize } from '~/hooks';import { BlinkAnimation } from './BlinkAnimation';import { TStartupConfig } from 'librechat-data-provider';import SocialLoginRender from './SocialLoginRender';+import { ThemeSelector } from '~/components/ui';import Footer from './Footer';const ErrorRender = ({ children }: { children: React.ReactNode }) => (diff --git a/client/src/components/Chat/ChatView.tsx b/client/src/components/Chat/ChatView.tsxindex 604c8f1e78..dfae014ea0 100644--- a/client/src/components/Chat/ChatView.tsx+++ b/client/src/components/Chat/ChatView.tsx@@ -1,8 +1,10 @@import { memo } from 'react';import { useRecoilValue } from 'recoil';+import { useForm } from 'react-hook-form';import { useParams } from 'react-router-dom';import { useGetMessagesByConvoId } from 'librechat-data-provider/react-query';-import { ChatContext, useFileMapContext } from '~/Providers';+import type { ChatFormValues } from '~/common';+import { ChatContext, useFileMapContext, ChatFormProvider } from '~/Providers';import MessagesView from './Messages/MessagesView';import { useChatHelpers, useSSE } from '~/hooks';import { Spinner } from '~/components/svg';@@ -30,25 +32,37 @@ function ChatView({ index = 0 }: { index?: number }) {});const chatHelpers = useChatHelpers(index, conversationId);+ const methods = useForm<ChatFormValues>({+ defaultValues: { text: '' },+ });return (- <ChatContext.Provider value={chatHelpers}>- <Presentation useSidePanel={true}>- {isLoading && conversationId !== 'new' ? (- <div className="flex h-screen items-center justify-center">- <Spinner className="opacity-0" />+ <ChatFormProvider+ reset={methods.reset}+ control={methods.control}+ setValue={methods.setValue}+ register={methods.register}+ getValues={methods.getValues}+ handleSubmit={methods.handleSubmit}+ >+ <ChatContext.Provider value={chatHelpers}>+ <Presentation useSidePanel={true}>+ {isLoading && conversationId !== 'new' ? (+ <div className="flex h-screen items-center justify-center">+ <Spinner className="opacity-0" />+ </div>+ ) : messagesTree && messagesTree.length !== 0 ? (+ <MessagesView messagesTree={messagesTree} Header={<Header />} />+ ) : (+ <Landing Header={<Header />} />+ )}+ <div className="w-full border-t-0 pl-0 pt-2 dark:border-white/20 md:w-[calc(100%-.5rem)] md:border-t-0 md:border-transparent md:pl-0 md:pt-0 md:dark:border-transparent">+ <ChatForm index={index} />+ <Footer /></div>- ) : messagesTree && messagesTree.length !== 0 ? (- <MessagesView messagesTree={messagesTree} Header={<Header />} />- ) : (- <Landing Header={<Header />} />- )}- <div className="w-full border-t-0 pl-0 pt-2 dark:border-white/20 md:w-[calc(100%-.5rem)] md:border-t-0 md:border-transparent md:pl-0 md:pt-0 md:dark:border-transparent">- <ChatForm index={index} />- <Footer />- </div>- </Presentation>- </ChatContext.Provider>+ </Presentation>+ </ChatContext.Provider>+ </ChatFormProvider>);}diff --git a/client/src/components/Chat/Input/AudioRecorder.tsx b/client/src/components/Chat/Input/AudioRecorder.tsxindex d4ea2c4a8e..48d89c2c3f 100644--- a/client/src/components/Chat/Input/AudioRecorder.tsx+++ b/client/src/components/Chat/Input/AudioRecorder.tsx@@ -1,8 +1,8 @@import { useEffect } from 'react';-import type { UseFormReturn } from 'react-hook-form';-import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui/';+import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from '~/components/ui';import { ListeningIcon, Spinner } from '~/components/svg';import { useLocalize, useSpeechToText } from '~/hooks';+import { useChatFormContext } from '~/Providers';import { globalAudioId } from '~/common';export default function AudioRecorder({@@ -12,7 +12,7 @@ export default function AudioRecorder({disabled,}: {textAreaRef: React.RefObject<HTMLTextAreaElement>;- methods: UseFormReturn<{ text: string }>;+ methods: ReturnType<typeof useChatFormContext>;ask: (data: { text: string }) => void;disabled: boolean;}) {diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsxindex 4cdd0f0c2c..ea88457ce2 100644--- a/client/src/components/Chat/Input/ChatForm.tsx+++ b/client/src/components/Chat/Input/ChatForm.tsx@@ -1,15 +1,14 @@-import { useForm } from 'react-hook-form';+import { memo, useRef, useMemo } from 'react';import { useRecoilState, useRecoilValue } from 'recoil';-import { memo, useCallback, useRef, useMemo, useState, useEffect } from 'react';import {supportsFiles,mergeFileConfig,isAssistantsEndpoint,fileConfig as defaultFileConfig,} from 'librechat-data-provider';-import { useChatContext, useAssistantsMapContext } from '~/Providers';+import { useChatContext, useAssistantsMapContext, useChatFormContext } from '~/Providers';+import { useRequiresKey, useTextarea, useSubmitMessage } from '~/hooks';import { useAutoSave } from '~/hooks/Input/useAutoSave';-import { useRequiresKey, useTextarea } from '~/hooks';import { TextareaAutosize } from '~/components/ui';import { useGetFileConfig } from '~/data-provider';import { cn, removeFocusRings } from '~/utils';@@ -35,10 +34,6 @@ const ChatForm = ({ index = 0 }) => {);const { requiresKey } = useRequiresKey();- const methods = useForm<{ text: string }>({- defaultValues: { text: '' },- });-const { handlePaste, handleKeyDown, handleKeyUp, handleCompositionStart, handleCompositionEnd } =useTextarea({textAreaRef,@@ -47,7 +42,6 @@ const ChatForm = ({ index = 0 }) => {});const {- ask,files,setFiles,conversation,@@ -56,28 +50,17 @@ const ChatForm = ({ index = 0 }) => {setFilesLoading,handleStopGenerating,} = useChatContext();+ const methods = useChatFormContext();const { clearDraft } = useAutoSave({conversationId: useMemo(() => conversation?.conversationId, [conversation]),textAreaRef,- setValue: methods.setValue,files,setFiles,});const assistantMap = useAssistantsMapContext();-- const submitMessage = useCallback(- (data?: { text: string }) => {- if (!data) {- return console.warn('No data provided to submitMessage');- }- ask({ text: data.text });- methods.reset();- clearDraft();- },- [ask, methods, clearDraft],- );+ const { submitMessage } = useSubmitMessage({ clearDraft });const { endpoint: _endpoint, endpointType } = conversation ?? { endpoint: null };const endpoint = endpointType ?? _endpoint;diff --git a/client/src/components/Chat/Input/Files/FileUpload.tsx b/client/src/components/Chat/Input/Files/FileUpload.tsxindex a16d953ece..506f50c01d 100644--- a/client/src/components/Chat/Input/Files/FileUpload.tsx+++ b/client/src/components/Chat/Input/Files/FileUpload.tsx@@ -66,7 +66,7 @@ const FileUpload: React.FC<FileUploadProps> = ({<labelhtmlFor={`file-upload-${id}`}className={cn(- 'mr-1 flex h-auto cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-medium font-normal transition-colors hover:bg-gray-100 hover:text-green-600 dark:bg-transparent dark:text-gray-300 dark:hover:bg-gray-700 dark:hover:text-green-500',+ 'mr-1 flex h-auto cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-normal transition-colors hover:bg-gray-100 hover:text-green-600 dark:bg-transparent dark:text-gray-300 dark:hover:bg-gray-700 dark:hover:text-green-500',statusColor,containerClassName,)}diff --git a/client/src/components/Chat/Input/Files/SourceIcon.tsx b/client/src/components/Chat/Input/Files/SourceIcon.tsxindex 23cc4d8166..9638936e9e 100644--- a/client/src/components/Chat/Input/Files/SourceIcon.tsx+++ b/client/src/components/Chat/Input/Files/SourceIcon.tsx@@ -7,7 +7,7 @@ const sourceToEndpoint = {[FileSources.azure]: EModelEndpoint.azureOpenAI,};const sourceToClassname = {- [FileSources.openai]: 'bg-black/65',+ [FileSources.openai]: 'bg-white/75 dark:bg-black/65',[FileSources.azure]: 'azure-bg-color opacity-85',};diff --git a/client/src/components/Chat/Input/Files/Table/DataTable.tsx b/client/src/components/Chat/Input/Files/Table/DataTable.tsxindex 91d3bd751d..a61a41ed0e 100644--- a/client/src/components/Chat/Input/Files/Table/DataTable.tsx+++ b/client/src/components/Chat/Input/Files/Table/DataTable.tsx@@ -96,7 +96,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTableProdeleteFiles({ files: filesToDelete as TFile[] });setRowSelection({});}}- className="ml-1 gap-2 dark:hover:bg-gray-750/25 sm:ml-0"+ className="dark:hover:bg-gray-850/25 ml-1 gap-2 sm:ml-0"disabled={!table.getFilteredSelectedRowModel().rows.length || isDeleting}>{isDeleting ? (@@ -121,7 +121,7 @@ export default function DataTable<TData, TValue>({ columns, data }: DataTablePro{/* Filter Menu */}<DropdownMenuContentalign="end"- className="z-[1001] dark:border-gray-700 dark:bg-gray-750"+ className="z-[1001] dark:border-gray-700 dark:bg-gray-850">{table.getAllColumns()diff --git a/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx b/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsxindex 58887f9c58..8c4f93c2d2 100644--- a/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx+++ b/client/src/components/Chat/Input/Files/Table/SortFilterHeader.tsx@@ -57,7 +57,7 @@ export function SortFilterHeader<TData, TValue>({</DropdownMenuTrigger><DropdownMenuContentalign="start"- className="z-[1001] dark:border-gray-700 dark:bg-gray-750"+ className="z-[1001] dark:border-gray-700 dark:bg-gray-850"><DropdownMenuItemonClick={() => column.toggleSorting(false)}diff --git a/client/src/components/Chat/Menus/Presets/PresetItems.tsx b/client/src/components/Chat/Menus/Presets/PresetItems.tsxindex 77d60d33fc..67aa035d4c 100644--- a/client/src/components/Chat/Menus/Presets/PresetItems.tsx+++ b/client/src/components/Chat/Menus/Presets/PresetItems.tsx@@ -78,7 +78,10 @@ const PresetItems: FC<{<><div className="flex w-full flex-col items-center gap-2"><div className="grid w-full items-center gap-2">- <Label htmlFor="chatGptLabel" className="text-left text-sm font-medium">+ <Label+ htmlFor="preset-item-clear-all"+ className="text-left text-sm font-medium"+ >{localize('com_endpoint_presets_clear_warning')}</Label></div>diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsxindex c692fb7e1c..2c919f920a 100644--- a/client/src/components/Chat/Messages/Content/MessageContent.tsx+++ b/client/src/components/Chat/Messages/Content/MessageContent.tsx@@ -21,7 +21,7 @@ export const ErrorMessage = ({return (<Suspensefallback={- <div className="text-message mb-[0.625rem] mt-1 flex min-h-[20px] flex-col items-start gap-3 overflow-x-auto">+ <div className="text-message mb-[0.625rem] flex min-h-[20px] flex-col items-start gap-3 overflow-x-auto"><div className="markdown prose dark:prose-invert light w-full break-words dark:text-gray-100"><div className="absolute"><p className="relative">diff --git a/client/src/components/Chat/PromptCard.tsx b/client/src/components/Chat/PromptCard.tsxnew file mode 100644index 0000000000..cdacc45f9a--- /dev/null+++ b/client/src/components/Chat/PromptCard.tsx@@ -0,0 +1,15 @@+import { TPromptGroup } from 'librechat-data-provider';+import CategoryIcon from '~/components/Prompts/Groups/CategoryIcon';++export default function PromptCard({ promptGroup }: { promptGroup: TPromptGroup }) {+ return (+ <div className="hover:bg-token-main-surface-secondary relative flex w-40 cursor-pointer flex-col gap-2 rounded-2xl border px-3 pb-4 pt-3 text-start align-top text-[15px] shadow-[0_0_2px_0_rgba(0,0,0,0.05),0_4px_6px_0_rgba(0,0,0,0.02)] transition transition-colors duration-300 ease-in-out fade-in hover:bg-slate-100 dark:border-gray-600 dark:hover:bg-gray-700">+ <div className="">+ <CategoryIcon className="size-4" category={promptGroup.category || ''} />+ </div>+ <p className="break-word line-clamp-3 text-balance text-gray-600 dark:text-gray-400">+ {promptGroup?.oneliner || promptGroup?.productionPrompt?.prompt}+ </p>+ </div>+ );+}diff --git a/client/src/components/Chat/PromptLanding.tsx b/client/src/components/Chat/PromptLanding.tsxnew file mode 100644index 0000000000..6e78cdd398--- /dev/null+++ b/client/src/components/Chat/PromptLanding.tsx@@ -0,0 +1,62 @@+import { useGetEndpointsQuery } from 'librechat-data-provider/react-query';+import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';+import type { ReactNode } from 'react';+import { useChatContext, useAssistantsMapContext } from '~/Providers';+import { TooltipProvider, Tooltip } from '~/components/ui';+import ConvoIcon from '~/components/Endpoints/ConvoIcon';+import { getIconEndpoint, cn } from '~/utils';+import Prompts from './Prompts';++export default function Landing({ Header }: { Header?: ReactNode }) {+ const { conversation } = useChatContext();+ const assistantMap = useAssistantsMapContext();+ const { data: endpointsConfig } = useGetEndpointsQuery();++ let { endpoint = '' } = conversation ?? {};+ const { assistant_id = null } = conversation ?? {};++ if (+ endpoint === EModelEndpoint.chatGPTBrowser ||+ endpoint === EModelEndpoint.azureOpenAI ||+ endpoint === EModelEndpoint.gptPlugins+ ) {+ endpoint = EModelEndpoint.openAI;+ }++ const iconURL = conversation?.iconURL;+ endpoint = getIconEndpoint({ endpointsConfig, iconURL, endpoint });++ const isAssistant = isAssistantsEndpoint(endpoint);+ const assistant = isAssistant && assistantMap?.[endpoint]?.[assistant_id ?? ''];+ const assistantName = (assistant && assistant?.name) || '';+ const avatar = (assistant && (assistant?.metadata?.avatar as string)) || '';++ const containerClassName =+ 'shadow-stroke relative flex h-full items-center justify-center rounded-full bg-white text-black';++ return (+ <TooltipProvider delayDuration={50}>+ <Tooltip>+ <div className="relative h-full">+ <div className="absolute left-0 right-0">{Header && Header}</div>+ <div className="flex h-full flex-col items-center justify-center">+ <div className={cn('relative h-12 w-12', assistantName && avatar ? 'mb-0' : 'mb-3')}>+ <ConvoIcon+ conversation={conversation}+ assistantMap={assistantMap}+ endpointsConfig={endpointsConfig}+ containerClassName={containerClassName}+ context="landing"+ className="h-2/3 w-2/3"+ size={41}+ />+ </div>+ <div className="h-3/5">+ <Prompts />+ </div>+ </div>+ </div>+ </Tooltip>+ </TooltipProvider>+ );+}diff --git a/client/src/components/Chat/Prompts.tsx b/client/src/components/Chat/Prompts.tsxnew file mode 100644index 0000000000..f6339d8c1a--- /dev/null+++ b/client/src/components/Chat/Prompts.tsx@@ -0,0 +1,95 @@+import { ChevronLeft, ChevronRight } from 'lucide-react';+import { usePromptGroupsNav } from '~/hooks';+import PromptCard from './PromptCard';+import { Button } from '../ui';++export default function Prompts() {+ const { prevPage, nextPage, hasNextPage, promptGroups, hasPreviousPage, setPageSize, pageSize } =+ usePromptGroupsNav();++ const renderPromptCards = (start = 0, count) => {+ return promptGroups+ .slice(start, count + start)+ .map((promptGroup) => <PromptCard key={promptGroup._id} promptGroup={promptGroup} />);+ };++ const getRows = () => {+ switch (pageSize) {+ case 4:+ return [4];+ case 8:+ return [4, 4];+ case 12:+ return [4, 4, 4];+ default:+ return [];+ }+ };++ const rows = getRows();++ return (+ <div className="mx-3 flex h-full max-w-3xl flex-col items-stretch justify-center gap-4">+ <div className="mt-2 flex justify-end gap-2">+ <Button+ variant={'ghost'}+ onClick={() => setPageSize(4)}+ className={`rounded px-3 py-2 hover:bg-transparent ${+ pageSize === 4 ? 'text-white' : 'text-gray-500 dark:text-gray-500'+ }`}+ >+ 4+ </Button>+ <Button+ variant={'ghost'}+ onClick={() => setPageSize(8)}+ className={`rounded px-3 py-2 hover:bg-transparent ${+ pageSize === 8 ? 'text-white' : 'text-gray-500 dark:text-gray-500'+ }`}+ >+ 8+ </Button>+ <Button+ variant={'ghost'}+ onClick={() => setPageSize(12)}+ className={`rounded p-2 hover:bg-transparent ${+ pageSize === 12 ? 'text-white' : 'text-gray-500 dark:text-gray-500'+ }`}+ >+ 12+ </Button>+ </div>+ <div className="flex h-full flex-col items-start gap-2">+ <div+ className={+ 'flex min-h-[121.1px] min-w-full max-w-3xl flex-col gap-4 overflow-y-auto md:min-w-[22rem] lg:min-w-[43rem]'+ }+ >+ {rows.map((rowSize, index) => (+ <div key={index} className="flex flex-wrap justify-center gap-4">+ {renderPromptCards(rowSize * index, rowSize)}+ </div>+ ))}+ </div>+ <div className="flex w-full justify-between">+ <Button+ variant={'ghost'}+ onClick={prevPage}+ disabled={!hasPreviousPage}+ className="m-0 self-start p-0 hover:bg-transparent"+ >+ <ChevronLeft className={`${hasPreviousPage ? '' : 'text-gray-500'}`} />+ </Button>+ <Button+ variant={'ghost'}+ onClick={nextPage}+ disabled={!hasNextPage}+ className="m-0 self-end p-0 hover:bg-transparent"+ >+ <ChevronRight className={`${hasNextPage ? '' : 'text-gray-500'}`} />+ </Button>+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Conversations/Convo.tsx b/client/src/components/Conversations/Convo.tsxindex a6eaa7eae8..4508e47409 100644--- a/client/src/components/Conversations/Convo.tsx+++ b/client/src/components/Conversations/Convo.tsx@@ -168,7 +168,7 @@ export default function Conversation({ conversation, retainView, toggleNav, isLaclassName={cn(isActiveConvo || isPopoverActive? 'group relative mt-2 flex cursor-pointer items-center gap-2 break-all rounded-lg bg-gray-200 px-2 py-2 active:opacity-50 dark:bg-gray-700'- : 'group relative mt-2 flex grow cursor-pointer items-center gap-2 overflow-hidden whitespace-nowrap break-all rounded-lg rounded-lg px-2 py-2 hover:bg-gray-200 active:opacity-50 dark:hover:bg-gray-700',+ : 'group relative mt-2 flex grow cursor-pointer items-center gap-2 overflow-hidden whitespace-nowrap break-all rounded-lg px-2 py-2 hover:bg-gray-200 active:opacity-50 dark:hover:bg-gray-700',!isActiveConvo && !renaming ? 'peer-hover:bg-gray-200 dark:peer-hover:bg-gray-800' : '',)}title={title}@@ -190,7 +190,7 @@ export default function Conversation({ conversation, retainView, toggleNav, isLa)}/>) : (- <div className="absolute bottom-0 right-0 top-0 w-20 rounded-r-lg bg-gradient-to-l from-gray-50 from-0% to-transparent group-hover:from-gray-200 group-hover:from-60% dark:from-[#181818] dark:group-hover:from-gray-700" />+ <div className="absolute bottom-0 right-0 top-0 w-20 rounded-r-lg bg-gradient-to-l from-gray-50 from-0% to-transparent group-hover:from-gray-200 group-hover:from-60% dark:from-gray-850 dark:group-hover:from-gray-700" />)}</a></div>diff --git a/client/src/components/Conversations/DeleteButton.tsx b/client/src/components/Conversations/DeleteButton.tsxindex 904846ab70..8f037d71b1 100644--- a/client/src/components/Conversations/DeleteButton.tsx+++ b/client/src/components/Conversations/DeleteButton.tsx@@ -84,8 +84,8 @@ export default function DeleteButton({<><div className="flex w-full flex-col items-center gap-2"><div className="grid w-full items-center gap-2">- <Label htmlFor="chatGptLabel" className="text-left text-sm font-medium">- {localize('com_ui_delete_conversation_confirm')} <strong>{title}</strong>+ <Label htmlFor="dialog-confirm-delete" className="text-left text-sm font-medium">+ {localize('com_ui_delete_confirm')} <strong>{title}</strong></Label></div></div>diff --git a/client/src/components/Conversations/HoverToggle.tsx b/client/src/components/Conversations/HoverToggle.tsxindex aa04656c7c..79bfc1222a 100644--- a/client/src/components/Conversations/HoverToggle.tsx+++ b/client/src/components/Conversations/HoverToggle.tsx@@ -8,23 +8,26 @@ const HoverToggle = ({isPopoverActive,setIsPopoverActive,className = 'absolute bottom-0 right-0 top-0',+ onClick,}: {children: React.ReactNode;isActiveConvo: boolean;isPopoverActive: boolean;setIsPopoverActive: (isActive: boolean) => void;className?: string;+ onClick?: (e: React.MouseEvent<HTMLDivElement>) => void;}) => {const setPopoverActive = (value: boolean) => setIsPopoverActive(value);return (<ToggleContext.Provider value={{ isPopoverActive, setPopoverActive }}><div+ onClick={onClick}className={cn(- 'peer items-center gap-1.5 rounded-r-lg from-gray-500 from-gray-900 pl-2 pr-2 dark:text-white',+ 'peer items-center gap-1.5 rounded-r-lg from-gray-900 pl-2 pr-2 dark:text-white',isPopoverActive || isActiveConvo ? 'flex' : 'hidden group-hover:flex',isActiveConvo? 'from-gray-50 from-85% to-transparent group-hover:bg-gradient-to-l group-hover:from-gray-200 dark:from-gray-800 dark:group-hover:from-gray-800'- : 'z-50 from-gray-200 from-gray-50 from-0% to-transparent hover:bg-gradient-to-l hover:from-gray-200 dark:from-gray-750 dark:from-gray-800 dark:hover:from-gray-800',+ : 'z-50 from-gray-50 from-0% to-transparent hover:bg-gradient-to-l hover:from-gray-200 dark:from-gray-800 dark:hover:from-gray-800',isPopoverActive && !isActiveConvo ? 'from-gray-50 dark:from-gray-800' : '',className,)}diff --git a/client/src/components/Conversations/RenameButton.tsx b/client/src/components/Conversations/RenameButton.tsxindex cd00273b1e..327a793303 100644--- a/client/src/components/Conversations/RenameButton.tsx+++ b/client/src/components/Conversations/RenameButton.tsx@@ -6,17 +6,19 @@ import { cn } from '~/utils';interface RenameButtonProps {renaming: boolean;renameHandler: (e: MouseEvent<HTMLButtonElement>) => void;- onRename: (e: MouseEvent<HTMLButtonElement>) => void;+ onRename?: (e: MouseEvent<HTMLButtonElement>) => void;appendLabel?: boolean;className?: string;+ disabled?: boolean;}export default function RenameButton({renaming,- renameHandler,onRename,- appendLabel = false,+ renameHandler,className = '',+ disabled = false,+ appendLabel = false,}: RenameButtonProps): ReactElement {const localize = useLocalize();const handler = renaming ? onRename : renameHandler;@@ -27,6 +29,7 @@ export default function RenameButton({'group m-1.5 flex w-full cursor-pointer items-center gap-2 rounded p-2.5 text-sm hover:bg-gray-200 focus-visible:bg-gray-200 focus-visible:outline-0 radix-disabled:pointer-events-none radix-disabled:opacity-50 dark:hover:bg-gray-600 dark:focus-visible:bg-gray-600',className,)}+ disabled={disabled}onClick={handler}>{renaming ? (diff --git a/client/src/components/Endpoints/SaveAsPresetDialog.tsx b/client/src/components/Endpoints/SaveAsPresetDialog.tsxindex 7f8802e076..f6fed7326b 100644--- a/client/src/components/Endpoints/SaveAsPresetDialog.tsx+++ b/client/src/components/Endpoints/SaveAsPresetDialog.tsx@@ -1,13 +1,7 @@import React, { useEffect, useState } from 'react';import { useCreatePresetMutation } from 'librechat-data-provider/react-query';import type { TEditPresetProps } from '~/common';-import {- cn,- defaultTextPropsLabel,- removeFocusOutlines,- cleanupPreset,- defaultTextProps,-} from '~/utils/';+import { cn, removeFocusOutlines, cleanupPreset, defaultTextProps } from '~/utils/';import DialogTemplate from '~/components/ui/DialogTemplate';import { Dialog, Input, Label } from '~/components/ui/';import { NotificationSeverity } from '~/common';@@ -61,7 +55,7 @@ const SaveAsPresetDialog = ({ open, onOpenChange, preset }: TEditPresetProps) =>main={<div className="flex w-full flex-col items-center gap-2"><div className="grid w-full items-center gap-2">- <Label htmlFor="chatGptLabel" className="text-left text-sm font-medium">+ <Label htmlFor="dialog-preset-name" className="text-left text-sm font-medium">{localize('com_endpoint_preset_name')}</Label><Inputdiff --git a/client/src/components/Files/ActionButton.tsx b/client/src/components/Files/ActionButton.tsxnew file mode 100644index 0000000000..854d152ce2--- /dev/null+++ b/client/src/components/Files/ActionButton.tsx@@ -0,0 +1,20 @@+import React from 'react';+import { CrossIcon } from '~/components/svg';+import { Button } from '~/components/ui';++type ActionButtonProps = {+ onClick: () => void;+};++export default function ActionButton({ onClick }: ActionButtonProps) {+ return (+ <div className="w-32">+ <Button+ className="w-full rounded-md border border-black bg-white p-0 text-black hover:bg-black hover:text-white"+ onClick={onClick}+ >+ Action Button+ </Button>+ </div>+ );+}diff --git a/client/src/components/Files/DeleteIconButton.tsx b/client/src/components/Files/DeleteIconButton.tsxnew file mode 100644index 0000000000..f887487d7a--- /dev/null+++ b/client/src/components/Files/DeleteIconButton.tsx@@ -0,0 +1,17 @@+import React from 'react';+import { CrossIcon, NewTrashIcon } from '~/components/svg';+import { Button } from '~/components/ui';++type DeleteIconButtonProps = {+ onClick: () => void;+};++export default function DeleteIconButton({ onClick }: DeleteIconButtonProps) {+ return (+ <div className="w-fit">+ <Button className="bg-red-400 p-3" onClick={onClick}>+ <NewTrashIcon />+ </Button>+ </div>+ );+}diff --git a/client/src/components/Files/FileDashboardView.tsx b/client/src/components/Files/FileDashboardView.tsxnew file mode 100644index 0000000000..ef1ad758af--- /dev/null+++ b/client/src/components/Files/FileDashboardView.tsx@@ -0,0 +1,39 @@+import React from 'react';+import VectorStoreSidePanel from './VectorStore/VectorStoreSidePanel';+import { Outlet, useNavigate, useParams } from 'react-router-dom';+import { Button } from '../ui';++const FileDashboardView = () => {+ const params = useParams();+ const navigate = useNavigate();+ return (+ <div className="bg-[#f9f9f9] p-0 lg:p-7">+ <div className="ml-3 mt-3 flex flex-row justify-between">+ {params?.vectorStoreId && (+ <Button+ className="block lg:hidden"+ variant={'outline'}+ size={'sm'}+ onClick={() => {+ navigate('/d');+ }}+ >+ Go back+ </Button>+ )}+ </div>+ <div className="flex h-screen max-w-full flex-row divide-x bg-[#f9f9f9]">+ <div className={`w-full lg:w-1/3 ${params.vectorStoreId ? 'hidden lg:block' : ''}`}>+ <VectorStoreSidePanel />+ </div>+ <div className={`w-full lg:w-2/3 ${params.vectorStoreId ? '' : 'hidden lg:block'}`}>+ <div className="m-2 overflow-x-auto">+ <Outlet />+ </div>+ </div>+ </div>+ </div>+ );+};++export default FileDashboardView;diff --git a/client/src/components/Files/FileList/DataTableFile.tsx b/client/src/components/Files/FileList/DataTableFile.tsxnew file mode 100644index 0000000000..50cb855ae9--- /dev/null+++ b/client/src/components/Files/FileList/DataTableFile.tsx@@ -0,0 +1,277 @@+import * as React from 'react';+import { ListFilter } from 'lucide-react';+import {+ flexRender,+ getCoreRowModel,+ getFilteredRowModel,+ getPaginationRowModel,+ getSortedRowModel,+ useReactTable,+} from '@tanstack/react-table';+import type {+ ColumnDef,+ SortingState,+ VisibilityState,+ ColumnFiltersState,+} from '@tanstack/react-table';+import { FileContext } from 'librechat-data-provider';+import type { AugmentedColumnDef } from '~/common';+import type { TFile } from 'librechat-data-provider';+import {+ Button,+ Input,+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+ DropdownMenu,+ DropdownMenuCheckboxItem,+ DropdownMenuContent,+ DropdownMenuTrigger,+} from '~/components/ui';+import { useDeleteFilesFromTable } from '~/hooks/Files';+import { NewTrashIcon, Spinner } from '~/components/svg';+import useLocalize from '~/hooks/useLocalize';+import ActionButton from '../ActionButton';+import UploadFileButton from './UploadFileButton';++interface DataTableProps<TData, TValue> {+ columns: ColumnDef<TData, TValue>[];+ data: TData[];+}++const contextMap = {+ [FileContext.filename]: 'com_ui_name',+ [FileContext.updatedAt]: 'com_ui_date',+ [FileContext.source]: 'com_ui_storage',+ [FileContext.context]: 'com_ui_context',+ [FileContext.bytes]: 'com_ui_size',+};++type Style = { width?: number | string; maxWidth?: number | string; minWidth?: number | string };++export default function DataTableFile<TData, TValue>({+ columns,+ data,+}: DataTableProps<TData, TValue>) {+ const localize = useLocalize();+ const [isDeleting, setIsDeleting] = React.useState(false);+ const [rowSelection, setRowSelection] = React.useState({});+ const [sorting, setSorting] = React.useState<SortingState>([]);+ const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([]);+ const [columnVisibility, setColumnVisibility] = React.useState<VisibilityState>({});+ const { deleteFiles } = useDeleteFilesFromTable(() => setIsDeleting(false));++ const table = useReactTable({+ data,+ columns,+ onSortingChange: setSorting,+ getCoreRowModel: getCoreRowModel(),+ getSortedRowModel: getSortedRowModel(),+ onColumnFiltersChange: setColumnFilters,+ getFilteredRowModel: getFilteredRowModel(),+ onColumnVisibilityChange: setColumnVisibility,+ getPaginationRowModel: getPaginationRowModel(),+ onRowSelectionChange: setRowSelection,+ state: {+ sorting,+ columnFilters,+ columnVisibility,+ rowSelection,+ },+ });++ return (+ <>+ <div className="mt-2 flex flex-col items-start">+ <h2 className="text-lg">+ <strong>Files</strong>+ </h2>+ <div className="mt-3 flex w-full flex-col-reverse justify-between md:flex-row">+ <div className="mt-3 flex w-full flex-row justify-center gap-x-3 md:m-0 md:justify-start">+ <ActionButton+ onClick={() => {+ console.log('click');+ }}+ />+ <Button+ variant="ghost"+ onClick={() => {+ setIsDeleting(true);+ const filesToDelete = table+ .getFilteredSelectedRowModel()+ .rows.map((row) => row.original);+ deleteFiles({ files: filesToDelete as TFile[] });+ setRowSelection({});+ }}+ className="dark:hover:bg-gray-850/25 ml-1 gap-2 sm:ml-0"+ disabled={!table.getFilteredSelectedRowModel().rows.length || isDeleting}+ >+ {isDeleting ? (+ <Spinner className="h-4 w-4" />+ ) : (+ <NewTrashIcon className="h-4 w-4 text-red-400" />+ )}+ {localize('com_ui_delete')}+ </Button>+ </div>+ <div className="flex w-full flex-row gap-x-3">+ {' '}+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="ghost" className="ml-auto">+ <ListFilter className="h-4 w-4" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent+ align="end"+ className="z-[1001] dark:border-gray-700 dark:bg-gray-850"+ >+ {table+ .getAllColumns()+ .filter((column) => column.getCanHide())+ .map((column) => {+ return (+ <DropdownMenuCheckboxItem+ key={column.id}+ className="cursor-pointer capitalize dark:text-white dark:hover:bg-gray-800"+ checked={column.getIsVisible()}+ onCheckedChange={(value) => column.toggleVisibility(!!value)}+ >+ {localize(contextMap[column.id])}+ </DropdownMenuCheckboxItem>+ );+ })}+ </DropdownMenuContent>+ </DropdownMenu>+ <Input+ placeholder={localize('com_files_filter')}+ value={(table.getColumn('filename')?.getFilterValue() as string) ?? ''}+ onChange={(event) => table.getColumn('filename')?.setFilterValue(event.target.value)}+ className="max-w-sm dark:border-gray-500"+ />+ <UploadFileButton+ onClick={() => {+ console.log('click');+ }}+ />+ </div>+ </div>+ </div>+ <div className="relative mt-3 max-h-[25rem] min-h-0 overflow-y-auto rounded-md border border-black/10 pb-4 dark:border-white/10 sm:min-h-[28rem]">+ <Table className="w-full min-w-[600px] border-separate border-spacing-0">+ <TableHeader>+ {table.getHeaderGroups().map((headerGroup) => (+ <TableRow key={headerGroup.id}>+ {headerGroup.headers.map((header, index) => {+ const style: Style = { maxWidth: '32px', minWidth: '125px' };+ if (header.id === 'filename') {+ style.maxWidth = '25%';+ style.width = '25%';+ style.minWidth = '150px';+ }+ if (header.id === 'icon') {+ style.width = '25px';+ style.maxWidth = '25px';+ style.minWidth = '35px';+ }+ if (header.id === 'vectorStores') {+ style.maxWidth = '50%';+ style.width = '50%';+ style.minWidth = '300px';+ }++ if (index === 0 && header.id === 'select') {+ style.width = '25px';+ style.maxWidth = '25px';+ style.minWidth = '35px';+ }+ return (+ <TableHead+ key={header.id}+ className="align-start sticky top-0 rounded-t border-b border-black/10 bg-white px-2 py-1 text-left font-medium text-gray-700 dark:border-white/10 dark:bg-gray-700 dark:text-gray-100 sm:px-4 sm:py-2"+ style={style}+ >+ {header.isPlaceholder+ ? null+ : flexRender(header.column.columnDef.header, header.getContext())}+ </TableHead>+ );+ })}+ </TableRow>+ ))}+ </TableHeader>+ <TableBody>+ {table.getRowModel().rows?.length ? (+ table.getRowModel().rows.map((row) => (+ <TableRow+ key={row.id}+ data-state={row.getIsSelected() && 'selected'}+ className="border-b border-black/10 text-left text-gray-600 dark:border-white/10 dark:text-gray-300 [tr:last-child_&]:border-b-0"+ >+ {row.getVisibleCells().map((cell, index) => {+ const maxWidth =+ (cell.column.columnDef as AugmentedColumnDef<TData, TValue>)?.meta?.size ??+ 'auto';++ const style: Style = {};+ if (cell.column.id === 'filename') {+ style.maxWidth = maxWidth;+ } else if (index === 0) {+ style.maxWidth = '20px';+ }++ return (+ <TableCell+ key={cell.id}+ className="align-start overflow-x-auto px-2 py-1 text-xs sm:px-4 sm:py-2 sm:text-sm [tr[data-disabled=true]_&]:opacity-50"+ style={style}+ >+ {flexRender(cell.column.columnDef.cell, cell.getContext())}+ </TableCell>+ );+ })}+ </TableRow>+ ))+ ) : (+ <TableRow>+ <TableCell colSpan={columns.length} className="h-24 text-center">+ {localize('com_files_no_results')}+ </TableCell>+ </TableRow>+ )}+ </TableBody>+ </Table>+ </div>+ <div className="ml-4 mr-4 mt-4 flex h-auto items-center justify-end space-x-2 py-4 sm:ml-0 sm:mr-0 sm:h-0">+ <div className="text-muted-foreground ml-2 flex-1 text-sm">+ {localize(+ 'com_files_number_selected',+ `${table.getFilteredSelectedRowModel().rows.length}`,+ `${table.getFilteredRowModel().rows.length}`,+ )}+ </div>+ <Button+ className="dark:border-gray-500 dark:hover:bg-gray-600"+ variant="outline"+ size="sm"+ onClick={() => table.previousPage()}+ disabled={!table.getCanPreviousPage()}+ >+ {localize('com_ui_prev')}+ </Button>+ <Button+ className="dark:border-gray-500 dark:hover:bg-gray-600"+ variant="outline"+ size="sm"+ onClick={() => table.nextPage()}+ disabled={!table.getCanNextPage()}+ >+ {localize('com_ui_next')}+ </Button>+ </div>+ </>+ );+}diff --git a/client/src/components/Files/FileList/DataTableFilePreview.tsx b/client/src/components/Files/FileList/DataTableFilePreview.tsxnew file mode 100644index 0000000000..938655c903--- /dev/null+++ b/client/src/components/Files/FileList/DataTableFilePreview.tsx@@ -0,0 +1,81 @@+import React from 'react';+import DataTableFile from './DataTableFile';+import { TVectorStore } from '~/common';+import { files } from '../../Chat/Input/Files/Table';+import { fileTableColumns } from './../FileList/FileTableColumns';++const vectorStoresAttached: TVectorStore[] = [+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+ {+ name: 'vector 1 vector 1',+ created_at: '2022-01-01T10:00:00',+ _id: 'id',+ object: 'vector_store',+ },+];++files.forEach((file) => {+ file['vectorsAttached'] = vectorStoresAttached;+});++export default function DataTableFilePreview() {+ return (+ <div>+ <DataTableFile columns={fileTableColumns} data={files} />+ <div className="mt-5 sm:mt-4" />+ </div>+ );+}diff --git a/client/src/components/Files/FileList/EmptyFilePreview.tsx b/client/src/components/Files/FileList/EmptyFilePreview.tsxnew file mode 100644index 0000000000..092d9c397b--- /dev/null+++ b/client/src/components/Files/FileList/EmptyFilePreview.tsx@@ -0,0 +1,9 @@+import React from 'react';++export default function EmptyFilePreview() {+ return (+ <div className="h-full w-full content-center text-center font-bold">+ Select a file to view details.+ </div>+ );+}diff --git a/client/src/components/Files/FileList/FileList.tsx b/client/src/components/Files/FileList/FileList.tsxnew file mode 100644index 0000000000..a4e2fb2609--- /dev/null+++ b/client/src/components/Files/FileList/FileList.tsx@@ -0,0 +1,26 @@+import type { TFile } from 'librechat-data-provider';+import React from 'react';+import FileListItem from './FileListItem';+import FileListItem2 from './FileListItem2';++type FileListProps = {+ files: TFile[];+ deleteFile: (id: string | undefined) => void;+ attachedVectorStores: { name: string }[];+};++export default function FileList({ files, deleteFile, attachedVectorStores }: FileListProps) {+ return (+ <div className="h-[85vh] overflow-y-auto">+ {files.map((file) => (+ // <FileListItem key={file._id} file={file} deleteFile={deleteFile} width="100%" />+ <FileListItem2+ key={file._id}+ file={file}+ deleteFile={deleteFile}+ attachedVectorStores={attachedVectorStores}+ />+ ))}+ </div>+ );+}diff --git a/client/src/components/Files/FileList/FileListItem.tsx b/client/src/components/Files/FileList/FileListItem.tsxnew file mode 100644index 0000000000..79e625c763--- /dev/null+++ b/client/src/components/Files/FileList/FileListItem.tsx@@ -0,0 +1,33 @@+import type { TFile } from 'librechat-data-provider';+import React from 'react';+import { NewTrashIcon } from '~/components/svg';+import { Button } from '~/components/ui';++type FileListItemProps = {+ file: TFile;+ deleteFile: (id: string | undefined) => void;+ width?: string;+};++export default function FileListItem({ file, deleteFile, width = '400px' }: FileListItemProps) {+ return (+ <div className="w-100 my-3 mr-2 flex cursor-pointer flex-row rounded-md border border-0 bg-white p-4 transition duration-300 ease-in-out hover:bg-slate-200">+ <div className="flex w-1/2 flex-col justify-around align-middle">+ <strong>{file.filename}</strong>+ <p className="text-sm text-gray-500">{file.object}</p>+ </div>+ <div className="w-2/6 text-gray-500">+ <p>({file.bytes / 1000}KB)</p>+ <p className="text-sm">{file.createdAt?.toString()}</p>+ </div>+ <div className="flex w-1/6 justify-around">+ <Button+ className="my-0 ml-3 bg-transparent p-0 text-[#666666] hover:bg-slate-200"+ onClick={() => deleteFile(file._id)}+ >+ <NewTrashIcon className="m-0 p-0" />+ </Button>+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/FileList/FileListItem2.tsx b/client/src/components/Files/FileList/FileListItem2.tsxnew file mode 100644index 0000000000..4941439a80--- /dev/null+++ b/client/src/components/Files/FileList/FileListItem2.tsx@@ -0,0 +1,76 @@+import type { TFile } from 'librechat-data-provider';+import { FileIcon, PlusIcon } from 'lucide-react';+import React from 'react';+import { useNavigate } from 'react-router-dom';+import { DotsIcon, NewTrashIcon } from '~/components/svg';+import { Button } from '~/components/ui';++type FileListItemProps = {+ file: TFile;+ deleteFile: (id: string | undefined) => void;+ attachedVectorStores: { name: string }[];+};++export default function FileListItem2({+ file,+ deleteFile,+ attachedVectorStores,+}: FileListItemProps) {+ const navigate = useNavigate();++ return (+ <div+ onClick={() => {+ navigate('file_id_abcdef');+ }}+ className="w-100 mt-2 flex h-fit cursor-pointer flex-row rounded-md border border-0 bg-white p-4 transition duration-300 ease-in-out hover:bg-slate-200"+ >+ <div className="flex w-10/12 flex-col justify-around md:flex-row">+ <div className="flex w-2/5 flex-row">+ <div className="w-1/4 content-center">+ <FileIcon className="m-0 size-5 p-0" />+ </div>+ <div className="w-3/4 content-center">{file.filename}</div>+ </div>+ <div className="flex w-fit flex-row flex-wrap text-gray-500 md:w-3/5">+ {attachedVectorStores.map((vectorStore, index) => {+ if (index === 4) {+ return (+ <span+ key={index}+ className="ml-2 mt-1 flex flex-row items-center rounded-full bg-[#f5f5f5] px-2 text-xs"+ >+ <PlusIcon className="h-3 w-3" />+ + {attachedVectorStores.length - index} more+ </span>+ );+ }+ if (index > 4) {+ return null;+ }+ return (+ <span+ key={index}+ className="ml-2 mt-1 content-center rounded-full bg-[#f2f8ec] px-2 text-xs text-[#91c561]"+ >+ {vectorStore.name}+ </span>+ );+ })}+ </div>+ </div>+ <div className="mr-0 flex w-2/12 flex-col items-center justify-evenly sm:mr-4 md:flex-row">+ <Button className="w-min content-center bg-transparent text-gray-500 hover:bg-slate-200">+ <DotsIcon className="text-grey-100" />+ </Button>+ <Button+ className="w-min bg-transparent text-[#666666] hover:bg-slate-200"+ onClick={() => deleteFile(file._id)}+ >+ <NewTrashIcon className="" />+ </Button>+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/FileList/FilePreview.tsx b/client/src/components/Files/FileList/FilePreview.tsxnew file mode 100644index 0000000000..5b3b9ebf37--- /dev/null+++ b/client/src/components/Files/FileList/FilePreview.tsx@@ -0,0 +1,180 @@+import { TFile } from 'librechat-data-provider/dist/types';+import React, { useState } from 'react';+import { TThread, TVectorStore } from '~/common';+import { CheckMark, NewTrashIcon } from '~/components/svg';+import { Button } from '~/components/ui';+import DeleteIconButton from '../DeleteIconButton';+import VectorStoreButton from '../VectorStore/VectorStoreButton';+import { CircleIcon, Clock3Icon, InfoIcon } from 'lucide-react';+import { useParams } from 'react-router-dom';++const tempFile: TFile = {+ filename: 'File1.jpg',+ object: 'file',+ bytes: 10000,+ createdAt: '2022-01-01T10:00:00',+ _id: '1',+ type: 'image',+ usage: 12,+ user: 'abc',+ file_id: 'file_id',+ embedded: true,+ filepath: 'filepath',+};++const tempThreads: TThread[] = [+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+ { id: 'thead_id', createdAt: '2022-01-01T10:00:00' },+];++const tempVectorStoresAttached: TVectorStore[] = [+ { name: 'vector 1', created_at: '2022-01-01T10:00:00', _id: 'id', object: 'vector_store' },+ { name: 'vector 1', created_at: '2022-01-01T10:00:00', _id: 'id', object: 'vector_store' },+ { name: 'vector 1', created_at: '2022-01-01T10:00:00', _id: 'id', object: 'vector_store' },+];++export default function FilePreview() {+ const [file, setFile] = useState(tempFile);+ const [threads, setThreads] = useState(tempThreads);+ const [vectorStoresAttached, setVectorStoresAttached] = useState(tempVectorStoresAttached);+ const params = useParams();++ return (+ <div className="m-3 bg-white p-2 sm:p-4 md:p-6 lg:p-10">+ <div className="flex flex-col justify-between md:flex-row">+ <div className="flex flex-col">+ <b className="hidden text-sm md:text-base lg:block lg:text-lg">FILE</b>+ <b className="text-center text-xl md:text-2xl lg:text-left lg:text-3xl">+ {file.filename}+ </b>+ </div>+ <div className="mt-3 flex flex-row gap-x-3 md:mt-0">+ <div>+ <DeleteIconButton+ onClick={() => {+ console.log('click');+ }}+ />+ </div>+ <div className="w-40">+ <VectorStoreButton+ onClick={() => {+ console.log('click');+ }}+ />+ </div>+ </div>+ </div>++ <div className="mt-3 flex flex-col">+ <div className="flex flex-row">+ <span className="flex w-1/2 flex-row items-center sm:w-1/4 md:w-2/5">+ <InfoIcon className="size-4 text-gray-500" />+ File ID+ </span>+ <span className="w-1/2 text-gray-500 sm:w-3/4 md:w-3/5">{file._id}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center sm:w-1/4 md:w-2/5">+ <CircleIcon className="m-0 size-4 p-0 text-gray-500" />+ Status+ </span>+ <div className="w-1/2 sm:w-3/4 md:w-3/5">+ <span className="flex w-20 flex-row items-center justify-evenly rounded-full bg-[#f2f8ec] p-1 text-[#91c561]">+ <CheckMark className="m-0 p-0" />+ <div>{file.object}</div>+ </span>+ </div>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center sm:w-1/4 md:w-2/5">+ <Clock3Icon className="m-0 size-4 p-0 text-gray-500" />+ Purpose+ </span>+ <span className="w-1/2 text-gray-500 sm:w-3/4 md:w-3/5">{file.message}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center sm:w-1/4 md:w-2/5">+ <Clock3Icon className="m-0 size-4 p-0 text-gray-500" />+ Size+ </span>+ <span className="w-1/2 text-gray-500 sm:w-3/4 md:w-3/5">{file.bytes}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center sm:w-1/4 md:w-2/5">+ <Clock3Icon className="m-0 size-4 p-0 text-gray-500" />+ Created At+ </span>+ <span className="w-1/2 text-gray-500 sm:w-3/4 md:w-3/5">+ {file.createdAt?.toString()}+ </span>+ </div>+ </div>++ <div className="mt-10 flex flex-col">+ <div>+ <b className="text-sm md:text-base lg:text-lg">Attached To</b>+ </div>+ <div className="flex flex-col divide-y">+ <div className="mt-2 flex flex-row">+ <div className="w-2/5 text-sm md:w-1/2 md:text-base lg:text-lg xl:w-2/3">+ Vector Stores+ </div>+ <div className="w-3/5 text-sm md:w-1/2 md:text-base lg:text-lg xl:w-1/3">Uploaded</div>+ </div>+ <div>+ {vectorStoresAttached.map((vectors, index) => (+ <div key={index} className="mt-2 flex flex-row">+ <div className="ml-4 w-2/5 content-center md:w-1/2 xl:w-2/3">{vectors.name}</div>+ <div className="flex w-3/5 flex-row md:w-1/2 xl:w-1/3">+ <div className="content-center text-nowrap">{vectors.created_at.toString()}</div>+ <Button+ className="m-0 ml-3 h-full bg-transparent p-0 text-[#666666] hover:bg-slate-200"+ onClick={() => {+ console.log('Remove from vector store');+ }}+ variant={'ghost'}+ >+ <NewTrashIcon className="m-0 p-0" />+ </Button>+ </div>+ </div>+ ))}+ </div>+ </div>+ </div>++ <div className="mt-10 flex flex-col">+ <div className="flex flex-col divide-y">+ <div className="flex flex-row">+ <div className="w-2/5 text-sm md:w-1/2 md:text-base lg:text-lg xl:w-2/3">Threads</div>+ <div className="w-3/5 text-sm md:w-1/2 md:text-base lg:text-lg xl:w-1/3">Uploaded</div>+ </div>+ <div>+ {threads.map((thread, index) => (+ <div key={index} className="mt-2 flex flex-row">+ <div className="ml-4 w-2/5 content-center md:w-1/2 xl:w-2/3">ID: {thread.id}</div>+ <div className="flex w-3/5 flex-row md:w-1/2 xl:w-1/3">+ <div className="content-center text-nowrap">{thread.createdAt}</div>+ <Button+ className="m-0 ml-3 h-full bg-transparent p-0 text-[#666666] hover:bg-slate-200"+ onClick={() => {+ console.log('Remove from thread');+ }}+ >+ <NewTrashIcon className="m-0 p-0" />+ </Button>+ </div>+ </div>+ ))}+ </div>+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/FileList/FileSidePanel.tsx b/client/src/components/Files/FileList/FileSidePanel.tsxnew file mode 100644index 0000000000..cd0da48a78--- /dev/null+++ b/client/src/components/Files/FileList/FileSidePanel.tsx@@ -0,0 +1,187 @@+import React from 'react';+import FileList from './FileList';+import { TFile } from 'librechat-data-provider/dist/types';+import FilesSectionSelector from '../FilesSectionSelector';+import { Button, Input } from '~/components/ui';+import { ListFilter } from 'lucide-react';+import UploadFileButton from './UploadFileButton';+import { useLocalize } from '~/hooks';++const fakeFiles = [+ {+ filename: 'File1.jpg',+ object: 'Description 1',+ bytes: 10000,+ createdAt: '2022-01-01T10:00:00',+ _id: '1',+ },+ {+ filename: 'File2.jpg',+ object: 'Description 2',+ bytes: 15000,+ createdAt: '2022-01-02T15:30:00',+ _id: '2',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+ {+ filename: 'File3.jpg',+ object: 'Description 3',+ bytes: 20000,+ createdAt: '2022-01-03T09:45:00',+ _id: '3',+ },+];++const attachedVectorStores = [+ { name: 'VectorStore1' },+ { name: 'VectorStore2' },+ { name: 'VectorStore3' },+ { name: 'VectorStore3' },+ { name: 'VectorStore3' },+ { name: 'VectorStore3' },+ { name: 'VectorStore3' },+ { name: 'VectorStore3' },+ { name: 'VectorStore3' },+];++export default function FileSidePanel() {+ const localize = useLocalize();+ const deleteFile = (id: string | undefined) => {+ // Define delete functionality here+ console.log(`Deleting File with id: ${id}`);+ };++ return (+ <div className="w-30">+ <h2 className="m-3 text-lg">+ <strong>Files</strong>+ </h2>+ <div className="m-3 mt-2 flex w-full flex-row justify-between gap-x-2 lg:m-0">+ <div className="flex w-2/3 flex-row">+ <Button variant="ghost" className="m-0 mr-2 p-0">+ <ListFilter className="h-4 w-4" />+ </Button>+ <Input+ placeholder={localize('com_files_filter')}+ value={''}+ onChange={() => {+ console.log('changed');+ }}+ className="max-w-sm dark:border-gray-500"+ />+ </div>+ <div className="w-1/3">+ <UploadFileButton+ onClick={() => {+ console.log('Upload');+ }}+ />+ </div>+ </div>+ <div className="mt-3">+ <FileList+ files={fakeFiles as TFile[]}+ deleteFile={deleteFile}+ attachedVectorStores={attachedVectorStores}+ />+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/FileList/FileTableColumns.tsx b/client/src/components/Files/FileList/FileTableColumns.tsxnew file mode 100644index 0000000000..6421cd8ec6--- /dev/null+++ b/client/src/components/Files/FileList/FileTableColumns.tsx@@ -0,0 +1,123 @@+/* eslint-disable react-hooks/rules-of-hooks */+import { FileSources, FileContext } from 'librechat-data-provider';+import type { ColumnDef } from '@tanstack/react-table';+import type { TFile } from 'librechat-data-provider';+import { CrossIcon, DotsIcon } from '~/components/svg';+import { Button, Checkbox } from '~/components/ui';+import { formatDate, getFileType } from '~/utils';+import useLocalize from '~/hooks/useLocalize';+import FileIcon from '~/components/svg/Files/FileIcon';+import { PlusIcon } from 'lucide-react';++export const fileTableColumns: ColumnDef<TFile>[] = [+ {+ id: 'select',+ header: ({ table }) => {+ return (+ <Checkbox+ checked={+ table.getIsAllPageRowsSelected() ||+ (table.getIsSomePageRowsSelected() && 'indeterminate')+ }+ onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}+ aria-label="Select all"+ className="flex"+ />+ );+ },+ cell: ({ row }) => {+ return (+ <Checkbox+ checked={row.getIsSelected()}+ onCheckedChange={(value) => row.toggleSelected(!!value)}+ aria-label="Select row"+ className="flex"+ />+ );+ },+ enableSorting: false,+ enableHiding: false,+ },+ {+ meta: {+ size: '50px',+ },+ accessorKey: 'icon',+ header: () => {+ return 'Icon';+ },+ cell: ({ row }) => {+ const file = row.original;+ return <FileIcon file={file} fileType={getFileType(file.type)} />;+ },+ },+ {+ meta: {+ size: '150px',+ },+ accessorKey: 'filename',+ header: ({ column }) => {+ const localize = useLocalize();+ return <>{localize('com_ui_name')}</>;+ },+ cell: ({ row }) => {+ const file = row.original;+ return <span className="self-center truncate">{file.filename}</span>;+ },+ },+ {+ accessorKey: 'vectorStores',+ header: () => {+ return 'Vector Stores';+ },+ cell: ({ row }) => {+ const { vectorsAttached: attachedVectorStores } = row.original;+ return (+ <>+ {attachedVectorStores.map((vectorStore, index) => {+ if (index === 4)+ {return (+ <span+ key={index}+ className="ml-2 mt-2 flex w-fit flex-row items-center rounded-full bg-[#f5f5f5] px-2 text-gray-500"+ >+ <PlusIcon className="h-3 w-3" />+ + {attachedVectorStores.length - index} more+ </span>+ );}+ if (index > 4) {return null;}+ return (+ <span key={index} className="ml-2 mt-2 rounded-full bg-[#f2f8ec] px-2 text-[#91c561]">+ {vectorStore.name}+ </span>+ );+ })}+ </>+ );+ },+ },+ {+ accessorKey: 'updatedAt',+ header: () => {+ const localize = useLocalize();+ return 'Modified';+ },+ cell: ({ row }) => formatDate(row.original.updatedAt),+ },+ {+ accessorKey: 'actions',+ header: () => {+ return 'Actions';+ },+ cell: ({ row }) => {+ return (+ <>+ <Button className="w-min content-center bg-transparent text-gray-500 hover:bg-slate-200">+ <DotsIcon className="text-grey-100 m-0 size-5 p-0" />+ </Button>+ </>+ );+ },+ },+];diff --git a/client/src/components/Files/FileList/UploadFileButton.tsx b/client/src/components/Files/FileList/UploadFileButton.tsxnew file mode 100644index 0000000000..e2b8acdd09--- /dev/null+++ b/client/src/components/Files/FileList/UploadFileButton.tsx@@ -0,0 +1,18 @@+import { PlusIcon } from 'lucide-react';+import React from 'react';+import { Button } from '~/components/ui';++type UploadFileProps = {+ onClick: () => void;+};++export default function UploadFileButton({ onClick }: UploadFileProps) {+ return (+ <div className="w-full">+ <Button className="w-full bg-black px-3 text-white" onClick={onClick}>+ <PlusIcon className="h-4 w-4 font-bold" />+ <span className="text-nowrap">Upload New File</span>+ </Button>+ </div>+ );+}diff --git a/client/src/components/Files/FileList/UploadFileModal.tsx b/client/src/components/Files/FileList/UploadFileModal.tsxnew file mode 100644index 0000000000..4e2e31e278--- /dev/null+++ b/client/src/components/Files/FileList/UploadFileModal.tsx@@ -0,0 +1,88 @@+import React, { useState, ChangeEvent } from 'react';+import AttachFile from '~/components/Chat/Input/Files/AttachFile';+import { Button, Dialog, DialogContent, DialogHeader, DialogTitle, Input } from '~/components/ui';+import { useLocalize } from '~/hooks';+import { cn } from '~/utils';++const UploadFileModal = ({ open, onOpenChange }) => {+ const localize = useLocalize();+ const [file, setFile] = useState<File | null>(null);++ const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {+ if (e.target.files && e.target.files.length > 0) {+ const selectedFile = e.target.files[0];+ setFile(selectedFile);+ }+ };++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent+ className={cn(+ 'w-11/12 overflow-x-auto p-3 shadow-2xl dark:bg-gray-700 dark:text-white lg:w-2/3 xl:w-2/5',+ )}+ >+ <DialogHeader>+ <DialogTitle className="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">+ Upoad a File+ </DialogTitle>+ </DialogHeader>+ <div className="flex w-full flex-col p-0 sm:p-6 sm:pb-0 sm:pt-4">+ <div className="flex w-full flex-row">+ <div className="hidden w-1/5 sm:block">+ <img />+ </div>+ <div className="flex w-full flex-col text-center sm:w-4/5 sm:text-left">+ <div className="italic">Please upload square file, size less than 100KB</div>+ <div className="mt-4 flex w-full flex-row items-center bg-[#f9f9f9] p-2">+ <div className="w-1/2 sm:w-1/3">+ <Button>Choose File</Button>+ </div>+ <div className="w-1/2 sm:w-1/3"> No File Chosen</div>+ </div>+ </div>+ </div>+ <div className="mt-3 flex w-full flex-col">+ <label htmlFor="name">Name</label>+ <label className="hidden text-[#808080] sm:block">The name of the uploaded file</label>+ <Input type="text" id="name" name="name" placeholder="Name" />+ </div>++ <div className="mt-3 flex w-full flex-col">+ <label htmlFor="purpose">Purpose</label>+ <label className="hidden text-[#808080] sm:block">+ The purpose of the uploaded file+ </label>+ <Input type="text" id="purpose" name="purpose" placeholder="Purpose" />+ </div>++ <div className="mt-3 flex w-full flex-row justify-between">+ <div className="hidden w-1/3 sm:block">+ <span className="font-bold">Learn about file purpose</span>+ </div>+ <div className="flex w-full flex-row justify-evenly sm:w-1/3">+ <Button+ className="mr-3 w-full rounded-md border border-black bg-white p-0 text-black hover:bg-white"+ onClick={() => {+ onOpenChange(false);+ }}+ >+ Cancel+ </Button>+ <Button+ className="w-full rounded-md border border-black bg-black p-0 text-white"+ onClick={() => {+ console.log('upload file');+ }}+ >+ Upload+ </Button>+ </div>+ </div>+ </div>+ </DialogContent>+ </Dialog>+ );+};++export default UploadFileModal;diff --git a/client/src/components/Files/FilesListView.tsx b/client/src/components/Files/FilesListView.tsxnew file mode 100644index 0000000000..c564f33036--- /dev/null+++ b/client/src/components/Files/FilesListView.tsx@@ -0,0 +1,45 @@+import React from 'react';+import FileSidePanel from './FileList/FileSidePanel';+import { Outlet, useNavigate, useParams } from 'react-router-dom';+import FilesSectionSelector from './FilesSectionSelector';+import { Button } from '../ui';++export default function FilesListView() {+ const params = useParams();+ const navigate = useNavigate();+ return (+ <div className="bg-[#f9f9f9] p-0 lg:p-7">+ <div className="m-4 flex w-full flex-row justify-between md:m-2">+ <FilesSectionSelector />+ {params?.fileId && (+ <Button+ className="block lg:hidden"+ variant={'outline'}+ size={'sm'}+ onClick={() => {+ navigate('/d/files');+ }}+ >+ Go back+ </Button>+ )}+ </div>+ <div className="flex w-full flex-row divide-x">+ <div+ className={`mr-2 w-full xl:w-1/3 ${+ params.fileId ? 'hidden w-1/2 lg:block lg:w-1/2' : 'md:w-full'+ }`}+ >+ <FileSidePanel />+ </div>+ <div+ className={`h-[85vh] w-full overflow-y-auto xl:w-2/3 ${+ params.fileId ? 'lg:w-1/2' : 'hidden md:w-1/2 lg:block'+ }`}+ >+ <Outlet />+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/FilesSectionSelector.tsx b/client/src/components/Files/FilesSectionSelector.tsxnew file mode 100644index 0000000000..dc7fccf9b5--- /dev/null+++ b/client/src/components/Files/FilesSectionSelector.tsx@@ -0,0 +1,48 @@+import React, { useState } from 'react';+import { Button } from '../ui';+import { useLocation, useNavigate } from 'react-router-dom';++export default function FilesSectionSelector() {+ const navigate = useNavigate();+ const location = useLocation();+ let selectedPage = '/vector-stores';++ if (location.pathname.includes('vector-stores')) {+ selectedPage = '/vector-stores';+ }+ if (location.pathname.includes('files')) {+ selectedPage = '/files';+ }++ const darkButton = { backgroundColor: 'black', color: 'white' };+ const lightButton = { backgroundColor: '#f9f9f9', color: 'black' };++ return (+ <div className="flex h-12 w-52 flex-row justify-center rounded border bg-white p-1">+ <div className="flex w-2/3 items-center pr-1">+ <Button+ className="w-full rounded rounded-lg border"+ style={selectedPage === '/vector-stores' ? darkButton : lightButton}+ onClick={() => {+ selectedPage = '/vector-stores';+ navigate('/d/vector-stores');+ }}+ >+ Vector Stores+ </Button>+ </div>+ <div className="flex w-1/3 items-center">+ <Button+ className="w-full rounded rounded-lg border"+ style={selectedPage === '/files' ? darkButton : lightButton}+ onClick={() => {+ selectedPage = '/files';+ navigate('/d/files');+ }}+ >+ Files+ </Button>+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/VectorStore/EmptyVectorStorePreview.tsx b/client/src/components/Files/VectorStore/EmptyVectorStorePreview.tsxnew file mode 100644index 0000000000..032ea2164f--- /dev/null+++ b/client/src/components/Files/VectorStore/EmptyVectorStorePreview.tsx@@ -0,0 +1,9 @@+import React from 'react';++export default function EmptyVectorStorePreview() {+ return (+ <div className="h-full w-full content-center text-center font-bold">+ Select a vector store to view details.+ </div>+ );+}diff --git a/client/src/components/Files/VectorStore/VectorStoreButton.tsx b/client/src/components/Files/VectorStore/VectorStoreButton.tsxnew file mode 100644index 0000000000..dc3e34c4f2--- /dev/null+++ b/client/src/components/Files/VectorStore/VectorStoreButton.tsx@@ -0,0 +1,18 @@+import { PlusIcon } from 'lucide-react';+import React from 'react';+import { Button } from '~/components/ui';++type VectorStoreButtonProps = {+ onClick: () => void;+};++export default function VectorStoreButton({ onClick }: VectorStoreButtonProps) {+ return (+ <div className="w-full">+ <Button className="w-full bg-black p-0 text-white" onClick={onClick}>+ <PlusIcon className="h-4 w-4 font-bold" />+ <span className="text-nowrap">Add Store</span>+ </Button>+ </div>+ );+}diff --git a/client/src/components/Files/VectorStore/VectorStoreFilter.tsx b/client/src/components/Files/VectorStore/VectorStoreFilter.tsxnew file mode 100644index 0000000000..396491bc07--- /dev/null+++ b/client/src/components/Files/VectorStore/VectorStoreFilter.tsx@@ -0,0 +1,7 @@+import React from 'react';++const VectorStoreFilter = () => {+ return <div>VectorStoreFilter</div>;+};++export default VectorStoreFilter;diff --git a/client/src/components/Files/VectorStore/VectorStoreList.tsx b/client/src/components/Files/VectorStore/VectorStoreList.tsxnew file mode 100644index 0000000000..c081e7989a--- /dev/null+++ b/client/src/components/Files/VectorStore/VectorStoreList.tsx@@ -0,0 +1,22 @@+import React from 'react';+import VectorStoreListItem from './VectorStoreListItem';+import { TVectorStore } from '~/common';++type VectorStoreListProps = {+ vectorStores: TVectorStore[];+ deleteVectorStore: (id: string | undefined) => void;+};++export default function VectorStoreList({ vectorStores, deleteVectorStore }: VectorStoreListProps) {+ return (+ <div>+ {vectorStores.map((vectorStore, index) => (+ <VectorStoreListItem+ key={index}+ vectorStore={vectorStore}+ deleteVectorStore={deleteVectorStore}+ />+ ))}+ </div>+ );+}diff --git a/client/src/components/Files/VectorStore/VectorStoreListItem.tsx b/client/src/components/Files/VectorStore/VectorStoreListItem.tsxnew file mode 100644index 0000000000..7dae80f541--- /dev/null+++ b/client/src/components/Files/VectorStore/VectorStoreListItem.tsx@@ -0,0 +1,47 @@+import React from 'react';+import { useNavigate } from 'react-router-dom';+import { TVectorStore } from '~/common';+import { DotsIcon, NewTrashIcon, TrashIcon } from '~/components/svg';+import { Button } from '~/components/ui';++type VectorStoreListItemProps = {+ vectorStore: TVectorStore;+ deleteVectorStore: (id: string) => void;+};++export default function VectorStoreListItem({+ vectorStore,+ deleteVectorStore,+}: VectorStoreListItemProps) {+ const navigate = useNavigate();+ return (+ <div+ onClick={() => {+ navigate('vs_id_abcdef');+ }}+ className="w-100 mt-2 flex cursor-pointer flex-row justify-around rounded-md border border-0 bg-white p-4 transition duration-300 ease-in-out hover:bg-slate-200"+ >+ <div className="flex w-1/2 flex-col justify-around align-middle">+ <strong>{vectorStore.name}</strong>+ <p className="text-sm text-gray-500">{vectorStore.object}</p>+ </div>+ <div className="w-2/6 text-gray-500">+ <p>+ {vectorStore.file_counts.total} Files ({vectorStore.bytes / 1000}KB)+ </p>+ <p className="text-sm">{vectorStore.created_at.toString()}</p>+ </div>+ <div className="flex w-1/6 flex-col justify-around sm:flex-row">+ <Button className="m-0 w-full content-center bg-transparent p-0 text-gray-500 hover:bg-slate-200 sm:w-min">+ <DotsIcon className="text-grey-100 m-0 p-0" />+ </Button>+ <Button+ className="m-0 w-full bg-transparent p-0 text-[#666666] hover:bg-slate-200 sm:w-fit"+ onClick={() => deleteVectorStore(vectorStore._id)}+ >+ <NewTrashIcon className="m-0 p-0" />+ </Button>+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/VectorStore/VectorStorePreview.tsx b/client/src/components/Files/VectorStore/VectorStorePreview.tsxnew file mode 100644index 0000000000..dc9fd22303--- /dev/null+++ b/client/src/components/Files/VectorStore/VectorStorePreview.tsx@@ -0,0 +1,244 @@+import React, { useState } from 'react';+import DeleteIconButton from '../DeleteIconButton';+import { Button } from '~/components/ui';+import { NewTrashIcon } from '~/components/svg';+import { TFile } from 'librechat-data-provider/dist/types';+import UploadFileButton from '../FileList/UploadFileButton';+import UploadFileModal from '../FileList/UploadFileModal';+import { BarChart4Icon, Clock3, FileClock, FileIcon, InfoIcon, PlusIcon } from 'lucide-react';+import { useParams } from 'react-router-dom';++const tempVectorStore = {+ _id: 'vs_NeHK4JidLKJ2qo23dKLLK',+ name: 'Vector Store 1',+ usageThisMonth: '1,000,000',+ bytes: 1000000,+ lastActive: '2022-01-01T10:00:00',+ expirationPolicy: 'Never',+ expires: 'Never',+ createdAt: '2022-01-01T10:00:00',+};+const tempFilesAttached: TFile[] = [+ {+ filename: 'File1.jpg',+ object: 'file',+ bytes: 10000,+ createdAt: '2022-01-01T10:00:00',+ _id: '1',+ type: 'image',+ usage: 12,+ user: 'abc',+ file_id: 'file_id',+ embedded: true,+ filepath: 'filepath',+ },+ {+ filename: 'File1.jpg',+ object: 'file',+ bytes: 10000,+ createdAt: '2022-01-01T10:00:00',+ _id: '1',+ type: 'image',+ usage: 12,+ user: 'abc',+ file_id: 'file_id',+ embedded: true,+ filepath: 'filepath',+ },+ {+ filename: 'File1.jpg',+ object: 'file',+ bytes: 10000,+ createdAt: '2022-01-01T10:00:00',+ _id: '1',+ type: 'image',+ usage: 12,+ user: 'abc',+ file_id: 'file_id',+ embedded: true,+ filepath: 'filepath',+ },+ {+ filename: 'File1.jpg',+ object: 'file',+ bytes: 10000,+ createdAt: '2022-01-01T10:00:00',+ _id: '1',+ type: 'image',+ usage: 12,+ user: 'abc',+ file_id: 'file_id',+ embedded: true,+ filepath: 'filepath',+ },+];+const tempAssistants = [+ {+ id: 'Lorum Ipsum',+ resource: 'Lorum Ipsum',+ },+ {+ id: 'Lorum Ipsum',+ resource: 'Lorum Ipsum',+ },+ {+ id: 'Lorum Ipsum',+ resource: 'Lorum Ipsum',+ },+ {+ id: 'Lorum Ipsum',+ resource: 'Lorum Ipsum',+ },+];++export default function VectorStorePreview() {+ const [open, setOpen] = useState(false);+ const [vectorStore, setVectorStore] = useState(tempVectorStore);+ const [filesAttached, setFilesAttached] = useState(tempFilesAttached);+ const [assistants, setAssistants] = useState(tempAssistants);+ const params = useParams();++ return (+ <div className="m-3 ml-1 mr-7 bg-white p-2 sm:p-4 md:p-6 lg:p-10">+ <div className="flex flex-col justify-between md:flex-row">+ <div className="flex flex-col">+ <b className="hidden text-base md:text-lg lg:block lg:text-xl">VECTOR STORE</b>+ <b className="text-center text-xl md:text-2xl lg:text-left lg:text-3xl">+ {vectorStore.name}+ </b>+ </div>+ <div className="mt-3 flex flex-row gap-x-3 md:mt-0">+ <div>+ <DeleteIconButton+ onClick={() => {+ console.log('click');+ }}+ />+ </div>+ <div>+ <UploadFileButton+ onClick={() => {+ setOpen(true);+ }}+ />+ </div>+ </div>+ </div>++ <div className="mt-3 flex flex-col">+ <div className="flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <InfoIcon className="text-base text-gray-500 md:text-lg lg:text-xl" />+ ID+ </span>+ <span className="w-1/2 break-words text-gray-500 md:w-3/5">{vectorStore._id}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <BarChart4Icon className="text-base text-gray-500 md:text-lg lg:text-xl" />+ Usage this month+ </span>+ <div className="w-1/2 md:w-3/5">+ <p className="text-gray-500">+ <span className="text-[#91c561]">0 KB hours</span>+ Free until end of 2024+ </p>+ </div>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <InfoIcon className="text-base text-gray-500 md:text-lg lg:text-xl" />+ Size+ </span>+ <span className="w-1/2 text-gray-500 md:w-3/5">{vectorStore.bytes} bytes</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <Clock3 className="text-base text-gray-500 md:text-lg lg:text-xl" />+ Last active+ </span>+ <span className="w-1/2 text-gray-500 md:w-3/5">{vectorStore.lastActive}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <InfoIcon className="text-base text-gray-500 md:text-lg lg:text-xl" />+ Expiration policy+ </span>+ <span className="w-1/2 text-gray-500 md:w-3/5">{vectorStore.expirationPolicy}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <FileClock className="text-base text-gray-500 md:text-lg lg:text-xl" />+ Expires+ </span>+ <span className="w-1/2 text-gray-500 md:w-3/5">{vectorStore.expires}</span>+ </div>+ <div className="mt-3 flex flex-row">+ <span className="flex w-1/2 flex-row items-center md:w-2/5">+ <Clock3 className="text-base text-gray-500 md:text-lg lg:text-xl" />+ Created At+ </span>+ <span className="w-1/2 text-gray-500 md:w-3/5">{vectorStore.createdAt?.toString()}</span>+ </div>+ </div>++ <div className="mt-10 flex flex-col">+ <div>+ <b className="text-base md:text-lg lg:text-xl">Files attached</b>+ </div>+ <div className="flex flex-col divide-y">+ <div className="mt-2 flex flex-row">+ <div className="w-1/2 text-base md:text-lg lg:w-2/3 lg:text-xl">File</div>+ <div className="w-1/2 text-base md:text-lg lg:w-1/3 lg:text-xl">Uploaded</div>+ </div>+ <div>+ {filesAttached.map((file, index) => (+ <div key={index} className="my-2 flex h-5 flex-row">+ <div className="lg:w flex w-1/2 flex-row content-center lg:w-2/3">+ <FileIcon className="m-0 size-5 p-0" />+ <div className="ml-2 content-center">{file.filename}</div>+ </div>+ <div className="flex w-1/2 flex-row lg:w-1/3">+ <div className="content-center text-nowrap">{file.createdAt?.toString()}</div>+ <Button+ className="my-0 ml-3 h-min bg-transparent p-0 text-[#666666] hover:bg-slate-200"+ onClick={() => console.log('click')}+ >+ <NewTrashIcon className="m-0 p-0" />+ </Button>+ </div>+ </div>+ ))}+ </div>+ </div>+ </div>++ <div className="mt-10 flex flex-col">+ <div className="flex flex-row justify-between">+ <b className="text-base md:text-lg lg:text-xl">Used by</b>+ <Button variant={'default'}>+ <PlusIcon className="h-4 w-4 font-bold" />+ Create Assistant+ </Button>+ </div>+ <div className="flex flex-col divide-y">+ <div className="mt-2 flex flex-row">+ <div className="w-1/2 text-base md:text-lg lg:w-2/3 lg:text-xl">Resource</div>+ <div className="w-1/2 text-base md:text-lg lg:w-1/3 lg:text-xl">ID</div>+ </div>+ <div>+ {assistants.map((assistant, index) => (+ <div key={index} className="flex flex-row">+ <div className="w-1/2 content-center lg:w-2/3">{assistant.resource}</div>+ <div className="flex w-1/2 flex-row lg:w-1/3">+ <div className="content-center">{assistant.id}</div>+ </div>+ </div>+ ))}+ </div>+ </div>+ </div>+ {open && <UploadFileModal open={open} onOpenChange={setOpen} />}+ </div>+ );+}diff --git a/client/src/components/Files/VectorStore/VectorStoreSidePanel.tsx b/client/src/components/Files/VectorStore/VectorStoreSidePanel.tsxnew file mode 100644index 0000000000..b7afde855f--- /dev/null+++ b/client/src/components/Files/VectorStore/VectorStoreSidePanel.tsx@@ -0,0 +1,252 @@+import React from 'react';+import VectorStoreList from './VectorStoreList';+import { TVectorStore } from '~/common';+import VectorStoreButton from './VectorStoreButton';+import { Button, Input } from '~/components/ui';+import FilesSectionSelector from '../FilesSectionSelector';+import ActionButton from '../ActionButton';+import DeleteIconButton from '../DeleteIconButton';+import { ListFilter } from 'lucide-react';+import { useLocalize } from '~/hooks';++const fakeVectorStores: TVectorStore[] = [+ {+ name: 'VectorStore 1',+ bytes: 10000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '1',+ },+ {+ name: 'VectorStore 2',+ bytes: 10000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '2',+ },+ {+ name: 'VectorStore 3',+ bytes: 10000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '3',+ },+ {+ name: 'VectorStore 4',+ bytes: 10000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '4',+ },+ {+ name: 'VectorStore 5',+ bytes: 10000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '5',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+ {+ name: 'VectorStore 6',+ bytes: 2000,+ file_counts: {+ total: 10,+ in_progress: 0,+ completed: 0,+ failed: 0,+ cancelled: 0,+ },+ created_at: '2022-01-01T10:00:00',+ object: 'vector_store',+ _id: '6',+ },+];++export default function VectorStoreSidePanel() {+ const localize = useLocalize();+ const deleteVectorStore = (id: string | undefined) => {+ // Define delete functionality here+ console.log(`Deleting VectorStore with id: ${id}`);+ };++ return (+ <div className="flex flex-col">+ <div className="m-3 flex max-h-[10vh] flex-col">+ <h2 className="text-lg">+ <strong>Vector Stores</strong>+ </h2>+ <div className="m-1 mt-2 flex w-full flex-row justify-between gap-x-2 lg:m-0">+ <div className="flex w-2/3 flex-row">+ <Button variant="ghost" className="m-0 mr-2 p-0">+ <ListFilter className="h-4 w-4" />+ </Button>+ <Input+ placeholder={localize('com_files_filter')}+ value={''}+ onChange={() => {+ console.log('changed');+ }}+ className="max-w-sm dark:border-gray-500"+ />+ </div>+ <div className="w-1/3">+ <VectorStoreButton+ onClick={() => {+ console.log('Add Vector Store');+ }}+ />+ </div>+ </div>+ </div>+ <div className="mr-2 mt-2 max-h-[80vh] w-full overflow-y-auto">+ <VectorStoreList vectorStores={fakeVectorStores} deleteVectorStore={deleteVectorStore} />+ </div>+ </div>+ );+}diff --git a/client/src/components/Files/VectorStoreView.tsx b/client/src/components/Files/VectorStoreView.tsxnew file mode 100644index 0000000000..63db286cff--- /dev/null+++ b/client/src/components/Files/VectorStoreView.tsx@@ -0,0 +1,43 @@+import React from 'react';+import VectorStoreSidePanel from './VectorStore/VectorStoreSidePanel';+import FilesSectionSelector from './FilesSectionSelector';+import { Button } from '../ui';+import { Outlet, useNavigate, useParams } from 'react-router-dom';++export default function VectorStoreView() {+ const params = useParams();+ const navigate = useNavigate();+ return (+ <div className="max-h-[100vh] bg-[#f9f9f9] p-0 lg:p-7">+ <div className="m-4 flex max-h-[10vh] w-full flex-row justify-between md:m-2">+ <FilesSectionSelector />+ <Button+ className="block lg:hidden"+ variant={'outline'}+ size={'sm'}+ onClick={() => {+ navigate('/d/vector-stores');+ }}+ >+ Go back+ </Button>+ </div>+ <div className="flex max-h-[90vh] w-full flex-row divide-x">+ <div+ className={`max-h-full w-full xl:w-1/3 ${+ params.vectorStoreId ? 'hidden w-1/2 lg:block lg:w-1/2' : 'md:w-full'+ }`}+ >+ <VectorStoreSidePanel />+ </div>+ <div+ className={`max-h-full w-full overflow-y-auto xl:w-2/3 ${+ params.vectorStoreId ? 'lg:w-1/2' : 'hidden md:w-1/2 lg:block'+ }`}+ >+ <Outlet />+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Messages/ScrollToBottom.tsx b/client/src/components/Messages/ScrollToBottom.tsxindex 5fcdcb9b1e..01434f5ecb 100644--- a/client/src/components/Messages/ScrollToBottom.tsx+++ b/client/src/components/Messages/ScrollToBottom.tsx@@ -8,7 +8,7 @@ export default function ScrollToBottom({ scrollHandler }: Props) {return (<buttononClick={scrollHandler}- className="absolute bottom-5 right-1/2 cursor-pointer rounded-full border border-gray-200 bg-white bg-clip-padding text-gray-600 dark:border-white/10 dark:bg-gray-750/90 dark:text-gray-200"+ className="dark:bg-gray-850/90 absolute bottom-5 right-1/2 cursor-pointer rounded-full border border-gray-200 bg-white bg-clip-padding text-gray-600 dark:border-white/10 dark:text-gray-200"><svgwidth="24"diff --git a/client/src/components/Nav/Nav.tsx b/client/src/components/Nav/Nav.tsxindex 53fc727e77..68aba256fc 100644--- a/client/src/components/Nav/Nav.tsx+++ b/client/src/components/Nav/Nav.tsx@@ -103,7 +103,7 @@ const Nav = ({ navVisible, setNavVisible }) => {<Tooltip><divclassName={- 'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-gray-50 dark:bg-gray-750 md:max-w-[260px]'+ 'nav active max-w-[320px] flex-shrink-0 overflow-x-hidden bg-gray-50 dark:bg-gray-850 md:max-w-[260px]'}style={{width: navVisible ? navWidth : '0px',diff --git a/client/src/components/Nav/NewChat.tsx b/client/src/components/Nav/NewChat.tsxindex a1cc8e8226..efbcf83426 100644--- a/client/src/components/Nav/NewChat.tsx+++ b/client/src/components/Nav/NewChat.tsx@@ -82,7 +82,7 @@ export default function NewChat({return (<TooltipProvider delayDuration={250}><Tooltip>- <div className="sticky left-0 right-0 top-0 z-20 bg-gray-50 pt-3.5 dark:bg-gray-750">+ <div className="sticky left-0 right-0 top-0 z-20 bg-gray-50 pt-3.5 dark:bg-gray-850"><div className="pb-0.5 last:pb-0" tabIndex={0} style={{ transform: 'none' }}><ahref="/"diff --git a/client/src/components/Nav/SearchBar.tsx b/client/src/components/Nav/SearchBar.tsxindex e8a02a952f..5eee9cad86 100644--- a/client/src/components/Nav/SearchBar.tsx+++ b/client/src/components/Nav/SearchBar.tsx@@ -58,7 +58,7 @@ const SearchBar = forwardRef((props: SearchBarProps, ref: Ref<HTMLDivElement>) =return (<divref={ref}- className="relative mt-1 flex flex h-10 cursor-pointer items-center gap-3 rounded-lg border-white bg-gray-50 px-2 px-3 py-2 text-black transition-colors duration-200 focus-within:bg-gray-200 hover:bg-gray-200 dark:bg-gray-750 dark:text-white dark:focus-within:bg-gray-800 dark:hover:bg-gray-800"+ className="relative mt-1 flex flex h-10 cursor-pointer items-center gap-3 rounded-lg border-white bg-gray-50 px-2 px-3 py-2 text-black transition-colors duration-200 focus-within:bg-gray-200 hover:bg-gray-200 dark:bg-gray-850 dark:text-white dark:focus-within:bg-gray-800 dark:hover:bg-gray-800">{<Search className="absolute left-3 h-4 w-4" />}<inputdiff --git a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsxindex 64ae09d319..11a86a2260 100644--- a/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/Avatar.tsx@@ -7,8 +7,8 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from '~/components/uimport { useUploadAvatarMutation, useGetFileConfig } from '~/data-provider';import { useToastContext } from '~/Providers';import { Spinner } from '~/components/svg';+import { cn, formatBytes } from '~/utils';import { useLocalize } from '~/hooks';-import { cn } from '~/utils/';import store from '~/store';function Avatar() {@@ -55,8 +55,9 @@ function Avatar() {setinput(file);setDialogOpen(true);} else {+ const megabytes = fileConfig.avatarSizeLimit ? formatBytes(fileConfig.avatarSizeLimit) : 2;showToast({- message: localize('com_ui_upload_invalid'),+ message: localize('com_ui_upload_invalid_var', megabytes + ''),status: 'error',});}@@ -81,7 +82,7 @@ function Avatar() {<span>{localize('com_nav_profile_picture')}</span><labelhtmlFor={'file-upload-avatar'}- className="flex h-auto cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-medium font-normal transition-colors hover:bg-gray-100 hover:text-green-700 dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:hover:text-green-500"+ className="flex h-auto cursor-pointer items-center rounded bg-transparent px-2 py-1 text-xs font-normal transition-colors hover:bg-gray-100 hover:text-green-700 dark:bg-transparent dark:text-white dark:hover:bg-gray-600 dark:hover:text-green-500"><FileImage className="mr-1 flex w-[22px] items-center stroke-1" /><span>{localize('com_nav_change_picture')}</span>diff --git a/client/src/components/Prompts/AdminSettings.tsx b/client/src/components/Prompts/AdminSettings.tsxnew file mode 100644index 0000000000..7c1f00daed--- /dev/null+++ b/client/src/components/Prompts/AdminSettings.tsx@@ -0,0 +1,162 @@+import { useMemo, useEffect } from 'react';+import { ShieldEllipsis } from 'lucide-react';+import { useForm, Controller } from 'react-hook-form';+import { Permissions, SystemRoles, roleDefaults, PermissionTypes } from 'librechat-data-provider';+import type { Control, UseFormSetValue, UseFormGetValues } from 'react-hook-form';+import { OGDialog, OGDialogTitle, OGDialogContent, OGDialogTrigger } from '~/components/ui';+import { useUpdatePromptPermissionsMutation } from '~/data-provider';+import { useLocalize, useAuthContext } from '~/hooks';+import { Button, Switch } from '~/components/ui';+import { useToastContext } from '~/Providers';++type FormValues = Record<Permissions, boolean>;++type LabelControllerProps = {+ label: string;+ promptPerm: Permissions;+ control: Control<FormValues, unknown, FormValues>;+ setValue: UseFormSetValue<FormValues>;+ getValues: UseFormGetValues<FormValues>;+};++const defaultValues = roleDefaults[SystemRoles.USER];++const LabelController: React.FC<LabelControllerProps> = ({+ control,+ promptPerm,+ label,+ getValues,+ setValue,+}) => (+ <div className="mb-4 flex items-center justify-between gap-2">+ <label+ className="cursor-pointer select-none"+ htmlFor={promptPerm}+ onClick={() =>+ setValue(promptPerm, !getValues(promptPerm), {+ shouldDirty: true,+ })+ }+ >+ {label}+ </label>+ <Controller+ name={promptPerm}+ control={control}+ render={({ field }) => (+ <Switch+ {...field}+ checked={field.value}+ onCheckedChange={field.onChange}+ value={field?.value?.toString()}+ />+ )}+ />+ </div>+);++const AdminSettings = () => {+ const localize = useLocalize();+ const { user, roles } = useAuthContext();+ const { showToast } = useToastContext();+ const { mutate, isLoading } = useUpdatePromptPermissionsMutation({+ onSuccess: () => {+ showToast({ status: 'success', message: localize('com_endpoint_preset_saved') });+ },+ onError: () => {+ showToast({ status: 'error', message: localize('com_ui_error_save_admin_settings') });+ },+ });++ const {+ reset,+ control,+ setValue,+ getValues,+ handleSubmit,+ formState: { isSubmitting },+ } = useForm<FormValues>({+ mode: 'onChange',+ defaultValues: useMemo(() => {+ if (roles?.[SystemRoles.USER]) {+ return roles[SystemRoles.USER][PermissionTypes.PROMPTS];+ }++ return defaultValues[PermissionTypes.PROMPTS];+ }, [roles]),+ });++ useEffect(() => {+ if (roles?.[SystemRoles.USER]?.[PermissionTypes.PROMPTS]) {+ reset(roles[SystemRoles.USER][PermissionTypes.PROMPTS]);+ }+ }, [roles, reset]);++ if (user?.role !== SystemRoles.ADMIN) {+ return null;+ }++ const labelControllerData = [+ {+ promptPerm: Permissions.SHARED_GLOBAL,+ label: localize('com_ui_prompts_allow_share_global'),+ },+ {+ promptPerm: Permissions.USE,+ label: localize('com_ui_prompts_allow_use'),+ },+ {+ promptPerm: Permissions.CREATE,+ label: localize('com_ui_prompts_allow_create'),+ },+ ];++ const onSubmit = (data: FormValues) => {+ mutate({ roleName: SystemRoles.USER, updates: data });+ };++ return (+ <OGDialog>+ <OGDialogTrigger asChild>+ <Button+ size={'sm'}+ variant={'outline'}+ className="h-10 w-fit gap-1 border transition-all dark:bg-transparent"+ >+ <ShieldEllipsis className="cursor-pointer" />+ <span className="hidden sm:flex">{localize('com_ui_admin')}</span>+ </Button>+ </OGDialogTrigger>+ <OGDialogContent className="bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300">+ <OGDialogTitle>{`${localize('com_ui_admin_settings')} - ${localize(+ 'com_ui_prompts',+ )}`}</OGDialogTitle>+ <form className="p-2" onSubmit={handleSubmit(onSubmit)}>+ <div className="py-5">+ {labelControllerData.map(({ promptPerm, label }) => (+ <LabelController+ key={promptPerm}+ control={control}+ promptPerm={promptPerm}+ label={label}+ getValues={getValues}+ setValue={setValue}+ />+ ))}+ </div>+ <div className="flex justify-end">+ <button+ type="submit"+ disabled={isSubmitting || isLoading}+ className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"+ >+ {localize('com_ui_save')}+ </button>+ </div>+ </form>+ </OGDialogContent>+ </OGDialog>+ );+};++export default AdminSettings;diff --git a/client/src/components/Prompts/AdvancedSwitch.tsx b/client/src/components/Prompts/AdvancedSwitch.tsxnew file mode 100644index 0000000000..abebd301ff--- /dev/null+++ b/client/src/components/Prompts/AdvancedSwitch.tsx@@ -0,0 +1,39 @@+import { useRecoilState, useSetRecoilState } from 'recoil';+import { Tabs, TabsList, TabsTrigger } from '~/components/ui';+import { useLocalize } from '~/hooks';+import store from '~/store';+const { PromptsEditorMode, promptsEditorMode, alwaysMakeProd } = store;++const AdvancedSwitch = () => {+ const localize = useLocalize();+ const [mode, setMode] = useRecoilState(promptsEditorMode);+ const setAlwaysMakeProd = useSetRecoilState(alwaysMakeProd);++ return (+ <Tabs+ defaultValue={mode}+ className="w-auto rounded-lg"+ onValueChange={(value) => {+ value === PromptsEditorMode.SIMPLE && setAlwaysMakeProd(true);+ setMode(value);+ }}+ >+ <TabsList className="grid w-auto grid-cols-2 bg-surface-tertiary">+ <TabsTrigger+ value={PromptsEditorMode.SIMPLE}+ className="w-20 min-w-0 rounded-md text-xs md:w-auto md:text-sm"+ >+ {localize('com_ui_simple')}+ </TabsTrigger>+ <TabsTrigger+ value={PromptsEditorMode.ADVANCED}+ className="w-20 min-w-0 rounded-md text-xs md:w-auto md:text-sm"+ >+ {localize('com_ui_advanced')}+ </TabsTrigger>+ </TabsList>+ </Tabs>+ );+};++export default AdvancedSwitch;diff --git a/client/src/components/Prompts/BackToChat.tsx b/client/src/components/Prompts/BackToChat.tsxnew file mode 100644index 0000000000..ea233b72e2--- /dev/null+++ b/client/src/components/Prompts/BackToChat.tsx@@ -0,0 +1,26 @@+import { useNavigate } from 'react-router-dom';+import { ArrowLeft } from 'lucide-react';+import { buttonVariants } from '~/components/ui';+import { useLocalize } from '~/hooks';+import { cn } from '~/utils';++export default function BackToChat({ className }: { className?: string }) {+ const navigate = useNavigate();+ const localize = useLocalize();+ const clickHandler = (event: React.MouseEvent<HTMLAnchorElement>) => {+ if (event.button === 0 && !(event.ctrlKey || event.metaKey)) {+ event.preventDefault();+ navigate('/c/new');+ }+ };+ return (+ <a+ className={cn(buttonVariants({ variant: 'outline' }), className)}+ href="/"+ onClick={clickHandler}+ >+ <ArrowLeft className="icon-xs mr-2" />+ {localize('com_ui_back_to_chat')}+ </a>+ );+}diff --git a/client/src/components/Prompts/DeleteVersion.tsx b/client/src/components/Prompts/DeleteVersion.tsxnew file mode 100644index 0000000000..fbdcc466ab--- /dev/null+++ b/client/src/components/Prompts/DeleteVersion.tsx@@ -0,0 +1,60 @@+import { Button, Dialog, DialogTrigger, Label } from '~/components/ui';+import DialogTemplate from '~/components/ui/DialogTemplate';+import { TrashIcon } from '~/components/svg';+import { useLocalize } from '~/hooks';++const DeleteVersion = ({+ name,+ disabled,+ selectHandler,+}: {+ name: string;+ disabled?: boolean;+ selectHandler: () => void;+}) => {+ const localize = useLocalize();++ return (+ <Dialog>+ <DialogTrigger asChild>+ <Button+ size={'sm'}+ className="h-10 w-10 border border-transparent bg-red-600 text-red-500 transition-all hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-800"+ disabled={disabled}+ onClick={(e) => {+ e.stopPropagation();+ }}+ >+ <TrashIcon className="icon-lg cursor-pointer text-white dark:text-white" />+ </Button>+ </DialogTrigger>+ <DialogTemplate+ showCloseButton={false}+ title={localize('com_ui_delete_prompt')}+ className="max-w-[450px]"+ main={+ <>+ <div className="flex w-full flex-col items-center gap-2">+ <div className="grid w-full items-center gap-2">+ <Label+ htmlFor="dialog-delete-confirm-prompt"+ className="text-left text-sm font-medium"+ >+ {localize('com_ui_delete_confirm_prompt_version_var', name)}+ </Label>+ </div>+ </div>+ </>+ }+ selection={{+ selectHandler,+ selectClasses:+ 'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 text-white',+ selectText: localize('com_ui_delete'),+ }}+ />+ </Dialog>+ );+};++export default DeleteVersion;diff --git a/client/src/components/Prompts/Description.tsx b/client/src/components/Prompts/Description.tsxnew file mode 100644index 0000000000..8a79d000d5--- /dev/null+++ b/client/src/components/Prompts/Description.tsx@@ -0,0 +1,63 @@+import { useState, useEffect } from 'react';+import { Info } from 'lucide-react';+import { useLocalize } from '~/hooks';++const MAX_LENGTH = 56;++const Description = ({+ initialValue,+ onValueChange,+ disabled,+ tabIndex,+}: {+ initialValue?: string;+ onValueChange?: (value: string) => void;+ disabled?: boolean;+ tabIndex?: number;+}) => {+ const localize = useLocalize();+ const [description, setDescription] = useState(initialValue || '');+ const [charCount, setCharCount] = useState(initialValue?.length || 0);++ useEffect(() => {+ setDescription(initialValue || '');+ setCharCount(initialValue?.length || 0);+ }, [initialValue]);++ useEffect(() => {+ setCharCount(description.length);+ }, [description]);++ const handleInputChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {+ if (e.target.value.length <= MAX_LENGTH) {+ setDescription(e.target.value);+ onValueChange?.(e.target.value);+ }+ };++ if (disabled && !description) {+ return null;+ }++ return (+ <div className="rounded-lg border border-border-medium">+ <h3 className="flex h-10 items-center gap-2 pl-4 text-sm text-text-secondary">+ <Info className="icon-sm" />+ <input+ type="text"+ tabIndex={tabIndex}+ disabled={disabled}+ placeholder={localize('com_ui_description_placeholder')}+ value={description}+ onChange={handleInputChange}+ className="w-full rounded-lg border-none bg-transparent p-1 text-text-primary placeholder:text-text-tertiary placeholder:underline placeholder:underline-offset-2 focus:bg-surface-tertiary focus:outline-none focus:ring-0 md:w-96"+ />+ {!disabled && (+ <span className="mr-1 w-10 text-xs text-text-tertiary md:text-sm">{`${charCount}/${MAX_LENGTH}`}</span>+ )}+ </h3>+ </div>+ );+};++export default Description;diff --git a/client/src/components/Prompts/EmptyPromptPreview.tsx b/client/src/components/Prompts/EmptyPromptPreview.tsxnew file mode 100644index 0000000000..b812d008a4--- /dev/null+++ b/client/src/components/Prompts/EmptyPromptPreview.tsx@@ -0,0 +1,9 @@+import React from 'react';++export default function EmptyPromptPreview() {+ return (+ <div className="h-full w-full content-center text-center font-bold dark:text-gray-200">+ Select or Create a Prompt+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/AlwaysMakeProd.tsx b/client/src/components/Prompts/Groups/AlwaysMakeProd.tsxnew file mode 100644index 0000000000..7ecdf739b6--- /dev/null+++ b/client/src/components/Prompts/Groups/AlwaysMakeProd.tsx@@ -0,0 +1,35 @@+import { useRecoilState } from 'recoil';+import { Switch } from '~/components/ui';+import { useLocalize } from '~/hooks';+import { cn } from '~/utils';+import store from '~/store';++export default function AlwaysMakeProd({+ onCheckedChange,+ className = '',+}: {+ onCheckedChange?: (value: boolean) => void;+ className?: string;+}) {+ const [alwaysMakeProd, setAlwaysMakeProd] = useRecoilState<boolean>(store.alwaysMakeProd);+ const localize = useLocalize();++ const handleCheckedChange = (value: boolean) => {+ setAlwaysMakeProd(value);+ if (onCheckedChange) {+ onCheckedChange(value);+ }+ };++ return (+ <div className={cn('flex select-none items-center justify-end gap-2 text-xs', className)}>+ <Switch+ id="alwaysMakeProd"+ checked={alwaysMakeProd}+ onCheckedChange={handleCheckedChange}+ data-testid="alwaysMakeProd"+ />+ <div>{localize('com_nav_always_make_prod')} </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/AutoSendPrompt.tsx b/client/src/components/Prompts/Groups/AutoSendPrompt.tsxnew file mode 100644index 0000000000..ef460bab94--- /dev/null+++ b/client/src/components/Prompts/Groups/AutoSendPrompt.tsx@@ -0,0 +1,40 @@+import { useRecoilState } from 'recoil';+import { Switch } from '~/components/ui';+import { useLocalize } from '~/hooks';+import { cn } from '~/utils';+import store from '~/store';++export default function AutoSendPrompt({+ onCheckedChange,+ className = '',+}: {+ onCheckedChange?: (value: boolean) => void;+ className?: string;+}) {+ const [autoSendPrompts, setAutoSendPrompts] = useRecoilState<boolean>(store.autoSendPrompts);+ const localize = useLocalize();++ const handleCheckedChange = (value: boolean) => {+ setAutoSendPrompts(value);+ if (onCheckedChange) {+ onCheckedChange(value);+ }+ };++ return (+ <div+ className={cn(+ 'flex select-none items-center justify-end gap-2 text-right text-sm',+ className,+ )}+ >+ <div> {localize('com_nav_auto_send_prompts')} </div>+ <Switch+ id="autoSendPrompts"+ checked={autoSendPrompts}+ onCheckedChange={handleCheckedChange}+ data-testid="autoSendPrompts"+ />+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/CategoryIcon.tsx b/client/src/components/Prompts/Groups/CategoryIcon.tsxnew file mode 100644index 0000000000..53fbbe1418--- /dev/null+++ b/client/src/components/Prompts/Groups/CategoryIcon.tsx@@ -0,0 +1,52 @@+import React from 'react';+import {+ Dices,+ BoxIcon,+ PenLineIcon,+ LightbulbIcon,+ LineChartIcon,+ ShoppingBagIcon,+ PlaneTakeoffIcon,+ GraduationCapIcon,+ TerminalSquareIcon,+} from 'lucide-react';+import { cn } from '~/utils';++const categoryIconMap: Record<string, React.ElementType> = {+ misc: BoxIcon,+ roleplay: Dices,+ write: PenLineIcon,+ idea: LightbulbIcon,+ shop: ShoppingBagIcon,+ finance: LineChartIcon,+ code: TerminalSquareIcon,+ travel: PlaneTakeoffIcon,+ teach_or_explain: GraduationCapIcon,+};++const categoryColorMap: Record<string, string> = {+ code: 'text-red-500',+ misc: 'text-blue-300',+ shop: 'text-purple-400',+ idea: 'text-yellow-300',+ write: 'text-purple-400',+ travel: 'text-yellow-300',+ finance: 'text-orange-400',+ roleplay: 'text-orange-400',+ teach_or_explain: 'text-blue-300',+};++export default function CategoryIcon({+ category,+ className = '',+}: {+ category: string;+ className?: string;+}) {+ const IconComponent = categoryIconMap[category];+ const colorClass = categoryColorMap[category] + ' ' + className;+ if (!IconComponent) {+ return null;+ }+ return <IconComponent className={cn(colorClass, className)} />;+}diff --git a/client/src/components/Prompts/Groups/CategorySelector.tsx b/client/src/components/Prompts/Groups/CategorySelector.tsxnew file mode 100644index 0000000000..2cd37fbb14--- /dev/null+++ b/client/src/components/Prompts/Groups/CategorySelector.tsx@@ -0,0 +1,60 @@+import React, { useMemo } from 'react';+import { useFormContext, Controller } from 'react-hook-form';+import { LocalStorageKeys } from 'librechat-data-provider';+import { useLocalize, useCategories } from '~/hooks';+import { SelectDropDown } from '~/components/ui';+import { cn } from '~/utils';++const CategorySelector = ({+ currentCategory,+ onValueChange,+ className = '',+ tabIndex,+}: {+ currentCategory?: string;+ onValueChange?: (value: string) => void;+ className?: string;+ tabIndex?: number;+}) => {+ const localize = useLocalize();+ const { control, watch, setValue } = useFormContext();+ const { categories, emptyCategory } = useCategories();++ const watchedCategory = watch('category');+ const categoryOption = useMemo(+ () =>+ categories.find((category) => category.value === (watchedCategory ?? currentCategory)) ??+ emptyCategory,+ [watchedCategory, categories, currentCategory, emptyCategory],+ );++ return (+ <Controller+ name="category"+ control={control}+ render={() => (+ <SelectDropDown+ title="Category"+ tabIndex={tabIndex}+ value={categoryOption || ''}+ setValue={(value) => {+ setValue('category', value, { shouldDirty: false });+ localStorage.setItem(LocalStorageKeys.LAST_PROMPT_CATEGORY, value);+ onValueChange?.(value);+ }}+ availableValues={categories}+ showAbove={false}+ showLabel={false}+ emptyTitle={true}+ showOptionIcon={true}+ searchPlaceholder={localize('com_ui_search_var', localize('com_ui_categories'))}+ className={cn('h-10 w-56 cursor-pointer', className)}+ currentValueClass="text-md gap-2"+ optionsListClass="text-sm max-h-72"+ />+ )}+ />+ );+};++export default CategorySelector;diff --git a/client/src/components/Prompts/Groups/ChatGroupItem.tsx b/client/src/components/Prompts/Groups/ChatGroupItem.tsxnew file mode 100644index 0000000000..66f21e0825--- /dev/null+++ b/client/src/components/Prompts/Groups/ChatGroupItem.tsx@@ -0,0 +1,114 @@+import { useState, useMemo } from 'react';+import { Menu as MenuIcon, Edit as EditIcon, EarthIcon, TextSearch } from 'lucide-react';+import type { TPromptGroup } from 'librechat-data-provider';+import {+ Button,+ DropdownMenu,+ DropdownMenuItem,+ DropdownMenuGroup,+ DropdownMenuContent,+ DropdownMenuTrigger,+} from '~/components/ui';+import { useLocalize, useSubmitMessage, useCustomLink, useAuthContext } from '~/hooks';+import VariableDialog from '~/components/Prompts/Groups/VariableDialog';+import PreviewPrompt from '~/components/Prompts/PreviewPrompt';+import ListCard from '~/components/Prompts/Groups/ListCard';+import { detectVariables } from '~/utils';++export default function ChatGroupItem({+ group,+ instanceProjectId,+}: {+ group: TPromptGroup;+ instanceProjectId?: string;+}) {+ const localize = useLocalize();+ const { user } = useAuthContext();+ const { submitPrompt } = useSubmitMessage();+ const [isPreviewDialogOpen, setPreviewDialogOpen] = useState(false);+ const [isVariableDialogOpen, setVariableDialogOpen] = useState(false);+ const onEditClick = useCustomLink<HTMLDivElement>(`/d/prompts/${group._id}`);+ const groupIsGlobal = useMemo(+ () => instanceProjectId && group?.projectIds?.includes(instanceProjectId),+ [group, instanceProjectId],+ );+ const isOwner = useMemo(() => user?.id === group?.author, [user, group]);++ const onCardClick = () => {+ const text = group.productionPrompt?.prompt ?? '';+ if (!text) {+ return;+ }+ const hasVariables = detectVariables(text);+ if (hasVariables) {+ return setVariableDialogOpen(true);+ }++ submitPrompt(text);+ };++ return (+ <>+ <ListCard+ name={group.name}+ category={group.category ?? ''}+ onClick={onCardClick}+ snippet={group.oneliner ? group.oneliner : group?.productionPrompt?.prompt ?? ''}+ >+ <div className="flex flex-row items-center gap-2">+ {groupIsGlobal && <EarthIcon className="icon-md text-green-400" />}+ <DropdownMenu modal={false}>+ <DropdownMenuTrigger asChild>+ <Button+ variant="outline"+ onClick={(e) => {+ e.stopPropagation();+ }}+ className="z-50 h-7 w-7 p-0 transition-all duration-300 ease-in-out hover:border-white dark:bg-gray-800 dark:hover:border-gray-400 dark:focus:border-gray-500"+ >+ <MenuIcon className="icon-md dark:text-gray-300" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent+ className="z-50 mt-2 w-36 rounded-lg"+ collisionPadding={2}+ align="end"+ >+ <DropdownMenuItem+ onClick={(e) => {+ e.stopPropagation();+ setPreviewDialogOpen(true);+ }}+ className="w-full cursor-pointer rounded-lg disabled:cursor-not-allowed dark:text-gray-300 dark:hover:bg-gray-700 dark:focus:bg-gray-700"+ >+ <TextSearch className="mr-2 h-4 w-4" />+ <span>{localize('com_ui_preview')}</span>+ </DropdownMenuItem>+ {isOwner && (+ <DropdownMenuGroup>+ <DropdownMenuItem+ disabled={!isOwner}+ className="cursor-pointer rounded-lg disabled:cursor-not-allowed dark:text-gray-300 dark:hover:bg-gray-700 dark:focus:bg-gray-700"+ onClick={(e) => {+ e.stopPropagation();+ onEditClick(e);+ }}+ >+ <EditIcon className="mr-2 h-4 w-4" />+ <span>{localize('com_ui_edit')}</span>+ </DropdownMenuItem>+ </DropdownMenuGroup>+ )}+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ </ListCard>+ <PreviewPrompt group={group} open={isPreviewDialogOpen} onOpenChange={setPreviewDialogOpen} />+ <VariableDialog+ open={isVariableDialogOpen}+ onClose={() => setVariableDialogOpen(false)}+ group={group}+ />+ </>+ );+}diff --git a/client/src/components/Prompts/Groups/CreatePromptForm.tsx b/client/src/components/Prompts/Groups/CreatePromptForm.tsxnew file mode 100644index 0000000000..fae0de21c4--- /dev/null+++ b/client/src/components/Prompts/Groups/CreatePromptForm.tsx@@ -0,0 +1,178 @@+import { useEffect } from 'react';+import { useNavigate } from 'react-router-dom';+import { useForm, Controller, FormProvider } from 'react-hook-form';+import { LocalStorageKeys, PermissionTypes, Permissions } from 'librechat-data-provider';+import CategorySelector from '~/components/Prompts/Groups/CategorySelector';+import PromptVariables from '~/components/Prompts/PromptVariables';+import { Button, TextareaAutosize, Input } from '~/components/ui';+import Description from '~/components/Prompts/Description';+import { useCreatePrompt } from '~/data-provider';+import { useLocalize, useHasAccess } from '~/hooks';+import { cn } from '~/utils';++type CreateFormValues = {+ name: string;+ prompt: string;+ type: 'text' | 'chat';+ category: string;+ oneliner?: string;+};++const defaultPrompt: CreateFormValues = {+ name: '',+ prompt: '',+ type: 'text',+ category: '',+ oneliner: undefined,+};++const CreatePromptForm = ({+ defaultValues = defaultPrompt,+}: {+ defaultValues?: CreateFormValues;+}) => {+ const localize = useLocalize();+ const navigate = useNavigate();+ const hasAccess = useHasAccess({+ permissionType: PermissionTypes.PROMPTS,+ permission: Permissions.CREATE,+ });++ useEffect(() => {+ let timeoutId: ReturnType<typeof setTimeout>;+ if (!hasAccess) {+ timeoutId = setTimeout(() => {+ navigate('/c/new');+ }, 1000);+ }+ return () => {+ clearTimeout(timeoutId);+ };+ }, [hasAccess, navigate]);++ const methods = useForm({+ defaultValues: {+ ...defaultValues,+ category: localStorage.getItem(LocalStorageKeys.LAST_PROMPT_CATEGORY) ?? '',+ },+ });++ const {+ watch,+ control,+ handleSubmit,+ formState: { isDirty, isSubmitting, errors, isValid },+ } = methods;++ const createPromptMutation = useCreatePrompt({+ onSuccess: (response) => {+ navigate(`/d/prompts/${response.prompt.groupId}`, { replace: true });+ },+ });++ const promptText = watch('prompt');++ const onSubmit = (data: CreateFormValues) => {+ const { name, category, oneliner, ...rest } = data;+ const groupData = { name, category } as Pick<+ CreateFormValues,+ 'name' | 'category' | 'oneliner'+ >;+ if ((oneliner?.length || 0) > 0) {+ groupData.oneliner = oneliner;+ }+ createPromptMutation.mutate({+ prompt: rest,+ group: groupData,+ });+ };++ if (!hasAccess) {+ return null;+ }++ return (+ <FormProvider {...methods}>+ <form onSubmit={handleSubmit(onSubmit)} className="w-full px-4 py-2">+ <div className="mb-1 flex flex-col items-center justify-between font-bold sm:text-xl md:mb-0 md:text-2xl">+ <div className="flex w-full flex-col items-center justify-between sm:flex-row">+ <Controller+ name="name"+ control={control}+ rules={{ required: localize('com_ui_is_required', localize('com_ui_prompt_name')) }}+ render={({ field }) => (+ <div className="mb-1 flex items-center md:mb-0">+ <Input+ {...field}+ type="text"+ className="mr-2 w-full border border-gray-300 p-2 text-2xl dark:border-gray-600"+ placeholder={`${localize('com_ui_prompt_name')}*`}+ tabIndex={1}+ autoFocus={true}+ />+ <div+ className={cn(+ 'mt-1 w-56 text-sm text-red-500',+ errors.name ? 'visible h-auto' : 'invisible h-0',+ )}+ >+ {errors.name ? errors.name.message : ' '}+ </div>+ </div>+ )}+ />+ <CategorySelector tabIndex={4} />+ </div>+ </div>+ <div className="w-full md:mt-[1.075rem]">+ <div>+ <h2 className="flex items-center justify-between rounded-t-lg border border-gray-300 py-2 pl-4 pr-1 text-base font-semibold dark:border-gray-600 dark:text-gray-200">+ {localize('com_ui_text_prompt')}*+ </h2>+ <div className="mb-4 min-h-32 rounded-b-lg border border-gray-300 p-4 transition-all duration-150 dark:border-gray-600">+ <Controller+ name="prompt"+ control={control}+ rules={{ required: localize('com_ui_is_required', localize('com_ui_text_prompt')) }}+ render={({ field }) => (+ <div>+ <TextareaAutosize+ {...field}+ className="w-full rounded border border-gray-300 px-2 py-1 focus:outline-none dark:border-gray-600 dark:bg-transparent dark:text-gray-200"+ minRows={6}+ tabIndex={2}+ />+ <div+ className={`mt-1 text-sm text-red-500 ${+ errors.prompt ? 'visible h-auto' : 'invisible h-0'+ }`}+ >+ {errors.prompt ? errors.prompt.message : ' '}+ </div>+ </div>+ )}+ />+ </div>+ </div>+ <PromptVariables promptText={promptText} />+ <Description+ onValueChange={(value) => methods.setValue('oneliner', value)}+ tabIndex={3}+ />+ <div className="flex justify-end">+ <Button+ tabIndex={5}+ type="submit"+ variant="default"+ disabled={!isDirty || isSubmitting || !isValid}+ >+ {localize('com_ui_create_var', localize('com_ui_prompt'))}+ </Button>+ </div>+ </div>+ </form>+ </FormProvider>+ );+};++export default CreatePromptForm;diff --git a/client/src/components/Prompts/Groups/DashGroupItem.tsx b/client/src/components/Prompts/Groups/DashGroupItem.tsxnew file mode 100644index 0000000000..bfb8d4d6e2--- /dev/null+++ b/client/src/components/Prompts/Groups/DashGroupItem.tsx@@ -0,0 +1,217 @@+import { useState, useRef, useMemo } from 'react';+import { MenuIcon, EarthIcon } from 'lucide-react';+import { useNavigate, useParams } from 'react-router-dom';+import { SystemRoles, type TPromptGroup } from 'librechat-data-provider';+import { useDeletePromptGroup, useUpdatePromptGroup } from '~/data-provider';+import {+ Input,+ Label,+ Button,+ Dialog,+ DropdownMenu,+ DialogTrigger,+ DropdownMenuGroup,+ DropdownMenuContent,+ DropdownMenuTrigger,+} from '~/components/ui';+import CategoryIcon from '~/components/Prompts/Groups/CategoryIcon';+import DialogTemplate from '~/components/ui/DialogTemplate';+import { RenameButton } from '~/components/Conversations';+import { useLocalize, useAuthContext } from '~/hooks';+import { NewTrashIcon } from '~/components/svg';+import { cn } from '~/utils/';++export default function DashGroupItem({+ group,+ instanceProjectId,+}: {+ group: TPromptGroup;+ instanceProjectId?: string;+}) {+ const params = useParams();+ const navigate = useNavigate();+ const localize = useLocalize();++ const { user } = useAuthContext();+ const blurTimeoutRef = useRef<NodeJS.Timeout>();+ const [nameEditFlag, setNameEditFlag] = useState(false);+ const [nameInputField, setNameInputField] = useState(group.name);+ const isOwner = useMemo(() => user?.id === group?.author, [user, group]);+ const groupIsGlobal = useMemo(+ () => instanceProjectId && group?.projectIds?.includes(instanceProjectId),+ [group, instanceProjectId],+ );++ const updateGroup = useUpdatePromptGroup({+ onMutate: () => {+ clearTimeout(blurTimeoutRef.current);+ setNameEditFlag(false);+ },+ });+ const deletePromptGroupMutation = useDeletePromptGroup({+ onSuccess: (response, variables) => {+ if (variables.id === group._id) {+ navigate('/d/prompts');+ }+ },+ });++ const cancelRename = () => {+ setNameEditFlag(false);+ };++ const saveRename = () => {+ updateGroup.mutate({ payload: { name: nameInputField }, id: group?._id || '' });+ };++ const handleBlur = () => {+ blurTimeoutRef.current = setTimeout(() => {+ cancelRename();+ }, 100);+ };++ return (+ <div+ className={cn(+ 'w-100 mx-2 my-3 flex cursor-pointer flex-row rounded-md border-0 bg-white p-4 transition-all duration-300 ease-in-out hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600',+ params.promptId === group._id && 'bg-gray-100/50 dark:bg-gray-600 ',+ )}+ onClick={() => {+ if (nameEditFlag) {+ return;+ }+ navigate(`/d/prompts/${group._id}`, { replace: true });+ }}+ >+ <div className="flex w-full flex-row items-center justify-start truncate">+ {/* <Checkbox /> */}+ <div className="relative flex w-full cursor-pointer flex-col gap-1 text-start align-top">+ {nameEditFlag ? (+ <>+ <div className="flex w-full gap-2">+ <Input+ defaultValue={nameInputField}+ className="w-full"+ onClick={(e) => {+ e.stopPropagation();+ }}+ onChange={(e) => {+ setNameInputField(e.target.value);+ }}+ onKeyDown={(e) => {+ if (e.key === 'Escape') {+ cancelRename();+ } else if (e.key === 'Enter') {+ saveRename();+ }+ }}+ onBlur={handleBlur}+ />+ <Button+ variant="subtle"+ className="w-min bg-green-500 text-white hover:bg-green-600 dark:bg-green-400 dark:hover:bg-green-500"+ onClick={(e) => {+ e.stopPropagation();+ saveRename();+ }}+ >+ {localize('com_ui_save')}+ </Button>+ </div>+ <div className="break-word line-clamp-3 text-balance text-sm text-gray-600 dark:text-gray-400">+ {localize('com_ui_renaming_var', group.name)}+ </div>+ </>+ ) : (+ <>+ <div className="flex w-full justify-between">+ <div className="flex flex-row gap-2">+ <CategoryIcon category={group.category ?? ''} className="icon-md" />+ <h3 className="break-word text-balance text-sm font-semibold text-gray-800 dark:text-gray-200">+ {group.name}+ </h3>+ </div>+ <div className="flex flex-row items-center gap-1">+ {groupIsGlobal && <EarthIcon className="icon-md text-green-400" />}+ {(isOwner || user?.role === SystemRoles.ADMIN) && (+ <>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ variant="outline"+ className="h-7 w-7 p-0 hover:bg-gray-200 dark:bg-gray-800/50 dark:text-gray-400 dark:hover:border-gray-400 dark:focus:border-gray-500"+ >+ <MenuIcon className="icon-md dark:text-gray-300" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent className="mt-2 w-36 rounded-lg" collisionPadding={2}>+ <DropdownMenuGroup>+ <RenameButton+ renaming={false}+ renameHandler={(e) => {+ e.stopPropagation();+ setNameEditFlag(true);+ }}+ appendLabel={true}+ className={cn('m-0 w-full p-2')}+ />+ </DropdownMenuGroup>+ </DropdownMenuContent>+ </DropdownMenu>+ <Dialog>+ <DialogTrigger asChild>+ <Button+ variant="outline"+ className={cn(+ 'h-7 w-7 p-0 hover:bg-gray-200 dark:bg-gray-800/50 dark:text-gray-400 dark:hover:border-gray-400 dark:focus:border-gray-500',+ )}+ onClick={(e) => {+ e.stopPropagation();+ }}+ >+ <NewTrashIcon className="icon-md text-gray-600 dark:text-gray-300" />+ </Button>+ </DialogTrigger>+ <DialogTemplate+ showCloseButton={false}+ title={localize('com_ui_delete_prompt')}+ className="max-w-[450px]"+ main={+ <>+ <div className="flex w-full flex-col items-center gap-2">+ <div className="grid w-full items-center gap-2">+ <Label+ htmlFor="chatGptLabel"+ className="text-left text-sm font-medium"+ >+ {localize('com_ui_delete_confirm')}{' '}+ <strong>{group.name}</strong>+ </Label>+ </div>+ </div>+ </>+ }+ selection={{+ selectHandler: () => {+ deletePromptGroupMutation.mutate({ id: group?._id || '' });+ },+ selectClasses:+ 'bg-red-600 dark:bg-red-600 hover:bg-red-700 dark:hover:bg-red-800 text-white',+ selectText: localize('com_ui_delete'),+ }}+ />+ </Dialog>+ </>+ )}+ </div>+ </div>+ <div className="ellipsis text-balance text-sm text-gray-600 dark:text-gray-400">+ {group.oneliner ? group.oneliner : group?.productionPrompt?.prompt ?? ''}+ </div>+ </>+ )}+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/FilterPrompts.tsx b/client/src/components/Prompts/Groups/FilterPrompts.tsxnew file mode 100644index 0000000000..974ababf48--- /dev/null+++ b/client/src/components/Prompts/Groups/FilterPrompts.tsx@@ -0,0 +1,153 @@+import { ListFilter, User, Share2, Dot } from 'lucide-react';+import React, { useState, useCallback, useMemo } from 'react';+import { useRecoilValue, useSetRecoilState } from 'recoil';+import { SystemCategories } from 'librechat-data-provider';+import type { OptionWithIcon } from '~/common';+import { usePromptGroupsNav, useLocalize, useCategories } from '~/hooks';+import {+ Input,+ Button,+ DropdownMenu,+ DropdownMenuItem,+ DropdownMenuGroup,+ DropdownMenuTrigger,+ DropdownMenuContent,+ DropdownMenuSeparator,+} from '~/components/ui';+import { cn } from '~/utils';+import store from '~/store';++export function FilterItem({+ label,+ icon,+ onClick,+ isActive,+}: {+ label: string;+ icon: React.ReactNode;+ onClick?: () => void;+ isActive?: boolean;+}) {+ return (+ <DropdownMenuItem+ onClick={onClick}+ className="relative cursor-pointer gap-2 text-text-secondary hover:bg-surface-tertiary focus:bg-surface-tertiary dark:focus:bg-surface-tertiary"+ >+ {icon}+ <span>{label}</span>+ {isActive && (+ <span className="absolute bottom-0 right-0 top-0 flex items-center">+ <Dot />+ </span>+ )}+ </DropdownMenuItem>+ );+}++export function FilterMenu({+ onSelect,+}: {+ onSelect: (category: string, icon?: React.ReactNode | null) => void;+}) {+ const localize = useLocalize();+ const { categories } = useCategories('h-4 w-4');+ const memoizedCategories = useMemo(() => {+ const noCategory = {+ label: localize('com_ui_no_category'),+ value: SystemCategories.NO_CATEGORY,+ };+ if (!categories) {+ return [noCategory];+ }++ return [noCategory, ...categories];+ }, [categories, localize]);++ const categoryFilter = useRecoilValue(store.promptsCategory);+ return (+ <DropdownMenuContent className="max-h-xl min-w-48 overflow-y-auto">+ <DropdownMenuGroup>+ <FilterItem+ label={localize('com_ui_all_proper')}+ icon={<ListFilter className="h-4 w-4 text-text-primary" />}+ onClick={() => onSelect(SystemCategories.ALL, <ListFilter className="icon-sm" />)}+ isActive={categoryFilter === ''}+ />+ <FilterItem+ label={localize('com_ui_my_prompts')}+ icon={<User className="h-4 w-4 text-text-primary" />}+ onClick={() => onSelect(SystemCategories.MY_PROMPTS, <User className="h-4 w-4" />)}+ isActive={categoryFilter === SystemCategories.MY_PROMPTS}+ />+ <FilterItem+ label={localize('com_ui_shared_prompts')}+ icon={<Share2 className="h-4 w-4 text-text-primary" />}+ onClick={() => onSelect(SystemCategories.SHARED_PROMPTS, <Share2 className="h-4 w-4" />)}+ isActive={categoryFilter === SystemCategories.SHARED_PROMPTS}+ />+ </DropdownMenuGroup>+ <DropdownMenuSeparator />+ <DropdownMenuGroup>+ {memoizedCategories+ .filter((category) => category.value)+ .map((category, i) => (+ <FilterItem+ key={`${category.value}-${i}`}+ label={category.label}+ icon={(category as OptionWithIcon).icon}+ onClick={() => onSelect(category.value, (category as OptionWithIcon).icon)}+ isActive={category.value === categoryFilter}+ />+ ))}+ </DropdownMenuGroup>+ </DropdownMenuContent>+ );+}++export default function FilterPrompts({+ setName,+ className = '',+}: Pick<ReturnType<typeof usePromptGroupsNav>, 'setName'> & {+ className?: string;+}) {+ const localize = useLocalize();+ const [displayName, setDisplayName] = useState('');+ const setCategory = useSetRecoilState(store.promptsCategory);+ const [selectedIcon, setSelectedIcon] = useState(<ListFilter className="icon-sm" />);++ const onSelect = useCallback(+ (category: string, icon?: React.ReactNode | null) => {+ if (category === SystemCategories.ALL) {+ setSelectedIcon(<ListFilter className="icon-sm" />);+ return setCategory('');+ }+ setCategory(category);+ if (icon && React.isValidElement(icon)) {+ setSelectedIcon(icon);+ }+ },+ [setCategory],+ );++ return (+ <div className={cn('flex gap-2', className)}>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="ghost" size="sm" className="h-10 w-10 flex-shrink-0">+ {selectedIcon}+ </Button>+ </DropdownMenuTrigger>+ <FilterMenu onSelect={onSelect} />+ </DropdownMenu>+ <Input+ placeholder={localize('com_ui_filter_prompts_name')}+ value={displayName}+ onChange={(e) => {+ setDisplayName(e.target.value);+ setName(e.target.value);+ }}+ className="max-w-xs border-border-light focus:bg-surface-tertiary"+ />+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/GroupSidePanel.tsx b/client/src/components/Prompts/Groups/GroupSidePanel.tsxnew file mode 100644index 0000000000..23170da54f--- /dev/null+++ b/client/src/components/Prompts/Groups/GroupSidePanel.tsx@@ -0,0 +1,55 @@+import { useMemo } from 'react';+import { useLocation } from 'react-router-dom';+import PanelNavigation from '~/components/Prompts/Groups/PanelNavigation';+import { useMediaQuery, usePromptGroupsNav } from '~/hooks';+import List from '~/components/Prompts/Groups/List';+import { cn } from '~/utils';++export default function GroupSidePanel({+ children,+ isDetailView,+ className = '',+ /* usePromptGroupsNav */+ nextPage,+ prevPage,+ isFetching,+ hasNextPage,+ groupsQuery,+ promptGroups,+ hasPreviousPage,+}: {+ children?: React.ReactNode;+ isDetailView?: boolean;+ className?: string;+} & ReturnType<typeof usePromptGroupsNav>) {+ const location = useLocation();+ const isSmallerScreen = useMediaQuery('(max-width: 1024px)');+ const isChatRoute = useMemo(() => location.pathname.startsWith('/c/'), [location.pathname]);++ return (+ <div+ className={cn(+ 'mr-2 flex w-full min-w-72 flex-col gap-2 overflow-y-auto md:w-full lg:w-1/4 xl:w-1/4',+ isDetailView && isSmallerScreen ? 'hidden' : '',+ className,+ )}+ >+ {children}+ <div className="flex-grow overflow-y-auto">+ <List+ groups={promptGroups}+ isChatRoute={isChatRoute}+ isLoading={!!groupsQuery?.isLoading}+ />+ </div>+ <PanelNavigation+ nextPage={nextPage}+ prevPage={prevPage}+ isFetching={isFetching}+ hasNextPage={hasNextPage}+ isChatRoute={isChatRoute}+ hasPreviousPage={hasPreviousPage}+ />+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/List.tsx b/client/src/components/Prompts/Groups/List.tsxnew file mode 100644index 0000000000..4e1b4f19be--- /dev/null+++ b/client/src/components/Prompts/Groups/List.tsx@@ -0,0 +1,77 @@+import { useNavigate } from 'react-router-dom';+import { PermissionTypes, Permissions } from 'librechat-data-provider';+import { useGetStartupConfig } from 'librechat-data-provider/react-query';+import type { TPromptGroup, TStartupConfig } from 'librechat-data-provider';+import DashGroupItem from '~/components/Prompts/Groups/DashGroupItem';+import ChatGroupItem from '~/components/Prompts/Groups/ChatGroupItem';+import { useLocalize, useHasAccess } from '~/hooks';+import { Button, Skeleton } from '~/components/ui';++export default function List({+ groups = [],+ isChatRoute,+ isLoading,+}: {+ groups?: TPromptGroup[];+ isChatRoute?: boolean;+ isLoading: boolean;+}) {+ const navigate = useNavigate();+ const localize = useLocalize();+ const { data: startupConfig = {} as Partial<TStartupConfig> } = useGetStartupConfig();+ const { instanceProjectId } = startupConfig;+ const hasCreateAccess = useHasAccess({+ permissionType: PermissionTypes.PROMPTS,+ permission: Permissions.CREATE,+ });++ return (+ <div className="flex h-full flex-col">+ {hasCreateAccess && (+ <div className="flex w-full justify-end">+ <Button+ variant="outline"+ className="mx-2 w-full px-3"+ onClick={() => navigate('/d/prompts/new')}+ >+ + {localize('com_ui_create_var', localize('com_ui_prompt'))}+ </Button>+ </div>+ )}+ <div className="flex-grow overflow-y-auto">+ <div className="overflow-y-auto">+ {isLoading && isChatRoute && (+ <Skeleton className="my-2 flex h-[84px] w-full rounded-2xl border-0 px-3 pb-4 pt-3" />+ )}+ {isLoading && !isChatRoute && (+ <Skeleton className="w-100 mx-2 my-3 flex h-[72px] rounded-md border-0 p-4" />+ )}+ {!isLoading && groups.length === 0 && isChatRoute && (+ <div className="my-2 flex h-[84px] w-full items-center justify-center rounded-2xl border border-border-light bg-transparent px-3 pb-4 pt-3 text-text-primary">+ {localize('com_ui_nothing_found')}+ </div>+ )}+ {!isLoading && groups.length === 0 && !isChatRoute && (+ <div className="w-100 mx-2 my-3 flex h-[72px] items-center justify-center rounded-md border border-border-light bg-transparent p-4 text-text-primary">+ {localize('com_ui_nothing_found')}+ </div>+ )}+ {groups?.map((group) => {+ if (isChatRoute) {+ return (+ <ChatGroupItem+ key={group._id}+ group={group}+ instanceProjectId={instanceProjectId}+ />+ );+ }+ return (+ <DashGroupItem key={group._id} group={group} instanceProjectId={instanceProjectId} />+ );+ })}+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/ListCard.tsx b/client/src/components/Prompts/Groups/ListCard.tsxnew file mode 100644index 0000000000..aa0db66864--- /dev/null+++ b/client/src/components/Prompts/Groups/ListCard.tsx@@ -0,0 +1,36 @@+import CategoryIcon from '~/components/Prompts/Groups/CategoryIcon';++export default function ListCard({+ category,+ name,+ snippet,+ onClick,+ children,+}: {+ category: string;+ name: string;+ snippet: string;+ onClick?: React.MouseEventHandler<HTMLDivElement>;+ children?: React.ReactNode;+}) {+ return (+ <div+ onClick={onClick}+ className="relative my-2 flex w-full cursor-pointer flex-col gap-2 rounded-2xl border px-3 pb-4 pt-3 text-start align-top+ text-[15px] shadow-[0_0_2px_0_rgba(0,0,0,0.05),0_4px_6px_0_rgba(0,0,0,0.02)] transition-all duration-300 ease-in-out hover:bg-gray-100 dark:border-gray-700 dark:hover:bg-gray-700"+ >+ <div className="flex w-full justify-between">+ <div className="flex flex-row gap-2">+ <CategoryIcon category={category} className="icon-md" />+ <h3 className="break-word select-none text-balance text-sm font-semibold text-gray-800 dark:text-gray-200">+ {name}+ </h3>+ </div>+ <div>{children}</div>+ </div>+ <div className="ellipsis select-none text-balance text-sm text-gray-600 dark:text-gray-400">+ {snippet}+ </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/NoPromptGroup.tsx b/client/src/components/Prompts/Groups/NoPromptGroup.tsxnew file mode 100644index 0000000000..c4c36981d1--- /dev/null+++ b/client/src/components/Prompts/Groups/NoPromptGroup.tsx@@ -0,0 +1,27 @@+import { useNavigate } from 'react-router-dom';+import { Button } from '~/components/ui';+import { useLocalize } from '~/hooks';++export default function NoPromptGroup() {+ const navigate = useNavigate();+ const localize = useLocalize();+ return (+ <div className="relative min-h-full w-full px-4">+ <div className="absolute inset-0 flex items-center justify-center">+ <div className="text-center font-bold dark:text-gray-200">+ <h1 className="text-lg font-bold dark:text-gray-200 md:text-2xl">+ {localize('com_ui_prompt_preview_not_shared')}+ </h1>+ <Button+ className="mt-4"+ onClick={() => {+ navigate('/d/prompts');+ }}+ >+ {localize('com_ui_back_to_var', localize('com_ui_prompts'))}+ </Button>+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/Groups/PanelNavigation.tsx b/client/src/components/Prompts/Groups/PanelNavigation.tsxnew file mode 100644index 0000000000..5d20e7f464--- /dev/null+++ b/client/src/components/Prompts/Groups/PanelNavigation.tsx@@ -0,0 +1,38 @@+import { memo } from 'react';+import { Button, ThemeSelector } from '~/components/ui';+import { useLocalize } from '~/hooks';++function PanelNavigation({+ prevPage,+ nextPage,+ hasPreviousPage,+ hasNextPage,+ isFetching,+ isChatRoute,+}: {+ prevPage: () => void;+ nextPage: () => void;+ hasNextPage: boolean;+ hasPreviousPage: boolean;+ isFetching: boolean;+ isChatRoute: boolean;+}) {+ const localize = useLocalize();+ return (+ <div className="my-1 flex justify-between px-4">+ <div className="mb-2 flex gap-2">+ {!isChatRoute && <ThemeSelector returnThemeOnly={true} />}+ </div>+ <div className="mb-2 flex gap-2">+ <Button variant="outline" onClick={() => prevPage()} disabled={!hasPreviousPage}>+ {localize('com_ui_prev')}+ </Button>+ <Button variant="outline" onClick={() => nextPage()} disabled={!hasNextPage || isFetching}>+ {localize('com_ui_next')}+ </Button>+ </div>+ </div>+ );+}++export default memo(PanelNavigation);diff --git a/client/src/components/Prompts/Groups/VariableDialog.tsx b/client/src/components/Prompts/Groups/VariableDialog.tsxnew file mode 100644index 0000000000..30cd0a67de--- /dev/null+++ b/client/src/components/Prompts/Groups/VariableDialog.tsx@@ -0,0 +1,38 @@+import React, { useMemo } from 'react';+import * as DialogPrimitive from '@radix-ui/react-dialog';+import type { TPromptGroup } from 'librechat-data-provider';+import { OGDialog, OGDialogTitle, OGDialogContent } from '~/components/ui';+import { detectVariables } from '~/utils';+import VariableForm from './VariableForm';++interface VariableDialogProps extends Omit<DialogPrimitive.DialogProps, 'onOpenChange'> {+ onClose: () => void;+ group: TPromptGroup;+}++const VariableDialog: React.FC<VariableDialogProps> = ({ open, onClose, group }) => {+ const handleOpenChange = (open: boolean) => {+ if (!open) {+ onClose();+ }+ };++ const hasVariables = useMemo(+ () => detectVariables(group.productionPrompt?.prompt ?? ''),+ [group.productionPrompt?.prompt],+ );+ if (!hasVariables) {+ return null;+ }++ return (+ <OGDialog open={open} onOpenChange={handleOpenChange}>+ <OGDialogContent className="max-w-3xl bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300">+ <OGDialogTitle>{group.name}</OGDialogTitle>+ <VariableForm group={group} onClose={onClose} />+ </OGDialogContent>+ </OGDialog>+ );+};++export default VariableDialog;diff --git a/client/src/components/Prompts/Groups/VariableForm.tsx b/client/src/components/Prompts/Groups/VariableForm.tsxnew file mode 100644index 0000000000..510b201f89--- /dev/null+++ b/client/src/components/Prompts/Groups/VariableForm.tsx@@ -0,0 +1,128 @@+import { useMemo } from 'react';+import { useForm, useFieldArray, Controller, useWatch } from 'react-hook-form';+import type { TPromptGroup } from 'librechat-data-provider';+import { extractVariableInfo, wrapVariable, replaceSpecialVars } from '~/utils';+import { useAuthContext, useLocalize, useSubmitMessage } from '~/hooks';+import { Input } from '~/components/ui';++type FormValues = {+ fields: { variable: string; value: string }[];+};++export default function VariableForm({+ group,+ onClose,+}: {+ group: TPromptGroup;+ onClose: () => void;+}) {+ const localize = useLocalize();+ const { user } = useAuthContext();++ const mainText = useMemo(() => {+ const initialText = group.productionPrompt?.prompt ?? '';+ return replaceSpecialVars({ text: initialText, user });+ }, [group.productionPrompt?.prompt, user]);++ const { allVariables, uniqueVariables, variableIndexMap } = useMemo(+ () => extractVariableInfo(mainText),+ [mainText],+ );++ const { submitPrompt } = useSubmitMessage();+ const { control, handleSubmit } = useForm<FormValues>({+ defaultValues: {+ fields: uniqueVariables.map((variable) => ({ variable: wrapVariable(variable), value: '' })),+ },+ });++ const { fields } = useFieldArray({+ control,+ name: 'fields',+ });++ const fieldValues = useWatch({+ control,+ name: 'fields',+ });++ if (!uniqueVariables.length) {+ return null;+ }++ const generateHighlightedText = () => {+ let tempText = mainText;+ const parts: JSX.Element[] = [];++ allVariables.forEach((variable, index) => {+ const placeholder = `{{${variable}}}`;+ const partsBeforePlaceholder = tempText.split(placeholder);+ const fieldIndex = variableIndexMap.get(variable) as string | number;+ const fieldValue = fieldValues[fieldIndex].value as string;+ parts.push(+ <span key={`before-${index}`}>{partsBeforePlaceholder[0]}</span>,+ <span+ key={`highlight-${index}`}+ className="rounded bg-yellow-100 p-1 font-medium dark:text-gray-800"+ >+ {fieldValue !== '' ? fieldValue : placeholder}+ </span>,+ );++ tempText = partsBeforePlaceholder.slice(1).join(placeholder);+ });++ parts.push(<span key="last-part">{tempText}</span>);++ return parts;+ };++ const onSubmit = (data: FormValues) => {+ let text = mainText;+ data.fields.forEach(({ variable, value }) => {+ if (value) {+ const regex = new RegExp(variable, 'g');+ text = text.replace(regex, value);+ }+ });++ submitPrompt(text);+ onClose();+ };++ return (+ <div className="container mx-auto p-1">+ <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">+ <div className="mb-6 max-h-screen overflow-auto rounded-md bg-gray-100 p-4 dark:bg-gray-700/50 dark:text-gray-300 md:max-h-80">+ <p className="text-md whitespace-pre-wrap">{generateHighlightedText()}</p>+ </div>+ <div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4">+ {fields.map((field, index) => (+ <div key={field.id} className="flex flex-col">+ <Controller+ name={`fields.${index}.value`}+ control={control}+ render={({ field }) => (+ <Input+ {...field}+ id={`fields.${index}.value`}+ className="input text-grey-darker rounded border px-3 py-2 focus:bg-white dark:border-gray-500 dark:focus:bg-gray-700"+ placeholder={uniqueVariables[index]}+ />+ )}+ />+ </div>+ ))}+ </div>+ <div className="flex justify-end">+ <button+ type="submit"+ className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"+ >+ {localize('com_ui_submit')}+ </button>+ </div>+ </form>+ </div>+ );+}diff --git a/client/src/components/Prompts/ManagePrompts.tsx b/client/src/components/Prompts/ManagePrompts.tsxnew file mode 100644index 0000000000..60115a01f0--- /dev/null+++ b/client/src/components/Prompts/ManagePrompts.tsx@@ -0,0 +1,27 @@+import { useCallback } from 'react';+import { useSetRecoilState } from 'recoil';+import { useLocalize, useCustomLink } from '~/hooks';+import { buttonVariants } from '~/components/ui';+import { cn } from '~/utils';+import store from '~/store';++export default function ManagePrompts({ className }: { className?: string }) {+ const localize = useLocalize();+ const setPromptsName = useSetRecoilState(store.promptsName);+ const setPromptsCategory = useSetRecoilState(store.promptsCategory);+ const clickCallback = useCallback(() => {+ setPromptsName('');+ setPromptsCategory('');+ }, [setPromptsName, setPromptsCategory]);++ const clickHandler = useCustomLink('/d/prompts', clickCallback);+ return (+ <a+ className={cn(buttonVariants({ variant: 'outline' }), className)}+ href="/d/prompts"+ onClick={clickHandler}+ >+ {localize('com_ui_manage')}+ </a>+ );+}diff --git a/client/src/components/Prompts/PreviewLabels.tsx b/client/src/components/Prompts/PreviewLabels.tsxnew file mode 100644index 0000000000..9dca0dd2d9--- /dev/null+++ b/client/src/components/Prompts/PreviewLabels.tsx@@ -0,0 +1,69 @@+import { useState } from 'react';+import { Cross1Icon } from '@radix-ui/react-icons';+import type { TPrompt } from 'librechat-data-provider';+import { useUpdatePromptLabels } from '~/data-provider';+import { Input } from '~/components/ui';++const PromptForm = ({ selectedPrompt }: { selectedPrompt?: TPrompt }) => {+ const [labelInput, setLabelInput] = useState<string>('');+ const [labels, setLabels] = useState<string[]>([]);+ const updatePromptLabelsMutation = useUpdatePromptLabels();++ const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {+ setLabelInput(e.target.value);+ };++ const handleKeyPress = (e: React.KeyboardEvent<HTMLInputElement>) => {+ if (e.key === 'Enter' && labelInput.trim()) {+ const newLabels = [...labels, labelInput.trim()];+ setLabels(newLabels);+ setLabelInput('');+ updatePromptLabelsMutation.mutate({+ id: selectedPrompt?._id || '',+ payload: { labels: newLabels },+ });+ }+ };++ return (+ <>+ <Input+ type="text"+ className="mb-4"+ placeholder="+ Add Labels"+ // defaultValue={selectedPrompt?.labels.join(', ')}+ value={labelInput}+ onChange={handleInputChange}+ onKeyPress={handleKeyPress}+ />+ <h3 className="rounded-t-lg border border-gray-300 px-4 text-base font-semibold">Labels</h3>+ <div className="mb-4 flex w-full flex-row flex-wrap rounded-b-lg border border-gray-300 p-4">+ {labels.length ? (+ labels.map((label, index) => (+ <label+ className="mb-1 mr-1 flex items-center gap-x-2 rounded-full border px-2"+ key={index}+ >+ {label}+ <Cross1Icon+ onClick={() => {+ const newLabels = labels.filter((l) => l !== label);+ setLabels(newLabels);+ updatePromptLabelsMutation.mutate({+ id: selectedPrompt?._id || '',+ payload: { labels: newLabels },+ });+ }}+ className="cursor-pointer"+ />+ </label>+ ))+ ) : (+ <label className="rounded-full border px-2">No Labels</label>+ )}+ </div>+ </>+ );+};++export default PromptForm;diff --git a/client/src/components/Prompts/PreviewPrompt.tsx b/client/src/components/Prompts/PreviewPrompt.tsxnew file mode 100644index 0000000000..3f6523d856--- /dev/null+++ b/client/src/components/Prompts/PreviewPrompt.tsx@@ -0,0 +1,25 @@+import type { TPromptGroup } from 'librechat-data-provider';+import { OGDialogContent, OGDialog } from '~/components/ui';+import PromptDetails from './PromptDetails';++const PreviewPrompt = ({+ group,+ open,+ onOpenChange,+}: {+ group: TPromptGroup;+ open: boolean;+ onOpenChange: (open: boolean) => void;+}) => {+ return (+ <OGDialog open={open} onOpenChange={onOpenChange}>+ <OGDialogContent className="max-w-3xl bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300">+ <div className="p-2">+ <PromptDetails group={group} />+ </div>+ </OGDialogContent>+ </OGDialog>+ );+};++export default PreviewPrompt;diff --git a/client/src/components/Prompts/PromptDetails.tsx b/client/src/components/Prompts/PromptDetails.tsxnew file mode 100644index 0000000000..83e9837ec2--- /dev/null+++ b/client/src/components/Prompts/PromptDetails.tsx@@ -0,0 +1,47 @@+import type { TPromptGroup } from 'librechat-data-provider';+import CategoryIcon from './Groups/CategoryIcon';+import PromptVariables from './PromptVariables';+import Description from './Description';+import { useLocalize } from '~/hooks';++const PromptDetails = ({ group }: { group: TPromptGroup }) => {+ const localize = useLocalize();+ if (!group) {+ return null;+ }++ const promptText = group.productionPrompt?.prompt ?? '';++ return (+ <div>+ <div className="flex flex-col items-center justify-between px-4 dark:text-gray-200 sm:flex-row">+ <div className="mb-1 flex flex-row items-center font-bold sm:text-xl md:mb-0 md:text-2xl">+ <div className="mb-1 flex items-center md:mb-0">+ <div className="rounded p-2">+ {(group.category?.length ?? 0) > 0 ? (+ <CategoryIcon category={group.category ?? ''} />+ ) : null}+ </div>+ <span className="mr-2 border border-transparent p-2">{group.name}</span>+ </div>+ </div>+ </div>+ <div className="flex h-full w-full flex-col md:flex-row">+ <div className="flex-1 overflow-y-auto border-gray-300 p-0 dark:border-gray-600 md:max-h-[calc(100vh-150px)] md:p-4">+ <div>+ <h2 className="flex items-center justify-between rounded-t-lg border border-gray-300 py-2 pl-4 text-base font-semibold dark:border-gray-600 dark:text-gray-200">+ {localize('com_ui_text_prompt')}+ </h2>+ <div className="group relative mb-4 min-h-32 rounded-b-lg border border-gray-300 p-4 transition-all duration-150 dark:border-gray-600">+ <span className="block break-words px-2 py-1 dark:text-gray-200">{promptText}</span>+ </div>+ </div>+ <PromptVariables promptText={promptText} />+ <Description initialValue={group.oneliner} disabled={true} />+ </div>+ </div>+ </div>+ );+};++export default PromptDetails;diff --git a/client/src/components/Prompts/PromptEditor.tsx b/client/src/components/Prompts/PromptEditor.tsxnew file mode 100644index 0000000000..11c6635b5f--- /dev/null+++ b/client/src/components/Prompts/PromptEditor.tsx@@ -0,0 +1,82 @@+import { useMemo, memo } from 'react';+import { useRecoilValue } from 'recoil';+import { EditIcon } from 'lucide-react';+import { Controller, useFormContext, useFormState } from 'react-hook-form';+import AlwaysMakeProd from '~/components/Prompts/Groups/AlwaysMakeProd';+import { SaveIcon, CrossIcon } from '~/components/svg';+import { TextareaAutosize } from '~/components/ui';+import { useLocalize } from '~/hooks';+import { cn } from '~/utils';+import store from '~/store';++const { PromptsEditorMode, promptsEditorMode } = store;++type Props = {+ name: string;+ isEditing: boolean;+ setIsEditing: React.Dispatch<React.SetStateAction<boolean>>;+};++const PromptEditor: React.FC<Props> = ({ name, isEditing, setIsEditing }) => {+ const localize = useLocalize();+ const { control } = useFormContext();+ const editorMode = useRecoilValue(promptsEditorMode);+ const { dirtyFields } = useFormState({ control: control });++ const EditorIcon = useMemo(() => {+ if (isEditing && !dirtyFields.prompt) {+ return CrossIcon;+ }+ return isEditing ? SaveIcon : EditIcon;+ }, [isEditing, dirtyFields.prompt]);++ return (+ <div>+ <h2 className="flex items-center justify-between rounded-t-lg border border-gray-300 py-2 pl-4 text-base font-semibold dark:border-gray-600 dark:text-gray-200">+ {localize('com_ui_text_prompt')}+ <div className="flex flex-row gap-6">+ {editorMode === PromptsEditorMode.ADVANCED && (+ <AlwaysMakeProd className="hidden sm:flex" />+ )}+ <button type="button" onClick={() => setIsEditing((prev) => !prev)} className="mr-2">+ <EditorIcon+ className={cn(+ 'icon-lg',+ isEditing ? 'p-[0.05rem]' : 'text-gray-400 hover:text-gray-600',+ )}+ />+ </button>+ </div>+ </h2>+ <div+ className={cn(+ 'group relative mb-4 min-h-32 rounded-b-lg border border-gray-300 p-4 transition-all duration-150 hover:opacity-90 dark:border-gray-600',+ { 'cursor-pointer hover:bg-gray-100/50 dark:hover:bg-gray-100/10': !isEditing },+ )}+ onClick={() => !isEditing && setIsEditing(true)}+ >+ {!isEditing && (+ <EditIcon className="icon-xl absolute inset-0 m-auto hidden opacity-25 group-hover:block dark:text-gray-200" />+ )}+ <Controller+ name={name}+ control={control}+ render={({ field }) =>+ isEditing ? (+ <TextareaAutosize+ {...field}+ className="w-full rounded border border-gray-300 bg-transparent px-2 py-1 focus:outline-none dark:border-gray-600 dark:text-gray-200"+ minRows={3}+ onBlur={() => setIsEditing(false)}+ />+ ) : (+ <span className="block break-words px-2 py-1 dark:text-gray-200">{field.value}</span>+ )+ }+ />+ </div>+ </div>+ );+};++export default memo(PromptEditor);diff --git a/client/src/components/Prompts/PromptForm.tsx b/client/src/components/Prompts/PromptForm.tsxnew file mode 100644index 0000000000..f9160301a8--- /dev/null+++ b/client/src/components/Prompts/PromptForm.tsx@@ -0,0 +1,319 @@+import { Rocket } from 'lucide-react';+import debounce from 'lodash/debounce';+import { useRecoilValue } from 'recoil';+import { useForm, FormProvider } from 'react-hook-form';+import { useEffect, useState, useMemo, useCallback, useRef } from 'react';+import { useNavigate, useParams, useOutletContext } from 'react-router-dom';+import { PermissionTypes, Permissions, SystemRoles } from 'librechat-data-provider';+import type { TCreatePrompt } from 'librechat-data-provider';+import {+ useGetPrompts,+ useCreatePrompt,+ useDeletePrompt,+ useGetPromptGroup,+ useUpdatePromptGroup,+ useMakePromptProduction,+} from '~/data-provider';+import { useAuthContext, usePromptGroupsNav, useHasAccess } from '~/hooks';+import CategorySelector from './Groups/CategorySelector';+import AlwaysMakeProd from './Groups/AlwaysMakeProd';+import NoPromptGroup from './Groups/NoPromptGroup';+import { Button, Skeleton } from '~/components/ui';+import PromptVariables from './PromptVariables';+import PromptVersions from './PromptVersions';+import DeleteConfirm from './DeleteVersion';+import PromptDetails from './PromptDetails';+import { findPromptGroup } from '~/utils';+import PromptEditor from './PromptEditor';+import SkeletonForm from './SkeletonForm';+import Description from './Description';+import SharePrompt from './SharePrompt';+import PromptName from './PromptName';+import store from '~/store';++const { PromptsEditorMode, promptsEditorMode } = store;++const PromptForm = () => {+ const params = useParams();+ const navigate = useNavigate();+ const { user } = useAuthContext();+ const editorMode = useRecoilValue(promptsEditorMode);+ const alwaysMakeProd = useRecoilValue(store.alwaysMakeProd);+ const { data: group, isLoading: isLoadingGroup } = useGetPromptGroup(params.promptId || '');+ const { data: prompts = [], isLoading: isLoadingPrompts } = useGetPrompts(+ { groupId: params.promptId ?? '' },+ { enabled: !!params.promptId },+ );++ const prevIsEditingRef = useRef(false);+ const [isEditing, setIsEditing] = useState(false);+ const [initialLoad, setInitialLoad] = useState(true);+ const [selectionIndex, setSelectionIndex] = useState<number>(0);+ const isOwner = useMemo(() => user?.id === group?.author, [user, group]);+ const selectedPrompt = useMemo(() => prompts[selectionIndex], [prompts, selectionIndex]);++ const hasShareAccess = useHasAccess({+ permissionType: PermissionTypes.PROMPTS,+ permission: Permissions.SHARED_GLOBAL,+ });++ const methods = useForm({+ defaultValues: {+ prompt: '',+ promptName: group?.name || '',+ category: group?.category || '',+ },+ });++ const { handleSubmit, setValue, reset, watch } = methods;+ const promptText = watch('prompt');++ const createPromptMutation = useCreatePrompt({+ onMutate: (variables) => {+ reset(+ {+ prompt: variables.prompt.prompt,+ category: variables.group?.category || '',+ },+ { keepDirtyValues: true },+ );+ },+ onSuccess(data) {+ if (alwaysMakeProd && data.prompt._id && data.prompt.groupId) {+ makeProductionMutation.mutate(+ {+ id: data.prompt._id,+ groupId: data.prompt.groupId,+ productionPrompt: { prompt: data.prompt.prompt },+ },+ {+ onSuccess: () => setSelectionIndex(0),+ },+ );+ }++ reset({+ prompt: data.prompt.prompt,+ promptName: data.group?.name || '',+ category: data.group?.category || '',+ });++ setSelectionIndex(0);+ },+ });+ const updateGroupMutation = useUpdatePromptGroup();+ const makeProductionMutation = useMakePromptProduction();+ const deletePromptMutation = useDeletePrompt({+ onSuccess: (response) => {+ if (response.promptGroup) {+ navigate('/d/prompts');+ } else {+ setSelectionIndex(0);+ }+ },+ });++ const onSave = useCallback(+ (value: string) => {+ if (!value) {+ // TODO: show toast, cannot be empty.+ return;+ }+ const tempPrompt: TCreatePrompt = {+ prompt: {+ type: selectedPrompt?.type ?? 'text',+ groupId: selectedPrompt?.groupId ?? '',+ prompt: value,+ },+ };++ if (value === selectedPrompt?.prompt) {+ return;+ }++ createPromptMutation.mutate(tempPrompt);+ },+ [selectedPrompt, createPromptMutation],+ );++ const handleLoadingComplete = useCallback(() => {+ if (isLoadingGroup || isLoadingPrompts) {+ return;+ }+ setInitialLoad(false);+ }, [isLoadingGroup, isLoadingPrompts]);++ useEffect(() => {+ if (prevIsEditingRef.current && !isEditing) {+ handleSubmit((data) => onSave(data.prompt))();+ }+ prevIsEditingRef.current = isEditing;+ }, [isEditing, onSave, handleSubmit]);++ useEffect(() => {+ if (editorMode === PromptsEditorMode.SIMPLE) {+ const productionIndex = prompts.findIndex((prompt) => prompt._id === group?.productionId);+ setSelectionIndex(productionIndex !== -1 ? productionIndex : 0);+ }++ handleLoadingComplete();+ }, [params.promptId, editorMode, group?.productionId, prompts, handleLoadingComplete]);++ useEffect(() => {+ setValue('prompt', selectedPrompt?.prompt || '', { shouldDirty: false });+ setValue('category', group?.category || '', { shouldDirty: false });+ }, [selectedPrompt, group?.category, setValue]);++ const debouncedUpdateOneliner = useCallback(+ debounce((oneliner: string) => {+ if (!group) {+ return console.warn('Group not found');+ }++ updateGroupMutation.mutate({ id: group._id || '', payload: { oneliner } });+ }, 950),+ [updateGroupMutation, group],+ );++ const { groupsQuery } = useOutletContext<ReturnType<typeof usePromptGroupsNav>>();++ if (initialLoad) {+ return <SkeletonForm />;+ }++ if (!isOwner && groupsQuery.data && user?.role !== SystemRoles.ADMIN) {+ const fetchedPrompt = findPromptGroup(+ groupsQuery.data,+ (group) => group._id === params.promptId,+ );+ if (!fetchedPrompt) {+ return <NoPromptGroup />;+ }++ return <PromptDetails group={fetchedPrompt} />;+ }++ if (!group) {+ return null;+ }++ return (+ <FormProvider {...methods}>+ <form onSubmit={handleSubmit((data) => onSave(data.prompt))}>+ <div>+ <div className="flex flex-col items-center justify-between px-4 dark:text-gray-200 sm:flex-row">+ {isLoadingGroup ? (+ <Skeleton className="mb-1 flex h-10 w-32 flex-row items-center font-bold sm:text-xl md:mb-0 md:h-12 md:text-2xl" />+ ) : (+ <PromptName+ name={group?.name}+ onSave={(value) => {+ if (!group) {+ return console.warn('Group not found');+ }+ updateGroupMutation.mutate({ id: group._id || '', payload: { name: value } });+ }}+ />+ )}+ <div className="flex h-10 flex-row gap-x-2">+ <CategorySelector+ className="w-48 md:w-56"+ currentCategory={group?.category}+ onValueChange={(value) =>+ updateGroupMutation.mutate({+ id: group?._id || '',+ payload: { name: group?.name || '', category: value },+ })+ }+ />+ {hasShareAccess && <SharePrompt group={group} disabled={isLoadingGroup} />}+ {editorMode === PromptsEditorMode.ADVANCED && (+ <Button+ size={'sm'}+ className="h-10 border border-transparent bg-green-500 transition-all hover:bg-green-600 dark:bg-green-500 dark:hover:bg-green-600"+ variant={'default'}+ onClick={() => {+ const { _id: promptVersionId = '', prompt } = selectedPrompt;+ makeProductionMutation.mutate(+ {+ id: promptVersionId || '',+ groupId: group?._id || '',+ productionPrompt: { prompt },+ },+ {+ onSuccess: (_data, variables) => {+ const productionIndex = prompts.findIndex(+ (prompt) => variables.id === prompt._id,+ );+ setSelectionIndex(productionIndex);+ },+ },+ );+ }}+ disabled={+ isLoadingGroup ||+ selectedPrompt?._id === group?.productionId ||+ makeProductionMutation.isLoading+ }+ >+ <Rocket className="cursor-pointer text-white" />+ </Button>+ )}+ <DeleteConfirm+ name={group.name}+ disabled={isLoadingGroup}+ selectHandler={() => {+ deletePromptMutation.mutate({+ _id: selectedPrompt?._id || '',+ groupId: group?._id || '',+ });+ }}+ />+ </div>+ </div>+ {editorMode === PromptsEditorMode.ADVANCED && (+ <div className="mt-4 flex items-center justify-center text-text-primary sm:hidden">+ <AlwaysMakeProd />+ </div>+ )}+ <div className="flex h-full w-full flex-col md:flex-row">+ {/* Left Section */}+ <div className="flex-1 overflow-y-auto border-r border-gray-300 p-4 dark:border-gray-600 md:max-h-[calc(100vh-150px)]">+ {isLoadingPrompts ? (+ <Skeleton className="h-96" />+ ) : (+ <>+ <PromptEditor name="prompt" isEditing={isEditing} setIsEditing={setIsEditing} />+ <PromptVariables promptText={promptText} />+ <Description+ initialValue={group?.oneliner ?? ''}+ onValueChange={debouncedUpdateOneliner}+ />+ </>+ )}+ </div>+ {/* Right Section */}+ {editorMode === PromptsEditorMode.ADVANCED && (+ <div className="flex-1 overflow-y-auto p-4 md:max-h-[calc(100vh-150px)] md:w-1/4 md:max-w-[35%] lg:max-w-[30%] xl:max-w-[25%]">+ {isLoadingPrompts ? (+ <Skeleton className="h-96 w-full" />+ ) : (+ !!prompts.length && (+ <PromptVersions+ group={group}+ prompts={prompts}+ selectionIndex={selectionIndex}+ setSelectionIndex={setSelectionIndex}+ />+ )+ )}+ </div>+ )}+ </div>+ </div>+ </form>+ </FormProvider>+ );+};++export default PromptForm;diff --git a/client/src/components/Prompts/PromptName.tsx b/client/src/components/Prompts/PromptName.tsxnew file mode 100644index 0000000000..77edbe726c--- /dev/null+++ b/client/src/components/Prompts/PromptName.tsx@@ -0,0 +1,101 @@+import React, { useEffect, useState, useRef } from 'react';+import { EditIcon, SaveIcon } from '~/components/svg';++type Props = {+ name?: string;+ onSave: (newName: string) => void;+};++const PromptName: React.FC<Props> = ({ name, onSave }) => {+ const inputRef = useRef<HTMLInputElement>(null);+ const blurTimeoutRef = useRef<NodeJS.Timeout>();+ const [isEditing, setIsEditing] = useState(false);+ const [newName, setNewName] = useState(name);++ const handleEditClick = () => {+ setIsEditing(true);+ };++ const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {+ setNewName(e.target.value);+ };++ const saveName = () => {+ const savedName = newName?.trim();+ onSave(savedName || '');+ setIsEditing(false);+ };++ const handleSaveClick: React.MouseEventHandler<HTMLButtonElement> = () => {+ saveName();+ clearTimeout(blurTimeoutRef.current);+ };++ const handleBlur = () => {+ blurTimeoutRef.current = setTimeout(() => {+ if (document.activeElement !== inputRef.current) {+ setIsEditing(false);+ setNewName(name);+ }+ }, 200);+ };++ const handleKeyDown = (e: React.KeyboardEvent) => {+ if (e.key === 'Escape') {+ setIsEditing(false);+ setNewName(name);+ }+ if (e.key === 'Enter' || e.key === 'Tab') {+ saveName();+ }+ };++ useEffect(() => {+ if (isEditing) {+ inputRef.current?.focus();+ }+ }, [isEditing]);++ useEffect(() => {+ setNewName(name);+ }, [name]);++ return (+ <div className="mb-1 flex flex-row items-center font-bold sm:text-xl md:mb-0 md:text-2xl">+ {isEditing ? (+ <div className="mb-1 flex items-center md:mb-0">+ <input+ type="text"+ value={newName ?? ''}+ onChange={handleInputChange}+ onBlur={handleBlur}+ onKeyDown={handleKeyDown}+ ref={inputRef}+ className="mr-2 w-56 rounded-md border bg-transparent p-2 focus:outline-none dark:border-gray-600 md:w-auto"+ autoFocus={true}+ />+ <button+ type="button"+ onClick={handleSaveClick}+ className="rounded p-2 hover:bg-gray-300/50 dark:hover:bg-gray-700"+ >+ <SaveIcon className="icon-md" size="1.2em" />+ </button>+ </div>+ ) : (+ <div className="mb-1 flex items-center md:mb-0">+ <span className="border border-transparent p-2">{newName}</span>+ <button+ type="button"+ onClick={handleEditClick}+ className="rounded p-2 hover:bg-gray-300/50 dark:hover:bg-gray-700"+ >+ <EditIcon className="icon-md" />+ </button>+ </div>+ )}+ </div>+ );+};++export default PromptName;diff --git a/client/src/components/Prompts/PromptVariables.tsx b/client/src/components/Prompts/PromptVariables.tsxnew file mode 100644index 0000000000..e3e30eb3a9--- /dev/null+++ b/client/src/components/Prompts/PromptVariables.tsx@@ -0,0 +1,59 @@+import { useMemo } from 'react';+import { Variable } from 'lucide-react';+import { extractUniqueVariables, cn } from '~/utils';+import { Separator } from '~/components/ui';+import { useLocalize } from '~/hooks';++const specialVariables = {+ current_date: true,+ current_user: true,+};++const specialVariableClasses =+ 'bg-yellow-500/25 text-yellow-600 dark:border-yellow-500/50 dark:bg-transparent dark:text-yellow-500/90';++const PromptVariables = ({ promptText }: { promptText: string }) => {+ const localize = useLocalize();++ const variables = useMemo(() => {+ return extractUniqueVariables(promptText || '');+ }, [promptText]);++ return (+ <>+ <h3 className="flex items-center gap-2 rounded-t-lg border border-border-medium py-2 pl-4 text-base font-semibold text-text-secondary">+ <Variable className="icon-sm" />+ {localize('com_ui_variables')}+ </h3>+ <div className="mb-4 flex w-full flex-row flex-wrap rounded-b-lg border border-border-medium p-4 md:min-h-16">+ {variables.length ? (+ <div className="flex h-7 items-center">+ {variables.map((variable, index) => (+ <label+ className={cn(+ 'mr-1 rounded-full border border-border-medium px-2 text-text-secondary',+ specialVariables[variable.toLowerCase()] ? specialVariableClasses : '',+ )}+ key={index}+ >+ {specialVariables[variable.toLowerCase()] ? variable.toLowerCase() : variable}+ </label>+ ))}+ </div>+ ) : (+ <div className="flex h-7 items-center">+ <span className="text-xs text-text-tertiary md:text-sm">+ {localize('com_ui_variables_info')}+ </span>+ </div>+ )}+ <Separator className="my-3 bg-border-medium" />+ <span className="text-xs text-text-tertiary md:text-sm">+ {localize('com_ui_special_variables')}+ </span>+ </div>+ </>+ );+};++export default PromptVariables;diff --git a/client/src/components/Prompts/PromptVersions.tsx b/client/src/components/Prompts/PromptVersions.tsxnew file mode 100644index 0000000000..86415e3c80--- /dev/null+++ b/client/src/components/Prompts/PromptVersions.tsx@@ -0,0 +1,89 @@+import React from 'react';+import { format } from 'date-fns';+import { Layers3 } from 'lucide-react';+import type { TPrompt, TPromptGroup } from 'librechat-data-provider';+import { useLocalize } from '~/hooks';+import { Tag } from '~/components/ui';+import { cn } from '~/utils';++const PromptVersions = ({+ prompts,+ group,+ selectionIndex,+ setSelectionIndex,+}: {+ prompts: TPrompt[];+ group?: TPromptGroup;+ selectionIndex: React.SetStateAction<number>;+ setSelectionIndex: React.Dispatch<React.SetStateAction<number>>;+}) => {+ const localize = useLocalize();+ return (+ <>+ <h2 className="mb-4 flex gap-2 text-base font-semibold dark:text-gray-200">+ <Layers3 className="icon-lg text-green-500" />+ {localize('com_ui_versions')}+ </h2>+ <ul className="flex flex-col gap-3">+ {prompts.map((prompt: TPrompt, index: number) => {+ const tags: string[] = [];+ if (index === 0) {+ tags.push('latest');+ }++ if (prompt._id === group?.productionId) {+ tags.push('production');+ }++ return (+ <li+ key={index}+ className={cn(+ 'relative cursor-pointer rounded-lg border p-4 dark:border-gray-600 dark:bg-transparent',+ index === selectionIndex ? 'bg-gray-100 dark:bg-gray-700' : 'bg-white',+ )}+ onClick={() => setSelectionIndex(index)}+ >+ <p className="font-bold dark:text-gray-200">+ {localize('com_ui_version_var', `${prompts.length - index}`)}+ </p>+ <p className="absolute right-4 top-5 whitespace-nowrap text-xs text-gray-600 dark:text-gray-400">+ {format(new Date(prompt.createdAt), 'yyyy-MM-dd HH:mm')}+ </p>+ {tags.length > 0 && (+ <span className="flex flex-wrap gap-1 text-sm">+ {tags.map((tag, i) => {+ return (+ <Tag+ key={`${tag}-${i}`}+ label={tag}+ className={cn(+ 'w-fit border border-transparent bg-blue-100 text-blue-500 dark:border-blue-500 dark:bg-transparent dark:text-blue-500',+ tag === 'production' &&+ 'bg-green-100 text-green-500 dark:border-green-500 dark:bg-transparent dark:text-green-500',+ )}+ labelClassName="flex m-0 justify-center gap-1"+ LabelNode={+ tag === 'production' ? (+ <div className="flex items-center ">+ <span className="slow-pulse h-[0.4rem] w-[0.4rem] rounded-full bg-green-400" />+ </div>+ ) : null+ }+ />+ );+ })}+ </span>+ )}+ {group?.authorName && (+ <p className="text-xs text-gray-600 dark:text-gray-400">by {group.authorName}</p>+ )}+ </li>+ );+ })}+ </ul>+ </>+ );+};++export default PromptVersions;diff --git a/client/src/components/Prompts/PromptsAccordion.tsx b/client/src/components/Prompts/PromptsAccordion.tsxnew file mode 100644index 0000000000..ef455a80a7--- /dev/null+++ b/client/src/components/Prompts/PromptsAccordion.tsx@@ -0,0 +1,20 @@+import PromptSidePanel from '~/components/Prompts/Groups/GroupSidePanel';+import AutoSendPrompt from '~/components/Prompts/Groups/AutoSendPrompt';+import FilterPrompts from '~/components/Prompts/Groups/FilterPrompts';+import ManagePrompts from '~/components/Prompts/ManagePrompts';+import { usePromptGroupsNav } from '~/hooks';++export default function PromptsAccordion() {+ const groupsNav = usePromptGroupsNav();+ return (+ <div className="flex h-full w-full flex-col">+ <PromptSidePanel className="lg:w-full xl:w-full" {...groupsNav}>+ <div className="flex w-full flex-row items-center justify-between px-2 pt-2">+ <ManagePrompts className="select-none" />+ <AutoSendPrompt className="text-xs dark:text-white" />+ </div>+ <FilterPrompts setName={groupsNav.setName} className="items-center justify-center px-2" />+ </PromptSidePanel>+ </div>+ );+}diff --git a/client/src/components/Prompts/PromptsView.tsx b/client/src/components/Prompts/PromptsView.tsxnew file mode 100644index 0000000000..09a931d358--- /dev/null+++ b/client/src/components/Prompts/PromptsView.tsx@@ -0,0 +1,58 @@+import { useMemo, useEffect } from 'react';+import { Outlet, useParams, useNavigate } from 'react-router-dom';+import { PermissionTypes, Permissions } from 'librechat-data-provider';+import AutoSendPrompt from '~/components/Prompts/Groups/AutoSendPrompt';+import FilterPrompts from '~/components/Prompts/Groups/FilterPrompts';+import DashBreadcrumb from '~/routes/Layouts/DashBreadcrumb';+import { usePromptGroupsNav, useHasAccess } from '~/hooks';+import GroupSidePanel from './Groups/GroupSidePanel';+import { cn } from '~/utils';++export default function PromptsView() {+ const params = useParams();+ const navigate = useNavigate();+ const groupsNav = usePromptGroupsNav();+ const isDetailView = useMemo(() => !!(params.promptId || params['*'] === 'new'), [params]);+ const hasAccess = useHasAccess({+ permissionType: PermissionTypes.PROMPTS,+ permission: Permissions.USE,+ });++ useEffect(() => {+ let timeoutId: ReturnType<typeof setTimeout>;+ if (!hasAccess) {+ timeoutId = setTimeout(() => {+ navigate('/c/new');+ }, 1000);+ }+ return () => {+ clearTimeout(timeoutId);+ };+ }, [hasAccess, navigate]);++ if (!hasAccess) {+ return null;+ }++ return (+ <div className="flex h-screen w-full flex-col bg-[#f9f9f9] p-0 dark:bg-transparent lg:p-2">+ <DashBreadcrumb />+ <div className="flex w-full flex-grow flex-row divide-x overflow-hidden dark:divide-gray-600">+ <GroupSidePanel isDetailView={isDetailView} {...groupsNav}>+ <div className="mx-2 mt-1 flex flex-row items-center justify-between">+ <FilterPrompts setName={groupsNav.setName} />+ <AutoSendPrompt className="text-xs dark:text-white" />+ </div>+ </GroupSidePanel>+ <div+ className={cn(+ 'w-full overflow-y-auto lg:w-3/4 xl:w-3/4',+ isDetailView ? 'block' : 'hidden md:block',+ )}+ >+ <Outlet context={groupsNav} />+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/SharePrompt.tsx b/client/src/components/Prompts/SharePrompt.tsxnew file mode 100644index 0000000000..696b6a9490--- /dev/null+++ b/client/src/components/Prompts/SharePrompt.tsx@@ -0,0 +1,151 @@+import React, { useEffect, useMemo } from 'react';+import { Share2Icon } from 'lucide-react';+import { useForm, Controller } from 'react-hook-form';+import { Permissions } from 'librechat-data-provider';+import { useGetStartupConfig } from 'librechat-data-provider/react-query';+import type {+ TPromptGroup,+ TStartupConfig,+ TUpdatePromptGroupPayload,+} from 'librechat-data-provider';+import {+ OGDialog,+ OGDialogTitle,+ OGDialogContent,+ OGDialogTrigger,+ OGDialogClose,+} from '~/components/ui';+import { useUpdatePromptGroup } from '~/data-provider';+import { Button, Switch } from '~/components/ui';+import { useToastContext } from '~/Providers';+import { useLocalize } from '~/hooks';++type FormValues = {+ [Permissions.SHARED_GLOBAL]: boolean;+};++const SharePrompt = ({ group, disabled }: { group?: TPromptGroup; disabled: boolean }) => {+ const localize = useLocalize();+ const { showToast } = useToastContext();+ const updateGroup = useUpdatePromptGroup();+ const { data: startupConfig = {} as TStartupConfig, isFetching } = useGetStartupConfig();+ const { instanceProjectId } = startupConfig;+ const groupIsGlobal = useMemo(+ () => !!group?.projectIds?.includes(instanceProjectId),+ [group, instanceProjectId],+ );++ const {+ control,+ setValue,+ getValues,+ handleSubmit,+ formState: { isSubmitting },+ } = useForm<FormValues>({+ mode: 'onChange',+ defaultValues: {+ [Permissions.SHARED_GLOBAL]: groupIsGlobal,+ },+ });++ useEffect(() => {+ setValue(Permissions.SHARED_GLOBAL, groupIsGlobal);+ }, [groupIsGlobal, setValue]);++ if (!group || !instanceProjectId) {+ return null;+ }++ const onSubmit = (data: FormValues) => {+ if (!group._id || !instanceProjectId) {+ return;+ }++ const payload = {} as TUpdatePromptGroupPayload;++ if (data[Permissions.SHARED_GLOBAL]) {+ payload.projectIds = [startupConfig.instanceProjectId];+ } else {+ payload.removeProjectIds = [startupConfig.instanceProjectId];+ }++ updateGroup.mutate({+ id: group._id,+ payload,+ });+ };++ return (+ <OGDialog>+ <OGDialogTrigger asChild>+ <Button+ variant={'default'}+ size={'sm'}+ className="h-10 w-10 border border-transparent bg-blue-500/90 transition-all hover:bg-blue-600 dark:bg-blue-600 dark:hover:bg-blue-800"+ disabled={disabled}+ >+ <Share2Icon className="cursor-pointer text-white " />+ </Button>+ </OGDialogTrigger>+ <OGDialogContent className="bg-white dark:border-gray-700 dark:bg-gray-850 dark:text-gray-300">+ <OGDialogTitle>{localize('com_ui_share_var', `"${group.name}"`)}</OGDialogTitle>+ <form className="p-2" onSubmit={handleSubmit(onSubmit)}>+ <div className="mb-4 flex items-center justify-between gap-2 py-4">+ <label+ className="cursor-pointer select-none"+ htmlFor={Permissions.SHARED_GLOBAL}+ onClick={() =>+ setValue(Permissions.SHARED_GLOBAL, !getValues(Permissions.SHARED_GLOBAL), {+ shouldDirty: true,+ })+ }+ >+ {localize('com_ui_share_to_all_users')}+ {groupIsGlobal && (+ <span className="ml-2 text-xs">{localize('com_ui_prompt_shared_to_all')}</span>+ )}+ </label>+ <Controller+ name={Permissions.SHARED_GLOBAL}+ control={control}+ disabled={isFetching || updateGroup.isLoading || !instanceProjectId}+ rules={{+ validate: (value) => {+ const isValid = !(value && groupIsGlobal);+ if (!isValid) {+ showToast({+ message: localize('com_ui_prompt_already_shared_to_all'),+ status: 'warning',+ });+ }+ return isValid;+ },+ }}+ render={({ field }) => (+ <Switch+ {...field}+ checked={field.value}+ onCheckedChange={field.onChange}+ value={field?.value?.toString()}+ />+ )}+ />+ </div>+ <div className="flex justify-end">+ <OGDialogClose asChild>+ <button+ type="submit"+ disabled={isSubmitting || isFetching}+ className="btn rounded bg-green-500 font-bold text-white transition-all hover:bg-green-600"+ >+ {localize('com_ui_save')}+ </button>+ </OGDialogClose>+ </div>+ </form>+ </OGDialogContent>+ </OGDialog>+ );+};++export default SharePrompt;diff --git a/client/src/components/Prompts/SkeletonForm.tsx b/client/src/components/Prompts/SkeletonForm.tsxnew file mode 100644index 0000000000..f4dcbd68b7--- /dev/null+++ b/client/src/components/Prompts/SkeletonForm.tsx@@ -0,0 +1,17 @@+import { Skeleton } from '~/components/ui';++export default function SkeletonForm() {+ return (+ <div>+ <div className="flex flex-col items-center justify-between px-4 dark:text-gray-200 sm:flex-row">+ <Skeleton className="mb-1 flex h-10 w-32 flex-row items-center font-bold sm:text-xl md:mb-0 md:h-12 md:text-2xl" />+ </div>+ <div className="flex h-full w-full flex-col md:flex-row">+ {/* Left Section */}+ <div className="flex-1 overflow-y-auto border-r border-border-medium-alt p-4 md:max-h-[calc(100vh-150px)]">+ <Skeleton className="h-96" />+ </div>+ </div>+ </div>+ );+}diff --git a/client/src/components/Prompts/index.ts b/client/src/components/Prompts/index.tsnew file mode 100644index 0000000000..3dbb515484--- /dev/null+++ b/client/src/components/Prompts/index.ts@@ -0,0 +1,10 @@+export { default as PromptName } from './PromptName';+export { default as PromptsView } from './PromptsView';+export { default as PromptEditor } from './PromptEditor';+export { default as PromptForm } from './PromptForm';+export { default as PreviewLabels } from './PreviewLabels';+export { default as PromptGroupsList } from './Groups/List';+export { default as DashGroupItem } from './Groups/DashGroupItem';+export { default as EmptyPromptPreview } from './EmptyPromptPreview';+export { default as PromptSidePanel } from './Groups/GroupSidePanel';+export { default as CreatePromptForm } from './Groups/CreatePromptForm';diff --git a/client/src/components/SidePanel/Builder/AssistantAvatar.tsx b/client/src/components/SidePanel/Builder/AssistantAvatar.tsxindex e5a736b340..2cfe9bfd62 100644--- a/client/src/components/SidePanel/Builder/AssistantAvatar.tsx+++ b/client/src/components/SidePanel/Builder/AssistantAvatar.tsx@@ -16,11 +16,11 @@ import type {AssistantListResponse,} from 'librechat-data-provider';import { useUploadAssistantAvatarMutation, useGetFileConfig } from '~/data-provider';-import { AssistantAvatar, NoImage, AvatarMenu } from './Images';import { useToastContext, useAssistantsMapContext } from '~/Providers';+import { AssistantAvatar, NoImage, AvatarMenu } from './Images';// import { Spinner } from '~/components/svg';import { useLocalize } from '~/hooks';-// import { cn } from '~/utils/';+import { formatBytes } from '~/utils';function Avatar({endpoint,@@ -207,8 +207,9 @@ function Avatar({version,});} else {+ const megabytes = fileConfig.avatarSizeLimit ? formatBytes(fileConfig.avatarSizeLimit) : 2;showToast({- message: localize('com_ui_upload_invalid'),+ message: localize('com_ui_upload_invalid_var', megabytes + ''),status: 'error',});}diff --git a/client/src/components/SidePanel/SidePanel.tsx b/client/src/components/SidePanel/SidePanel.tsxindex d2592e3495..9f63682f04 100644--- a/client/src/components/SidePanel/SidePanel.tsx+++ b/client/src/components/SidePanel/SidePanel.tsx@@ -184,7 +184,7 @@ const SidePanel = ({localStorage.setItem('react-resizable-panels:collapsed', 'true');}}className={cn(- 'sidenav hide-scrollbar border-l border-gray-200 bg-white transition-opacity dark:border-gray-800/50 dark:bg-gray-850',+ 'sidenav hide-scrollbar border-l border-border-light bg-surface-primary-alt transition-opacity',isCollapsed ? 'min-w-[50px]' : 'min-w-[340px] sm:min-w-[352px]',(isSmallScreen && isCollapsed && (minSize === 0 || collapsedSize === 0)) ||fullCollapse@@ -195,7 +195,7 @@ const SidePanel = ({{interfaceConfig.modelSelect && (<divclassName={cn(- 'sticky left-0 right-0 top-0 z-[100] flex h-[52px] flex-wrap items-center justify-center bg-white dark:bg-gray-850',+ 'sticky left-0 right-0 top-0 z-[100] flex h-[52px] flex-wrap items-center justify-center bg-surface-primary-alt',isCollapsed ? 'h-[52px]' : 'px-2',)}>diff --git a/client/src/components/svg/index.ts b/client/src/components/svg/index.tsindex 4c10220c55..859a177f03 100644--- a/client/src/components/svg/index.ts+++ b/client/src/components/svg/index.ts@@ -54,3 +54,4 @@ export { default as BirthdayIcon } from './BirthdayIcon';export { default as AssistantIcon } from './AssistantIcon';export { default as Sparkles } from './Sparkles';export { default as SpeechIcon } from './SpeechIcon';+export { default as SaveIcon } from './SaveIcon';diff --git a/client/src/components/ui/Breadcrumb.tsx b/client/src/components/ui/Breadcrumb.tsxnew file mode 100644index 0000000000..08082e51b2--- /dev/null+++ b/client/src/components/ui/Breadcrumb.tsx@@ -0,0 +1,101 @@+import * as React from 'react';+import { Slot } from '@radix-ui/react-slot';+import { ChevronRight, MoreHorizontal } from 'lucide-react';++import { cn } from '~/utils';++const Breadcrumb = React.forwardRef<+ HTMLElement,+ React.ComponentPropsWithoutRef<'nav'> & {+ separator?: React.ReactNode;+ }+>(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />);+Breadcrumb.displayName = 'Breadcrumb';++const BreadcrumbList = React.forwardRef<HTMLOListElement, React.ComponentPropsWithoutRef<'ol'>>(+ ({ className, ...props }, ref) => (+ <ol+ ref={ref}+ className={cn(+ 'text-muted-foreground flex flex-wrap items-center gap-1.5 break-words text-sm sm:gap-2.5',+ className,+ )}+ {...props}+ />+ ),+);+BreadcrumbList.displayName = 'BreadcrumbList';++const BreadcrumbItem = React.forwardRef<HTMLLIElement, React.ComponentPropsWithoutRef<'li'>>(+ ({ className, ...props }, ref) => (+ <li ref={ref} className={cn('inline-flex items-center gap-1.5', className)} {...props} />+ ),+);+BreadcrumbItem.displayName = 'BreadcrumbItem';++const BreadcrumbLink = React.forwardRef<+ HTMLAnchorElement,+ React.ComponentPropsWithoutRef<'a'> & {+ asChild?: boolean;+ }+>(({ asChild, className, ...props }, ref) => {+ const Comp = asChild ? Slot : 'a';++ return (+ <Comp+ ref={ref}+ className={cn('hover:text-foreground transition-colors', className)}+ {...props}+ />+ );+});+BreadcrumbLink.displayName = 'BreadcrumbLink';++const BreadcrumbPage = React.forwardRef<HTMLSpanElement, React.ComponentPropsWithoutRef<'span'>>(+ ({ className, ...props }, ref) => (+ <span+ ref={ref}+ role="link"+ aria-disabled="true"+ aria-current="page"+ className={cn('text-foreground font-normal', className)}+ {...props}+ />+ ),+);+BreadcrumbPage.displayName = 'BreadcrumbPage';++const BreadcrumbSeparator = ({ children, className, ...props }: React.ComponentProps<'li'>) => (+ <li+ role="presentation"+ aria-hidden="true"+ className={cn('[&>svg]:size-3.5', className)}+ {...props}+ >+ {children ?? <ChevronRight />}+ </li>+);+BreadcrumbSeparator.displayName = 'BreadcrumbSeparator';++const BreadcrumbEllipsis = ({ className, ...props }: React.ComponentProps<'span'>) => (+ <span+ role="presentation"+ aria-hidden="true"+ className={cn('flex h-9 w-9 items-center justify-center', className)}+ {...props}+ >+ <MoreHorizontal className="h-4 w-4" />+ <span className="sr-only">More</span>+ </span>+);+BreadcrumbEllipsis.displayName = 'BreadcrumbElipssis';++export {+ Breadcrumb,+ BreadcrumbList,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbPage,+ BreadcrumbSeparator,+ BreadcrumbEllipsis,+};diff --git a/client/src/components/ui/Button.tsx b/client/src/components/ui/Button.tsxindex 1e9bd58789..17664a66b5 100644--- a/client/src/components/ui/Button.tsx+++ b/client/src/components/ui/Button.tsx@@ -1,14 +1,13 @@import * as React from 'react';import { VariantProps, cva } from 'class-variance-authority';--import { cn } from '../../utils';+import { cn } from '~/utils';const buttonVariants = cva('rounded-md inline-flex items-center justify-center text-sm font-medium transition-colors dark:hover:bg-gray-700 dark:hover:text-gray-100 disabled:opacity-50 disabled:pointer-events-none data-[state=open]:bg-gray-100 dark:data-[state=open]:bg-gray-700',{variants: {variant: {- default: 'bg-gray-750 text-white hover:bg-gray-800 dark:bg-gray-50 dark:text-gray-900',+ default: 'bg-gray-850 text-white hover:bg-gray-800 dark:bg-gray-50 dark:text-gray-900',destructive: 'bg-red-500 text-white hover:bg-red-600 dark:hover:bg-red-600',outline:'bg-transparent border border-gray-200 hover:bg-gray-100 dark:border-gray-700 dark:text-gray-100',diff --git a/client/src/components/ui/Landing.tsx b/client/src/components/ui/Landing.tsxdeleted file mode 100644index 1953b20978..0000000000--- a/client/src/components/ui/Landing.tsx+++ /dev/null@@ -1,115 +0,0 @@-import React from 'react';-import { useRecoilValue, useSetRecoilState } from 'recoil';-import { useGetStartupConfig } from 'librechat-data-provider/react-query';-import LightningIcon from '~/components/svg/LightningIcon';-import useDocumentTitle from '~/hooks/useDocumentTitle';-import CautionIcon from '~/components/svg/CautionIcon';-import SunIcon from '~/components/svg/SunIcon';-import { useLocalize } from '~/hooks';-import store from '~/store';--export default function Landing() {- const { data: config } = useGetStartupConfig();- const setText = useSetRecoilState(store.text);- const conversation = useRecoilValue(store.conversation);- const localize = useLocalize();- const { title = localize('com_ui_new_chat') } = conversation ?? {};-- useDocumentTitle(title);-- const clickHandler = (e: React.MouseEvent<HTMLButtonElement>) => {- e.preventDefault();- const { innerText } = e.target as HTMLButtonElement;- const quote = innerText.split('"')[1].trim();- setText(quote);- };-- return (- <div className="flex h-full flex-col items-center overflow-y-auto pt-0 text-sm dark:bg-gray-800">- <div className="w-full px-6 text-gray-800 dark:text-gray-200 md:flex md:max-w-2xl md:flex-col lg:max-w-3xl">- <h1- id="landing-title"- data-testid="landing-title"- className="mb-10 ml-auto mr-auto mt-6 flex items-center justify-center gap-2 text-center text-4xl font-semibold dark:text-gray-600 sm:mb-16 md:mt-[10vh]"- >- {config?.appTitle || 'LibreChat'}- </h1>- <div className="items-start gap-3.5 text-center md:flex">- <div className="mb-8 flex flex-1 flex-col gap-3.5 md:mb-auto">- <h2 className="m-auto flex items-center gap-3 text-lg font-normal md:flex-col md:gap-2">- <SunIcon />- {localize('com_ui_examples')}- </h2>- <ul className="m-auto flex w-full flex-col gap-3.5 sm:max-w-md">- <button- onClick={clickHandler}- className="w-full rounded-md bg-gray-50 p-3 hover:bg-gray-200 dark:bg-white/5 dark:hover:bg-gray-600"- >- "{localize('com_ui_example_quantum_computing')}" →- </button>- <button- onClick={clickHandler}- className="w-full rounded-md bg-gray-50 p-3 hover:bg-gray-200 dark:bg-white/5 dark:hover:bg-gray-600"- >- "{localize('com_ui_example_10_year_old_b_day')}" →- </button>- <button- onClick={clickHandler}- className="w-full rounded-md bg-gray-50 p-3 hover:bg-gray-200 dark:bg-white/5 dark:hover:bg-gray-600"- >- "{localize('com_ui_example_http_in_js')}" →- </button>- </ul>- </div>- <div className="mb-8 flex flex-1 flex-col gap-3.5 md:mb-auto">- <h2 className="m-auto flex items-center gap-3 text-lg font-normal md:flex-col md:gap-2">- <LightningIcon />- {localize('com_ui_capabilities')}- </h2>- <ul className="m-auto flex w-full flex-col gap-3.5 sm:max-w-md">- <li className="w-full rounded-md bg-gray-50 p-3 dark:bg-white/5">- {localize('com_ui_capability_remember')}- </li>- <li className="w-full rounded-md bg-gray-50 p-3 dark:bg-white/5">- {localize('com_ui_capability_correction')}- </li>- <li className="w-full rounded-md bg-gray-50 p-3 dark:bg-white/5">- {localize('com_ui_capability_decline_requests')}- </li>- </ul>- </div>- <div className="mb-8 flex flex-1 flex-col gap-3.5 md:mb-auto">- <h2 className="m-auto flex items-center gap-3 text-lg font-normal md:flex-col md:gap-2">- <CautionIcon />- {localize('com_ui_limitations')}- </h2>- <ul className="m-auto flex w-full flex-col gap-3.5 sm:max-w-md">- <li className="w-full rounded-md bg-gray-50 p-3 dark:bg-white/5">- {localize('com_ui_limitation_incorrect_info')}- </li>- <li className="w-full rounded-md bg-gray-50 p-3 dark:bg-white/5">- {localize('com_ui_limitation_harmful_biased')}- </li>- <li className="w-full rounded-md bg-gray-50 p-3 dark:bg-white/5">- {localize('com_ui_limitation_limited_2021')}- </li>- </ul>- </div>- </div>- {/* {!showingTemplates && (- <div className="mt-8 mb-4 flex flex-col items-center gap-3.5 md:mt-16">- <button- onClick={showTemplates}- className="btn btn-neutral justify-center gap-2 border-0 md:border"- >- <ChatIcon />- Show Prompt Templates- </button>- </div>- )}- {!!showingTemplates && <Templates showTemplates={showTemplates}/>} */}- {/* <div className="group h-32 w-full flex-shrink-0 dark:border-gray-800/50 dark:bg-gray-800 md:h-48" /> */}- </div>- </div>- );-}diff --git a/client/src/components/ui/OriginalDialog.tsx b/client/src/components/ui/OriginalDialog.tsxnew file mode 100644index 0000000000..33f4f8edca--- /dev/null+++ b/client/src/components/ui/OriginalDialog.tsx@@ -0,0 +1,101 @@+import * as React from 'react';+import * as DialogPrimitive from '@radix-ui/react-dialog';+import { X } from 'lucide-react';+import { cn } from '~/utils';++const Dialog = DialogPrimitive.Root;++const DialogTrigger = DialogPrimitive.Trigger;++const DialogPortal = DialogPrimitive.Portal;++const DialogClose = DialogPrimitive.Close;++const DialogOverlay = React.forwardRef<+ React.ElementRef<typeof DialogPrimitive.Overlay>,+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>+>(({ className, ...props }, ref) => (+ <DialogPrimitive.Overlay+ ref={ref}+ className={cn(+ 'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',+ className,+ )}+ {...props}+ />+));+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;++const DialogContent = React.forwardRef<+ React.ElementRef<typeof DialogPrimitive.Content>,+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>+>(({ className, children, ...props }, ref) => (+ <DialogPortal>+ <DialogOverlay />+ <DialogPrimitive.Content+ ref={ref}+ className={cn(+ 'bg-background fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',+ className,+ )}+ {...props}+ >+ {children}+ <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">+ <X className="h-4 w-4" />+ <span className="sr-only">Close</span>+ </DialogPrimitive.Close>+ </DialogPrimitive.Content>+ </DialogPortal>+));+DialogContent.displayName = DialogPrimitive.Content.displayName;++const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (+ <div className={cn('flex flex-col space-y-1.5 text-center sm:text-left', className)} {...props} />+);+DialogHeader.displayName = 'DialogHeader';++const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (+ <div+ className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}+ {...props}+ />+);+DialogFooter.displayName = 'DialogFooter';++const DialogTitle = React.forwardRef<+ React.ElementRef<typeof DialogPrimitive.Title>,+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>+>(({ className, ...props }, ref) => (+ <DialogPrimitive.Title+ ref={ref}+ className={cn('text-lg font-semibold leading-none tracking-tight', className)}+ {...props}+ />+));+DialogTitle.displayName = DialogPrimitive.Title.displayName;++const DialogDescription = React.forwardRef<+ React.ElementRef<typeof DialogPrimitive.Description>,+ React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>+>(({ className, ...props }, ref) => (+ <DialogPrimitive.Description+ ref={ref}+ className={cn('text-muted-foreground text-sm', className)}+ {...props}+ />+));+DialogDescription.displayName = DialogPrimitive.Description.displayName;++export {+ Dialog as OGDialog,+ DialogPortal as OGDialogPortal,+ DialogOverlay as OGDialogOverlay,+ DialogClose as OGDialogClose,+ DialogTrigger as OGDialogTrigger,+ DialogContent as OGDialogContent,+ DialogHeader as OGDialogHeader,+ DialogFooter as OGDialogFooter,+ DialogTitle as OGDialogTitle,+ DialogDescription as OGDialogDescription,+};diff --git a/client/src/components/ui/SelectDropDown.tsx b/client/src/components/ui/SelectDropDown.tsxindex 53f6df2bbb..9a4b3e929f 100644--- a/client/src/components/ui/SelectDropDown.tsx+++ b/client/src/components/ui/SelectDropDown.tsx@@ -1,6 +1,6 @@import React from 'react';import { Listbox, Transition } from '@headlessui/react';-import type { Option } from '~/common';+import type { Option, OptionWithIcon } from '~/common';import CheckMark from '../svg/CheckMark';import { useLocalize } from '~/hooks';import { cn } from '~/utils/';@@ -9,10 +9,11 @@ import { useMultiSearch } from './MultiSearch';type SelectDropDownProps = {id?: string;title?: string;- value: string | null | Option;+ value: string | null | Option | OptionWithIcon;disabled?: boolean;setValue: (value: string) => void;- availableValues: string[] | Option[];+ tabIndex?: number;+ availableValues: string[] | Option[] | OptionWithIcon[];emptyTitle?: boolean;showAbove?: boolean;showLabel?: boolean;@@ -26,6 +27,7 @@ type SelectDropDownProps = {className?: string;searchClassName?: string;searchPlaceholder?: string;+ showOptionIcon?: boolean;};function SelectDropDown({@@ -33,6 +35,7 @@ function SelectDropDown({value,disabled,setValue,+ tabIndex,availableValues,showAbove = false,showLabel = true,@@ -47,6 +50,7 @@ function SelectDropDown({renderOption,searchClassName,searchPlaceholder,+ showOptionIcon,}: SelectDropDownProps) {const localize = useLocalize();const transitionProps = { className: 'top-full mt-3' };@@ -81,9 +85,10 @@ function SelectDropDown({{({ open }) => (<><Listbox.Button+ tabIndex={tabIndex}data-testid="select-dropdown-button"className={cn(- 'relative flex w-full cursor-default flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left focus:outline-none focus:ring-0 focus:ring-offset-0 dark:border-gray-600 dark:bg-gray-700 sm:text-sm',+ 'relative flex w-full cursor-default flex-col rounded-md border border-black/10 bg-white py-2 pl-3 pr-10 text-left dark:border-gray-600 dark:bg-gray-700 sm:text-sm',className ?? '',)}>@@ -108,6 +113,11 @@ function SelectDropDown({{!showLabel && !emptyTitle && (<span className="text-xs text-gray-700 dark:text-gray-500">{title}:</span>)}+ {showOptionIcon && value && (value as OptionWithIcon)?.icon && (+ <span className="icon-md flex items-center">+ {(value as OptionWithIcon).icon}+ </span>+ )}{typeof value !== 'string' && value ? value?.label ?? '' : value ?? ''}</span></span>@@ -139,7 +149,7 @@ function SelectDropDown({><Listbox.OptionsclassName={cn(- 'absolute z-10 mt-2 max-h-60 w-full overflow-auto rounded border bg-white text-base text-xs ring-black/10 focus:outline-none dark:border-gray-600 dark:bg-gray-700 dark:ring-white/20 md:w-[100%]',+ 'absolute z-10 mt-2 max-h-60 w-full overflow-auto rounded border bg-white text-xs ring-black/10 dark:border-gray-600 dark:bg-gray-700 dark:ring-white/20 md:w-[100%]',optionsListClass ?? '',)}>@@ -163,6 +173,8 @@ function SelectDropDown({const currentLabel = typeof option === 'string' ? option : option?.label ?? '';const currentValue = typeof option === 'string' ? option : option?.value ?? '';+ const currentIcon =+ typeof option === 'string' ? null : (option?.icon as React.ReactNode) ?? null;let activeValue: string | number | null | Option = value;if (typeof activeValue !== 'string') {activeValue = activeValue?.value ?? '';@@ -172,10 +184,13 @@ function SelectDropDown({<Listbox.Optionkey={i}value={currentValue}- className={cn(- 'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden border-b border-black/10 pl-3 pr-9 text-gray-800 last:border-0 hover:bg-gray-20 dark:border-white/20 dark:text-white dark:hover:bg-gray-700',- optionsClass ?? '',- )}+ className={({ active }) =>+ cn(+ 'group relative flex h-[42px] cursor-pointer select-none items-center overflow-hidden border-b border-black/10 pl-3 pr-9 text-gray-800 last:border-0 hover:bg-gray-20 dark:border-white/20 dark:text-white dark:hover:bg-gray-700',+ active ? 'bg-surface-tertiary' : '',+ optionsClass ?? '',+ )+ }><span className="flex items-center gap-1.5 truncate"><span@@ -185,6 +200,7 @@ function SelectDropDown({iconSide === 'left' ? 'ml-4' : '',)}>+ {currentIcon && <span className="mr-1">{currentIcon}</span>}{currentLabel}</span>{currentValue === activeValue && (diff --git a/client/src/components/ui/Skeleton.tsx b/client/src/components/ui/Skeleton.tsxnew file mode 100644index 0000000000..a903db77a0--- /dev/null+++ b/client/src/components/ui/Skeleton.tsx@@ -0,0 +1,15 @@+import { cn } from '~/utils';++function Skeleton({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {+ return (+ <div+ className={cn(+ 'animate-pulse rounded-md bg-surface-tertiary opacity-50 dark:opacity-25',+ className,+ )}+ {...props}+ />+ );+}++export { Skeleton };diff --git a/client/src/components/ui/Tag.tsx b/client/src/components/ui/Tag.tsxindex 865a19a318..38660d11c4 100644--- a/client/src/components/ui/Tag.tsx+++ b/client/src/components/ui/Tag.tsx@@ -6,34 +6,41 @@ type TagProps = React.ComponentPropsWithoutRef<'div'> & {label: string;labelClassName?: string;CancelButton?: React.ReactNode;- onRemove: (e: React.MouseEvent<HTMLButtonElement>) => void;+ LabelNode?: React.ReactNode;+ onRemove?: (e: React.MouseEvent<HTMLButtonElement>) => void;};const TagPrimitiveRoot = React.forwardRef<HTMLDivElement, TagProps>(- ({ CancelButton, label, onRemove, className = '', labelClassName = '', ...props }, ref) => (+ (+ { CancelButton, LabelNode, label, onRemove, className = '', labelClassName = '', ...props },+ ref,+ ) => (<divref={ref}{...props}className={cn(- 'flex max-h-8 items-center overflow-y-hidden rounded rounded-3xl border-2 border-green-600 bg-green-600/20 text-sm text-xs text-green-600 dark:text-white',+ 'flex max-h-8 items-center overflow-y-hidden rounded-3xl border-2 border-green-600 bg-green-600/20 text-xs text-green-600 dark:text-white',className,)}>- <div className={cn('ml-1 whitespace-pre-wrap px-2 py-1', labelClassName)}>{label}</div>- {CancelButton ? (- CancelButton- ) : (- <button- onClick={(e) => {- e.stopPropagation();- onRemove(e);- }}- className="rounded-full bg-green-600/50"- aria-label={`Remove ${label}`}- >- <X className="m-[1.5px] p-1" />- </button>- )}+ <div className={cn('ml-1 whitespace-pre-wrap px-2 py-1', labelClassName)}>+ {LabelNode ? <>{LabelNode} </> : null}+ {label}+ </div>+ {CancelButton+ ? CancelButton+ : onRemove && (+ <button+ onClick={(e) => {+ e.stopPropagation();+ onRemove(e);+ }}+ className="rounded-full bg-green-600/50"+ aria-label={`Remove ${label}`}+ >+ <X className="m-[1.5px] p-1" />+ </button>+ )}</div>),);diff --git a/client/src/components/ui/Templates.tsx b/client/src/components/ui/Templates.tsxdeleted file mode 100644index 479fab619a..0000000000--- a/client/src/components/ui/Templates.tsx+++ /dev/null@@ -1,68 +0,0 @@-import ChatIcon from '../svg/ChatIcon';-import { useLocalize } from '~/hooks';--export default function Templates({ showTemplates }: { showTemplates: () => void }) {- const localize = useLocalize();-- return (- <div id="templates-wrapper" className="mt-6 flex items-start gap-3.5 text-center ">- <div className="flex flex-1 flex-col gap-3.5">- <ChatIcon />- <h2 className="text-lg font-normal">{localize('com_ui_prompt_templates')}</h2>- <ul className="flex flex-col gap-3.5">- <ul className="flex flex-col gap-3.5"></ul>-- <div className="flex flex-1 flex-col items-center gap-3.5">- <span className="text-sm text-gray-700 dark:text-gray-400">- {localize('com_ui_showing')}{' '}- <span className="font-semibold text-gray-800 dark:text-white">1</span>{' '}- {localize('com_ui_of')}{' '}- <a id="prompt-link">- <span className="font-semibold text-gray-800 dark:text-white">- 1 {localize('com_ui_entries')}- </span>- </a>- </span>- <button- onClick={showTemplates}- className="btn justify-center gap-2 border-0 bg-transparent hover:bg-gray-100 dark:hover:bg-gray-800 md:border"- >- <ChatIcon />- {localize('com_ui_hide_prompt_templates')}- </button>- <div- // onclick="selectPromptTemplate(0)"- className="flex w-full flex-col gap-2 rounded-md bg-gray-50 p-4 text-left hover:bg-gray-200 dark:bg-white/5 "- >- <h2 className="m-auto flex items-center gap-3 text-lg font-normal md:flex-col md:gap-2">- {localize('com_ui_dan')}- </h2>- <button>- <p className="w-full rounded-md bg-gray-50 p-3 hover:bg-gray-200 dark:bg-white/5 dark:hover:bg-gray-800">- {localize('com_ui_dan_template')}- </p>- </button>- <span className="font-medium">{localize('com_ui_use_prompt')} →</span>- </div>- <div className="xs:mt-0 mt-2 inline-flex">- <button- // onclick="prevPromptTemplatesPage()"- className="bg-gray-200 px-4 py-2 font-medium hover:bg-gray-200 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-400 dark:hover:text-white"- style={{ borderRadius: '6px 0 0 6px' }}- >- {localize('com_ui_prev')}- </button>- <button- // onclick="nextPromptTemplatesPage()"- className="border-0 border-l border-gray-500 bg-gray-200 px-4 py-2 font-medium hover:bg-gray-200 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-400 dark:hover:text-white"- style={{ borderRadius: '6px 0 0 6px' }}- >- {localize('com_ui_next')}- </button>- </div>- </div>- </ul>- </div>- </div>- );-}diff --git a/client/src/components/ui/ThemeSelector.tsx b/client/src/components/ui/ThemeSelector.tsxindex 62cbcf9a3b..c28089abf9 100644--- a/client/src/components/ui/ThemeSelector.tsx+++ b/client/src/components/ui/ThemeSelector.tsx@@ -18,7 +18,7 @@ const Theme = ({ theme, onChange }: { theme: string; onChange: (value: string) =);};-const ThemeSelector = () => {+const ThemeSelector = ({ returnThemeOnly }: { returnThemeOnly?: boolean }) => {const { theme, setTheme } = useContext(ThemeContext);const changeTheme = useCallback((value: string) => {@@ -27,6 +27,10 @@ const ThemeSelector = () => {[setTheme],);+ if (returnThemeOnly) {+ return <Theme theme={theme} onChange={changeTheme} />;+ }+return (<div className="flex flex-col items-center justify-center bg-white pt-6 dark:bg-gray-900 sm:pt-0"><div className="absolute bottom-0 left-0 m-4">diff --git a/client/src/components/ui/index.ts b/client/src/components/ui/index.tsindex 5d89f9fce2..85466663f9 100644--- a/client/src/components/ui/index.ts+++ b/client/src/components/ui/index.ts@@ -1,4 +1,5 @@export * from './AlertDialog';+export * from './Breadcrumb';export * from './Button';export * from './Checkbox';export * from './DataTableColumnHeader';@@ -8,16 +9,16 @@ export * from './HoverCard';export * from './Input';export * from './InputNumber';export * from './Label';-export * from './Landing';+export * from './OriginalDialog';export * from './Prompt';export * from './QuestionMark';export * from './Slider';export * from './Separator';+export * from './Skeleton';export * from './Switch';export * from './Table';export * from './Tabs';export * from './Tag';-export * from './Templates';export * from './Textarea';export * from './TextareaAutosize';export * from './Tooltip';diff --git a/client/src/data-provider/index.ts b/client/src/data-provider/index.tsindex 684ad1668b..7da93a279e 100644--- a/client/src/data-provider/index.ts+++ b/client/src/data-provider/index.ts@@ -1,2 +1,4 @@export * from './mutations';+export * from './prompts';export * from './queries';+export * from './roles';diff --git a/client/src/data-provider/mutations.ts b/client/src/data-provider/mutations.tsindex 8fa5ebc960..fe6a5f1ec7 100644--- a/client/src/data-provider/mutations.ts+++ b/client/src/data-provider/mutations.ts@@ -1,6 +1,7 @@import {EToolResources,LocalStorageKeys,+ InfiniteCollections,defaultAssistantsVersion,} from 'librechat-data-provider';import { useSetRecoilState } from 'recoil';@@ -9,9 +10,11 @@ import { dataService, MutationKeys, QueryKeys, defaultOrderQuery } from 'librechimport type { UseMutationResult } from '@tanstack/react-query';import type t from 'librechat-data-provider';import {+ /* Shared Links */addSharedLink,- addConversation,deleteSharedLink,+ /* Conversations */+ addConversation,updateConvoFields,updateConversation,deleteConversation,@@ -174,7 +177,7 @@ export const useCreateSharedLinkMutation = (vars.isPublic? addSharedLink(sharedLink, _data): deleteSharedLink(sharedLink, _data.shareId),- 'sharedLinks',+ InfiniteCollections.SHARED_LINKS,pageSize,);});@@ -216,7 +219,7 @@ export const useUpdateSharedLinkMutation = (// Therefore, when isPublic is true, use addSharedLink instead of updateSharedLink.addSharedLink(sharedLink, _data): deleteSharedLink(sharedLink, _data.shareId),- 'sharedLinks',+ InfiniteCollections.SHARED_LINKS,sharedLink.pages[0].pageSize as number,);});@@ -254,7 +257,7 @@ export const useDeleteSharedLinkMutation = (}return normalizeData(deleteSharedLink(data, vars.shareId),- 'sharedLinks',+ InfiniteCollections.SHARED_LINKS,data.pages[0].pageSize as number,);});diff --git a/client/src/data-provider/prompts.ts b/client/src/data-provider/prompts.tsnew file mode 100644index 0000000000..ab54b94051--- /dev/null+++ b/client/src/data-provider/prompts.ts@@ -0,0 +1,304 @@+import { useRecoilValue } from 'recoil';+import { useMutation, useQueryClient } from '@tanstack/react-query';+import { dataService, QueryKeys } from 'librechat-data-provider';+import type { UseMutationResult } from '@tanstack/react-query';+import type t from 'librechat-data-provider';+import {+ /* Prompts */+ addPromptGroup,+ updateGroupFields,+ deletePromptGroup,+} from '~/utils';+import store from '~/store';++export const useUpdatePromptGroup = (+ options?: t.UpdatePromptGroupOptions,+): UseMutationResult<+ t.TUpdatePromptGroupResponse,+ unknown,+ t.TUpdatePromptGroupVariables,+ unknown+> => {+ const { onMutate, onError, onSuccess } = options || {};+ const queryClient = useQueryClient();+ const name = useRecoilValue(store.promptsName);+ const pageSize = useRecoilValue(store.promptsPageSize);+ const category = useRecoilValue(store.promptsCategory);++ return useMutation({+ mutationFn: (variables: t.TUpdatePromptGroupVariables) =>+ dataService.updatePromptGroup(variables),+ onMutate: (variables: t.TUpdatePromptGroupVariables) => {+ const group = JSON.parse(+ JSON.stringify(+ queryClient.getQueryData<t.TPromptGroup>([QueryKeys.promptGroup, variables.id]),+ ),+ ) as t.TPromptGroup;+ const groupData = queryClient.getQueryData<t.PromptGroupListData>([+ QueryKeys.promptGroups,+ name,+ category,+ pageSize,+ ]);+ const previousListData = JSON.parse(JSON.stringify(groupData)) as t.PromptGroupListData;+ let update = variables.payload;+ if (update.removeProjectIds && group.projectIds) {+ update = JSON.parse(JSON.stringify(update));+ update.projectIds = group.projectIds.filter((id) => !update.removeProjectIds?.includes(id));+ delete update.removeProjectIds;+ }++ if (groupData) {+ const newData = updateGroupFields(+ /* Paginated Data */+ groupData,+ /* Update */+ { _id: variables.id, ...update },+ /* Callback */+ (group) => queryClient.setQueryData([QueryKeys.promptGroup, variables.id], group),+ );+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ newData,+ );+ }++ if (onMutate) {+ onMutate(variables);+ }++ return { group, previousListData };+ },+ onError: (err, variables, context) => {+ if (context?.group) {+ queryClient.setQueryData([QueryKeys.promptGroups, variables.id], context?.group);+ }+ if (context?.previousListData) {+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ context?.previousListData,+ );+ }+ if (onError) {+ onError(err, variables, context);+ }+ },+ onSuccess,+ });+};++export const useCreatePrompt = (+ options?: t.CreatePromptOptions,+): UseMutationResult<t.TCreatePromptResponse, unknown, t.TCreatePrompt, unknown> => {+ const queryClient = useQueryClient();+ const { onSuccess, ...rest } = options || {};+ const name = useRecoilValue(store.promptsName);+ const pageSize = useRecoilValue(store.promptsPageSize);+ const category = useRecoilValue(store.promptsCategory);++ return useMutation({+ mutationFn: (payload: t.TCreatePrompt) => dataService.createPrompt(payload),+ ...rest,+ onSuccess: (response, variables, context) => {+ const { prompt, group } = response;+ queryClient.setQueryData(+ [QueryKeys.prompts, variables?.prompt?.groupId],+ (oldData: t.TPrompt[] | undefined) => {+ return [prompt, ...(oldData ?? [])];+ },+ );++ if (group) {+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ (data) => {+ if (!data) {+ return data;+ }+ return addPromptGroup(data, group);+ },+ );+ }++ if (onSuccess) {+ onSuccess(response, variables, context);+ }+ },+ });+};++export const useDeletePrompt = (+ options?: t.DeletePromptOptions,+): UseMutationResult<t.TDeletePromptResponse, unknown, t.TDeletePromptVariables, unknown> => {+ const queryClient = useQueryClient();+ const { onSuccess, ...rest } = options || {};+ const name = useRecoilValue(store.promptsName);+ const pageSize = useRecoilValue(store.promptsPageSize);+ const category = useRecoilValue(store.promptsCategory);++ return useMutation({+ mutationFn: (payload: t.TDeletePromptVariables) => dataService.deletePrompt(payload),+ ...rest,+ onSuccess: (response, variables, context) => {+ if (response.promptGroup) {+ const promptGroupId = response.promptGroup.id;+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ (data) => {+ if (!data) {+ return data;+ }+ return deletePromptGroup(data, promptGroupId);+ },+ );+ } else {+ queryClient.setQueryData<t.TPrompt[]>(+ [QueryKeys.prompts, variables.groupId],+ (oldData?: t.TPrompt[]) => {+ const prompts = oldData ? oldData.filter((prompt) => prompt._id !== variables._id) : [];+ queryClient.setQueryData<t.TPromptGroup>(+ [QueryKeys.promptGroup, variables.groupId],+ (data) => {+ if (!data) {+ return data;+ }+ if (data.productionId === variables._id) {+ data.productionId = prompts[0]._id;+ data.productionPrompt = prompts[0];+ }+ },+ );+ return prompts;+ },+ );+ }+ if (onSuccess) {+ onSuccess(response, variables, context);+ }+ },+ });+};++export const useDeletePromptGroup = (+ options?: t.DeletePromptGroupOptions,+): UseMutationResult<+ t.TDeletePromptGroupResponse,+ unknown,+ t.TDeletePromptGroupRequest,+ unknown+> => {+ const queryClient = useQueryClient();+ const { onSuccess, ...rest } = options || {};+ const name = useRecoilValue(store.promptsName);+ const pageSize = useRecoilValue(store.promptsPageSize);+ const category = useRecoilValue(store.promptsCategory);++ return useMutation({+ mutationFn: (variables: t.TDeletePromptGroupRequest) =>+ dataService.deletePromptGroup(variables.id),+ ...rest,+ onSuccess: (response, variables, context) => {+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ (data) => {+ if (!data) {+ return data;+ }++ return deletePromptGroup(data, variables.id);+ },+ );+ if (onSuccess) {+ onSuccess(response, variables, context);+ }+ },+ });+};++export const useUpdatePromptLabels = (+ options?: t.UpdatePromptLabelOptions,+): UseMutationResult<+ t.TUpdatePromptLabelsResponse,+ unknown,+ t.TUpdatePromptLabelsRequest,+ unknown+> => {+ const { onSuccess, ...rest } = options || {};+ return useMutation({+ mutationFn: (variables: t.TUpdatePromptLabelsRequest) =>+ dataService.updatePromptLabels(variables),+ ...rest,+ onSuccess: (response, variables, context) => {+ if (onSuccess) {+ onSuccess(response, variables, context);+ }+ },+ });+};++export const useMakePromptProduction = (options?: t.MakePromptProductionOptions) => {+ const queryClient = useQueryClient();+ const { onSuccess, onError, onMutate } = options || {};+ const name = useRecoilValue(store.promptsName);+ const pageSize = useRecoilValue(store.promptsPageSize);+ const category = useRecoilValue(store.promptsCategory);++ return useMutation({+ mutationFn: (variables: t.TMakePromptProductionRequest) =>+ dataService.makePromptProduction(variables.id),+ onMutate: (variables: t.TMakePromptProductionRequest) => {+ const group = JSON.parse(+ JSON.stringify(+ queryClient.getQueryData<t.TPromptGroup>([QueryKeys.promptGroup, variables.groupId]),+ ),+ ) as t.TPromptGroup;+ const groupData = queryClient.getQueryData<t.PromptGroupListData>([+ QueryKeys.promptGroups,+ name,+ category,+ pageSize,+ ]);+ const previousListData = JSON.parse(JSON.stringify(groupData)) as t.PromptGroupListData;++ if (groupData) {+ const newData = updateGroupFields(+ /* Paginated Data */+ groupData,+ /* Update */+ {+ _id: variables.groupId,+ productionId: variables.id,+ productionPrompt: variables.productionPrompt,+ },+ /* Callback */+ (group) => queryClient.setQueryData([QueryKeys.promptGroup, variables.groupId], group),+ );+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ newData,+ );+ }++ if (onMutate) {+ onMutate(variables);+ }++ return { group, previousListData };+ },+ onError: (err, variables, context) => {+ if (context?.group) {+ queryClient.setQueryData([QueryKeys.promptGroups, variables.groupId], context?.group);+ }+ if (context?.previousListData) {+ queryClient.setQueryData<t.PromptGroupListData>(+ [QueryKeys.promptGroups, name, category, pageSize],+ context?.previousListData,+ );+ }+ if (onError) {+ onError(err, variables, context);+ }+ },+ onSuccess,+ });+};diff --git a/client/src/data-provider/queries.ts b/client/src/data-provider/queries.tsindex 69061e1532..e346418540 100644--- a/client/src/data-provider/queries.ts+++ b/client/src/data-provider/queries.ts@@ -422,3 +422,103 @@ export const useFileDownload = (userId?: string, file_id?: string): QueryObserveexport const useVoicesQuery = (): UseQueryResult<t.VoiceResponse> => {return useQuery([QueryKeys.voices], () => dataService.getVoices());};++export const usePromptGroupsInfiniteQuery = (+ params?: t.TPromptGroupsWithFilterRequest,+ config?: UseInfiniteQueryOptions<t.PromptGroupListResponse, unknown>,+) => {+ const { name, pageSize, category, ...rest } = params || {};+ return useInfiniteQuery<t.PromptGroupListResponse, unknown>(+ [QueryKeys.promptGroups, name, category, pageSize],+ ({ pageParam = '1' }) =>+ dataService.getPromptGroups({+ ...rest,+ name,+ category: category || '',+ pageNumber: pageParam?.toString(),+ pageSize: (pageSize || 10).toString(),+ }),+ {+ getNextPageParam: (lastPage) => {+ const currentPageNumber = Number(lastPage.pageNumber);+ const totalPages = Number(lastPage.pages);+ return currentPageNumber < totalPages ? currentPageNumber + 1 : undefined;+ },+ refetchOnWindowFocus: false,+ refetchOnReconnect: false,+ refetchOnMount: false,+ ...config,+ },+ );+};++export const useGetPromptGroup = (+ id: string,+ config?: UseQueryOptions<t.TPromptGroup>,+): QueryObserverResult<t.TPromptGroup> => {+ return useQuery<t.TPromptGroup>(+ [QueryKeys.promptGroup, id],+ () => dataService.getPromptGroup(id),+ {+ refetchOnWindowFocus: false,+ refetchOnReconnect: false,+ refetchOnMount: false,+ retry: false,+ ...config,+ enabled: config?.enabled !== undefined ? config?.enabled : true,+ },+ );+};++export const useGetPrompts = (+ filter: t.TPromptsWithFilterRequest,+ config?: UseQueryOptions<t.TPrompt[]>,+): QueryObserverResult<t.TPrompt[]> => {+ return useQuery<t.TPrompt[]>(+ [QueryKeys.prompts, filter.groupId ?? ''],+ () => dataService.getPrompts(filter),+ {+ refetchOnWindowFocus: false,+ refetchOnReconnect: false,+ refetchOnMount: false,+ retry: false,+ ...config,+ enabled: config?.enabled !== undefined ? config?.enabled : true,+ },+ );+};++export const useGetCategories = <TData = t.TGetCategoriesResponse>(+ config?: UseQueryOptions<t.TGetCategoriesResponse, unknown, TData>,+): QueryObserverResult<TData> => {+ return useQuery<t.TGetCategoriesResponse, unknown, TData>(+ [QueryKeys.categories],+ () => dataService.getCategories(),+ {+ refetchOnWindowFocus: false,+ refetchOnReconnect: false,+ refetchOnMount: false,+ retry: false,+ ...config,+ enabled: config?.enabled !== undefined ? config?.enabled : true,+ },+ );+};++export const useGetRandomPrompts = (+ filter: t.TGetRandomPromptsRequest,+ config?: UseQueryOptions<t.TGetRandomPromptsResponse>,+): QueryObserverResult<t.TGetRandomPromptsResponse> => {+ return useQuery<t.TGetRandomPromptsResponse>(+ [QueryKeys.randomPrompts],+ () => dataService.getRandomPrompts(filter),+ {+ refetchOnWindowFocus: false,+ refetchOnReconnect: false,+ refetchOnMount: false,+ retry: false,+ ...config,+ enabled: config?.enabled !== undefined ? config?.enabled : true,+ },+ );+};diff --git a/client/src/data-provider/roles.ts b/client/src/data-provider/roles.tsnew file mode 100644index 0000000000..bebeaecf24--- /dev/null+++ b/client/src/data-provider/roles.ts@@ -0,0 +1,49 @@+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';+import type {+ UseMutationResult,+ QueryObserverResult,+ UseQueryOptions,+} from '@tanstack/react-query';+import { QueryKeys, dataService, promptPermissionsSchema } from 'librechat-data-provider';+import type * as t from 'librechat-data-provider';++export const useGetRole = (+ roleName: string,+ config?: UseQueryOptions<t.TRole>,+): QueryObserverResult<t.TRole> => {+ return useQuery<t.TRole>([QueryKeys.roles, roleName], () => dataService.getRole(roleName), {+ refetchOnWindowFocus: false,+ refetchOnReconnect: false,+ refetchOnMount: false,+ retry: false,+ ...config,+ });+};++export const useUpdatePromptPermissionsMutation = (+ options?: t.UpdatePromptPermOptions,+): UseMutationResult<t.UpdatePromptPermResponse, t.TError, t.UpdatePromptPermVars, unknown> => {+ const queryClient = useQueryClient();+ const { onMutate, onSuccess, onError } = options ?? {};+ return useMutation(+ (variables) => {+ promptPermissionsSchema.partial().parse(variables.updates);+ return dataService.updatePromptPermissions(variables);+ },+ {+ onSuccess: (data, variables, context) => {+ queryClient.invalidateQueries([QueryKeys.roles, variables.roleName]);+ if (onSuccess) {+ onSuccess(data, variables, context);+ }+ },+ onError: (...args) => {+ args[0] && console.error('Failed to update prompt permissions:', args[0]);+ if (onError) {+ onError(...args);+ }+ },+ onMutate,+ },+ );+};diff --git a/client/src/hooks/AuthContext.tsx b/client/src/hooks/AuthContext.tsxindex 0493f4600a..2b2ab21064 100644--- a/client/src/hooks/AuthContext.tsx+++ b/client/src/hooks/AuthContext.tsx@@ -3,20 +3,21 @@ import {useState,useEffect,ReactNode,+ useContext,useCallback,createContext,- useContext,} from 'react';import { useRecoilState } from 'recoil';-import { TLoginResponse, setTokenHeader, TLoginUser } from 'librechat-data-provider';+import { useNavigate } from 'react-router-dom';+import { setTokenHeader, SystemRoles } from 'librechat-data-provider';import {useGetUserQuery,useLoginUserMutation,useRefreshTokenMutation,} from 'librechat-data-provider/react-query';-import { useNavigate } from 'react-router-dom';+import type { TLoginResponse, TLoginUser } from 'librechat-data-provider';import { TAuthConfig, TUserContext, TAuthContext, TResError } from '~/common';-import { useLogoutUserMutation } from '~/data-provider';+import { useLogoutUserMutation, useGetRole } from '~/data-provider';import useTimeout from './useTimeout';import store from '~/store';@@ -33,6 +34,9 @@ const AuthContextProvider = ({const [token, setToken] = useState<string | undefined>(undefined);const [error, setError] = useState<string | undefined>(undefined);const [isAuthenticated, setIsAuthenticated] = useState<boolean>(false);+ const { data: userRole = null } = useGetRole(SystemRoles.USER, {+ enabled: !!(isAuthenticated && user?.role),+ });const navigate = useNavigate();@@ -173,10 +177,13 @@ const AuthContextProvider = ({login,logout,setError,+ roles: {+ [SystemRoles.USER]: userRole,+ },isAuthenticated,}),// eslint-disable-next-line react-hooks/exhaustive-deps- [user, error, isAuthenticated, token],+ [user, error, isAuthenticated, token, userRole],);return <AuthContext.Provider value={memoedValue}>{children}</AuthContext.Provider>;diff --git a/client/src/hooks/Input/useAutoSave.ts b/client/src/hooks/Input/useAutoSave.tsindex b1949b24b9..41445fe3c4 100644--- a/client/src/hooks/Input/useAutoSave.ts+++ b/client/src/hooks/Input/useAutoSave.ts@@ -1,10 +1,10 @@import debounce from 'lodash/debounce';-import { UseFormSetValue } from 'react-hook-form';import { SetterOrUpdater, useRecoilValue } from 'recoil';import { useState, useEffect, useMemo, useCallback } from 'react';import { LocalStorageKeys, TFile } from 'librechat-data-provider';+import type { ExtendedFile } from '~/common';+import { useChatFormContext } from '~/Providers';import { useGetFiles } from '~/data-provider';-import { ExtendedFile } from '~/common';import store from '~/store';export const useAutoSave = ({@@ -12,15 +12,14 @@ export const useAutoSave = ({textAreaRef,files,setFiles,- setValue,}: {conversationId?: string | null;textAreaRef: React.RefObject<HTMLTextAreaElement>;files: Map<string, ExtendedFile>;setFiles: SetterOrUpdater<Map<string, ExtendedFile>>;- setValue: UseFormSetValue<{ text: string }>;}) => {// setting for auto-save+ const { setValue } = useChatFormContext();const saveDrafts = useRecoilValue<boolean>(store.saveDrafts);const [currentConversationId, setCurrentConversationId] = useState<string | null>(null);diff --git a/client/src/hooks/Input/useTextarea.ts b/client/src/hooks/Input/useTextarea.tsindex 5a56685ad5..c86aee5b13 100644--- a/client/src/hooks/Input/useTextarea.ts+++ b/client/src/hooks/Input/useTextarea.ts@@ -1,7 +1,7 @@import debounce from 'lodash/debounce';import { useEffect, useRef, useCallback } from 'react';import { isAssistantsEndpoint } from 'librechat-data-provider';-import { useRecoilValue, useSetRecoilState } from 'recoil';+import { useRecoilValue, useSetRecoilState, useRecoilState } from 'recoil';import type { TEndpointOption } from 'librechat-data-provider';import type { KeyboardEvent } from 'react';import { forceResize, insertTextAtCursor, getAssistantName } from '~/utils';@@ -42,6 +42,7 @@ export default function useTextarea({} = useChatContext();const setShowMentionPopover = useSetRecoilState(store.showMentionPopoverFamily(index));+ const [activePrompt, setActivePrompt] = useRecoilState(store.activePromptByIndex(index));const { conversationId, jailbreak, endpoint = '', assistant_id } = conversation || {};const isNotAppendable =@@ -53,6 +54,14 @@ export default function useTextarea({isAssistantsEndpoint(endpoint) && assistantMap?.[endpoint ?? '']?.[assistant_id ?? ''];const assistantName = (assistant && assistant?.name) || '';+ useEffect(() => {+ if (activePrompt && textAreaRef.current) {+ insertTextAtCursor(textAreaRef.current, activePrompt);+ forceResize(textAreaRef.current);+ setActivePrompt(undefined);+ }+ }, [activePrompt, setActivePrompt, textAreaRef]);+// auto focus to input, when enter a conversation.useEffect(() => {if (!conversationId) {@@ -119,7 +128,7 @@ export default function useTextarea({if (textAreaRef.current?.getAttribute('placeholder') !== placeholder) {textAreaRef.current?.setAttribute('placeholder', placeholder);- forceResize(textAreaRef);+ forceResize(textAreaRef.current);}};@@ -176,7 +185,7 @@ export default function useTextarea({if (e.key === 'Enter' && !enterToSend && !isCtrlEnter && textAreaRef.current) {e.preventDefault();insertTextAtCursor(textAreaRef.current, '\n');- forceResize(textAreaRef);+ forceResize(textAreaRef.current);return;}diff --git a/client/src/hooks/Messages/index.ts b/client/src/hooks/Messages/index.tsindex 43c10d8b51..51b4c16ed2 100644--- a/client/src/hooks/Messages/index.ts+++ b/client/src/hooks/Messages/index.ts@@ -1,5 +1,6 @@export { default as useAvatar } from './useAvatar';export { default as useProgress } from './useProgress';+export { default as useSubmitMessage } from './useSubmitMessage';export { default as useMessageHelpers } from './useMessageHelpers';export { default as useCopyToClipboard } from './useCopyToClipboard';export { default as useMessageScrolling } from './useMessageScrolling';diff --git a/client/src/hooks/Messages/useSubmitMessage.ts b/client/src/hooks/Messages/useSubmitMessage.tsnew file mode 100644index 0000000000..0dd420ce2c--- /dev/null+++ b/client/src/hooks/Messages/useSubmitMessage.ts@@ -0,0 +1,43 @@+import { useCallback } from 'react';+import { useRecoilValue, useSetRecoilState } from 'recoil';+import { useChatContext, useChatFormContext } from '~/Providers';+import { useAuthContext } from '~/hooks/AuthContext';+import { replaceSpecialVars } from '~/utils';+import store from '~/store';++export default function useSubmitMessage(helpers?: { clearDraft?: () => void }) {+ const { user } = useAuthContext();+ const methods = useChatFormContext();+ const { ask, index } = useChatContext();+ const autoSendPrompts = useRecoilValue(store.autoSendPrompts);+ const setActivePrompt = useSetRecoilState(store.activePromptByIndex(index));++ const submitMessage = useCallback(+ (data?: { text: string }) => {+ if (!data) {+ return console.warn('No data provided to submitMessage');+ }+ ask({ text: data.text });+ methods.reset();+ helpers?.clearDraft && helpers.clearDraft();+ },+ [ask, methods, helpers],+ );++ const submitPrompt = useCallback(+ (text: string) => {+ const parsedText = replaceSpecialVars({ text, user });+ if (autoSendPrompts) {+ submitMessage({ text: parsedText });+ return;+ }++ const currentText = methods.getValues('text');+ const newText = currentText ? `\n${parsedText}` : parsedText;+ setActivePrompt(newText);+ },+ [autoSendPrompts, submitMessage, setActivePrompt, methods, user],+ );++ return { submitMessage, submitPrompt };+}diff --git a/client/src/hooks/Nav/index.ts b/client/src/hooks/Nav/index.tsindex ff2140639e..16f4b43489 100644--- a/client/src/hooks/Nav/index.ts+++ b/client/src/hooks/Nav/index.ts@@ -1 +1,2 @@export { default as useNavScrolling } from './useNavScrolling';+export * from './useNavHelpers';diff --git a/client/src/hooks/Nav/useNavHelpers.ts b/client/src/hooks/Nav/useNavHelpers.tsnew file mode 100644index 0000000000..7f26cebf06--- /dev/null+++ b/client/src/hooks/Nav/useNavHelpers.ts@@ -0,0 +1,35 @@+import { useCallback, useEffect, useRef } from 'react';+import { useNavigate, useLocation } from 'react-router-dom';+import type { Location } from 'react-router-dom';++export function useCustomLink<T = HTMLAnchorElement>(+ route: string,+ callback?: (event: React.MouseEvent<T>) => void,+) {+ const navigate = useNavigate();+ const location = useLocation();+ const clickHandler = useCallback(+ (event: React.MouseEvent<T>) => {+ if (callback) {+ callback(event);+ }+ if (event.button === 0 && !(event.ctrlKey || event.metaKey)) {+ event.preventDefault();+ navigate(route, { state: { prevLocation: location } });+ }+ },+ [navigate, route, callback, location],+ );+ return clickHandler;+}++export const usePreviousLocation = () => {+ const location = useLocation();+ const previousLocationRef: React.MutableRefObject<Location<unknown> | undefined> = useRef();++ useEffect(() => {+ previousLocationRef.current = location.state?.prevLocation;+ }, [location]);++ return previousLocationRef;+};diff --git a/client/src/hooks/Nav/useNavScrolling.ts b/client/src/hooks/Nav/useNavScrolling.tsindex 635a7bc6a0..78c075c5eb 100644--- a/client/src/hooks/Nav/useNavScrolling.ts+++ b/client/src/hooks/Nav/useNavScrolling.ts@@ -1,7 +1,6 @@import throttle from 'lodash/throttle';import React, { useCallback, useEffect, useRef } from 'react';import type { FetchNextPageOptions, InfiniteQueryObserverResult } from '@tanstack/react-query';-import type { ConversationListResponse } from 'librechat-data-provider';export default function useNavScrolling<TData>({hasNextPage,diff --git a/client/src/hooks/Nav/useSideNavLinks.ts b/client/src/hooks/Nav/useSideNavLinks.tsindex 2f31bdfcd7..326396b5b1 100644--- a/client/src/hooks/Nav/useSideNavLinks.ts+++ b/client/src/hooks/Nav/useSideNavLinks.ts@@ -1,15 +1,23 @@import { useMemo } from 'react';import {ArrowRightToLine,+ MessageSquareQuote,// Settings2,} from 'lucide-react';-import { EModelEndpoint, isAssistantsEndpoint } from 'librechat-data-provider';+import {+ EModelEndpoint,+ isAssistantsEndpoint,+ PermissionTypes,+ Permissions,+} from 'librechat-data-provider';import type { TConfig, TInterfaceConfig } from 'librechat-data-provider';import type { NavLink } from '~/common';import PanelSwitch from '~/components/SidePanel/Builder/PanelSwitch';+import PromptsAccordion from '~/components/Prompts/PromptsAccordion';// import Parameters from '~/components/SidePanel/Parameters/Panel';import FilesPanel from '~/components/SidePanel/Files/Panel';import { Blocks, AttachmentIcon } from '~/components/svg';+import { useHasAccess } from '~/hooks';export default function useSideNavLinks({hidePanel,@@ -24,17 +32,22 @@ export default function useSideNavLinks({endpoint?: EModelEndpoint | null;interfaceConfig: Partial<TInterfaceConfig>;}) {+ const hasAccess = useHasAccess({+ permissionType: PermissionTypes.PROMPTS,+ permission: Permissions.USE,+ });+const Links = useMemo(() => {const links: NavLink[] = [];- // if (!isAssistantsEndpoint(endpoint)) {- // links.push({- // title: 'com_sidepanel_parameters',- // label: '',- // icon: Settings2,- // id: 'parameters',- // Component: Parameters,- // });- // }+ if (hasAccess) {+ links.push({+ title: 'com_ui_prompts',+ label: '',+ icon: MessageSquareQuote,+ id: 'prompts',+ Component: PromptsAccordion,+ });+ }if (isAssistantsEndpoint(endpoint) &&assistants &&@@ -68,7 +81,7 @@ export default function useSideNavLinks({});return links;- }, [assistants, keyProvided, hidePanel, endpoint, interfaceConfig.parameters]);+ }, [assistants, keyProvided, hidePanel, endpoint, interfaceConfig.parameters, hasAccess]);return Links;}diff --git a/client/src/hooks/Prompts/index.ts b/client/src/hooks/Prompts/index.tsnew file mode 100644index 0000000000..bc170f13ff--- /dev/null+++ b/client/src/hooks/Prompts/index.ts@@ -0,0 +1,2 @@+export { default as useCategories } from './useCategories';+export { default as usePromptGroupsNav } from './usePromptGroupsNav';diff --git a/client/src/hooks/Prompts/useCategories.tsx b/client/src/hooks/Prompts/useCategories.tsxnew file mode 100644index 0000000000..4d2c421888--- /dev/null+++ b/client/src/hooks/Prompts/useCategories.tsx@@ -0,0 +1,35 @@+import { useGetCategories } from '~/data-provider';+import CategoryIcon from '~/components/Prompts/Groups/CategoryIcon';+import useLocalize from '~/hooks/useLocalize';++const loadingCategories = [+ {+ label: 'Loading...',+ value: '',+ },+];++const emptyCategory = {+ label: '-',+ value: '',+};++const useCategories = (className = '') => {+ const localize = useLocalize();+ const { data: categories = loadingCategories } = useGetCategories({+ select: (data) =>+ data.map((category) => ({+ label: category.label+ ? localize(`com_ui_${category.label}`) || category.label+ : localize('com_ui_none_selected'),+ value: category.value,+ icon: category.value ? (+ <CategoryIcon category={category.value} className={className} />+ ) : null,+ })),+ });++ return { categories, emptyCategory };+};++export default useCategories;diff --git a/client/src/hooks/Prompts/usePromptGroupsNav.ts b/client/src/hooks/Prompts/usePromptGroupsNav.tsnew file mode 100644index 0000000000..8c56b69383--- /dev/null+++ b/client/src/hooks/Prompts/usePromptGroupsNav.ts@@ -0,0 +1,71 @@+import { useRecoilState, useRecoilValue } from 'recoil';+import { useMemo, useRef, useEffect, useCallback } from 'react';+import { usePromptGroupsInfiniteQuery } from '~/data-provider';+import debounce from 'lodash/debounce';+import store from '~/store';++export default function usePromptGroupsNav() {+ const category = useRecoilValue(store.promptsCategory);+ const [name, setName] = useRecoilState(store.promptsName);+ const [pageSize, setPageSize] = useRecoilState(store.promptsPageSize);+ const [pageNumber, setPageNumber] = useRecoilState(store.promptsPageNumber);++ const maxPageNumberReached = useRef(1);++ useEffect(() => {+ if (pageNumber > 1 && pageNumber > maxPageNumberReached.current) {+ maxPageNumberReached.current = pageNumber;+ }+ }, [pageNumber]);++ const groupsQuery = usePromptGroupsInfiniteQuery({+ name,+ pageSize,+ category,+ pageNumber: pageNumber + '',+ });++ useEffect(() => {+ maxPageNumberReached.current = 1;+ setPageNumber(1);+ }, [pageSize, name, category, setPageNumber]);++ const promptGroups = useMemo(() => {+ return groupsQuery?.data?.pages?.[pageNumber - 1 + '']?.promptGroups || [];+ }, [groupsQuery.data, pageNumber]);++ const nextPage = () => {+ setPageNumber((prev) => prev + 1);+ groupsQuery.hasNextPage && groupsQuery.fetchNextPage();+ };++ const prevPage = () => {+ setPageNumber((prev) => prev - 1);+ groupsQuery.hasPreviousPage && groupsQuery.fetchPreviousPage();+ };++ const isFetching = groupsQuery.isFetchingNextPage;+ const hasNextPage = !!groupsQuery.hasNextPage || maxPageNumberReached.current > pageNumber;+ const hasPreviousPage = !!groupsQuery.hasPreviousPage || pageNumber > 1;++ const debouncedSetName = useCallback(+ debounce((nextValue: string) => {+ setName(nextValue);+ }, 850),+ [setName],+ );++ return {+ name,+ setName: debouncedSetName,+ nextPage,+ prevPage,+ isFetching,+ pageSize,+ setPageSize,+ hasNextPage,+ groupsQuery,+ promptGroups,+ hasPreviousPage,+ };+}diff --git a/client/src/hooks/Roles/index.ts b/client/src/hooks/Roles/index.tsnew file mode 100644index 0000000000..998cfba79b--- /dev/null+++ b/client/src/hooks/Roles/index.ts@@ -0,0 +1 @@+export { default as useHasAccess } from './useHasAccess';diff --git a/client/src/hooks/Roles/useHasAccess.ts b/client/src/hooks/Roles/useHasAccess.tsnew file mode 100644index 0000000000..eba414e353--- /dev/null+++ b/client/src/hooks/Roles/useHasAccess.ts@@ -0,0 +1,34 @@+import { useMemo, useCallback } from 'react';+import { SystemRoles, PermissionTypes, Permissions } from 'librechat-data-provider';+import { useAuthContext } from '~/hooks/AuthContext';++const useHasAccess = ({+ permissionType,+ permission,+}: {+ permissionType: PermissionTypes;+ permission: Permissions;+}) => {+ const { isAuthenticated, user, roles } = useAuthContext();++ const checkAccess = useCallback(+ ({ user, permissionType, permission }) => {+ if (isAuthenticated && user?.role === SystemRoles.ADMIN) {+ return true;+ } else if (isAuthenticated && user?.role && roles && roles[user.role]) {+ return roles[user.role]?.[permissionType]?.[permission] === true;+ }+ return false;+ },+ [isAuthenticated, roles],+ );++ const hasAccess = useMemo(+ () => checkAccess({ user, permissionType, permission }),+ [user, permissionType, permission, checkAccess],+ );++ return hasAccess;+};++export default useHasAccess;diff --git a/client/src/hooks/ThemeContext.tsx b/client/src/hooks/ThemeContext.tsxindex 397889f993..42d46c0dec 100644--- a/client/src/hooks/ThemeContext.tsx+++ b/client/src/hooks/ThemeContext.tsx@@ -30,6 +30,14 @@ const defaultContextValue: ProviderValue = {return;},};++export const isDark = (theme: string): boolean => {+ if (theme === 'system') {+ return window.matchMedia('(prefers-color-scheme: dark)').matches;+ }+ return theme === 'dark';+};+export const ThemeContext = createContext<ProviderValue>(defaultContextValue);export const ThemeProvider = ({ initialTheme, children }) => {@@ -37,14 +45,10 @@ export const ThemeProvider = ({ initialTheme, children }) => {const rawSetTheme = (rawTheme: string) => {const root = window.document.documentElement;- let isDark = rawTheme === 'dark';-- if (rawTheme === 'system') {- isDark = window.matchMedia('(prefers-color-scheme: dark)').matches;- }+ const darkMode = isDark(rawTheme);- root.classList.remove(isDark ? 'light' : 'dark');- root.classList.add(isDark ? 'dark' : 'light');+ root.classList.remove(darkMode ? 'light' : 'dark');+ root.classList.add(darkMode ? 'dark' : 'light');localStorage.setItem('color-theme', rawTheme);};diff --git a/client/src/hooks/index.ts b/client/src/hooks/index.tsindex 818d2e895e..f974f9722a 100644--- a/client/src/hooks/index.ts+++ b/client/src/hooks/index.ts@@ -6,6 +6,8 @@ export * from './Files';export * from './Input';export * from './Messages';export * from './Plugins';+export * from './Prompts';+export * from './Roles';export * from './SSE';export * from './AuthContext';diff --git a/client/src/localization/languages/Ar.ts b/client/src/localization/languages/Ar.tsindex c7bdb7e737..ed0326bf57 100644--- a/client/src/localization/languages/Ar.ts+++ b/client/src/localization/languages/Ar.ts@@ -32,7 +32,6 @@ export default {com_ui_enter: 'أدخل',com_ui_submit: 'إرسال',com_ui_upload_success: 'تم تحميل الملف بنجاح',- com_ui_upload_invalid: 'ملف غير صالح للتحميل',com_ui_cancel: 'إلغاء',com_ui_save: 'حفظ',com_ui_copy_to_clipboard: 'نسخ إلى الحافظة',@@ -60,14 +59,13 @@ export default {com_ui_share_create_message: 'سيظل اسمك وأي رسائل تضيفها بعد المشاركة خاصة.',com_ui_share_created_message:'تم إنشاء رابط مشترك للدردشة الخاصة بك. يمكنك إدارة الدردشات المشتركة مسبقًا في أي وقت عبر الإعدادات.',- com_ui_share_update_message:- 'سيظل اسمك والتعليمات المخصصة وأي رسائل تضيفها بعد المشاركة خاصة.',+ com_ui_share_update_message: 'سيظل اسمك والتعليمات المخصصة وأي رسائل تضيفها بعد المشاركة خاصة.',com_ui_share_updated_message:'تم تحديث رابط مشترك للدردشة الخاصة بك. يمكنك إدارة الدردشات المشتركة مسبقًا في أي وقت عبر الإعدادات.',com_ui_shared_link_not_found: 'الرابط المشترك غير موجود',com_ui_delete: 'حذف',com_ui_delete_conversation: 'حذف الدردشة؟',- com_ui_delete_conversation_confirm: 'سيتم حذف هذا',+ com_ui_delete_confirm: 'سيتم حذف هذا',com_ui_rename: 'إعادة تسمية',com_ui_archive: 'أرشفة',com_ui_archive_error: 'فشل في أرشفة المحادثة',@@ -693,10 +691,6 @@ export const comparisons = {english: 'Successfully uploaded file',translated: 'تم تحميل الملف بنجاح',},- com_ui_upload_invalid: {- english: 'Invalid file for upload. Must be an image not exceeding 2 MB',- translated: 'ملف غير صالح للتحميل',- },com_ui_cancel: {english: 'Cancel',translated: 'إلغاء',@@ -799,7 +793,7 @@ export const comparisons = {},com_ui_share_created_message: {english:- 'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',+ 'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',translated:'تم إنشاء رابط مشترك للدردشة الخاصة بك. يمكنك إدارة الدردشات المشتركة مسبقًا في أي وقت عبر الإعدادات.',},@@ -811,7 +805,7 @@ export const comparisons = {english:'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',translated:- 'تم تحديث رابط مشترك للدردشة الخاصة بك. يمكنك إدارة الدردشات المشتركة مسبقًا في أي وقت عبر الإعدادات.',+ 'تم تحديث رابط مشترك للدردشة الخاصة بك. يمكنك إدارة الدردشات المشتركة مسبقًا في أي وقت عبر الإعدادات.',},com_ui_shared_link_not_found: {english: 'Shared link not found',@@ -825,7 +819,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'حذف الدردشة؟',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'سيتم حذف هذا',},diff --git a/client/src/localization/languages/Br.ts b/client/src/localization/languages/Br.tsindex d69908b6c9..23919953fc 100644--- a/client/src/localization/languages/Br.ts+++ b/client/src/localization/languages/Br.ts@@ -104,7 +104,6 @@ export default {com_ui_submit: 'Enviar',com_ui_upload_success: 'Arquivo carregado com sucesso',com_ui_upload_error: 'Ocorreu um erro ao carregar seu arquivo',- com_ui_upload_invalid: 'Arquivo inválido para upload. Deve ser uma imagem não excedendo 2 MB',com_ui_cancel: 'Cancelar',com_ui_save: 'Salvar',com_ui_save_submit: 'Salvar & Enviar',@@ -141,7 +140,8 @@ export default {com_ui_create_link: 'Criar link',com_ui_share_link_to_chat: 'Compartilhar link no chat',com_ui_share_error: 'Ocorreu um erro ao compartilhar o link do chat',- com_ui_share_create_message: 'Seu nome e quaisquer mensagens que você adicionar após o compartilhamento permanecem privadas.',+ com_ui_share_create_message:+ 'Seu nome e quaisquer mensagens que você adicionar após o compartilhamento permanecem privadas.',com_ui_share_created_message:'Um link compartilhado para o seu chat foi criado. Gerencie conversas compartilhadas previamente a qualquer momento via Configurações.',com_ui_share_update_message:@@ -150,7 +150,7 @@ export default {'Um link compartilhado para o seu chat foi atualizado. Gerencie conversas compartilhadas previamente a qualquer momento via Configurações.',com_ui_shared_link_not_found: 'Link compartilhado não encontrado',com_ui_delete_conversation: 'Excluir conversa?',- com_ui_delete_conversation_confirm: 'Isso excluirá',+ com_ui_delete_confirm: 'Isso excluirá',com_ui_delete_assistant_confirm:'Tem certeza de que deseja excluir este Assistente? Esta ação não pode ser desfeita.',com_ui_rename: 'Renomear',@@ -860,10 +860,6 @@ export const comparisons = {english: 'There was an error uploading your file',translated: 'Ocorreu um erro ao carregar seu arquivo',},- com_ui_upload_invalid: {- english: 'Invalid file for upload. Must be an image not exceeding 2 MB',- translated: 'Arquivo inválido para upload. Deve ser uma imagem não excedendo 2 MB',- },com_ui_cancel: {english: 'Cancel',translated: 'Cancelar',@@ -1010,7 +1006,8 @@ export const comparisons = {},com_ui_share_create_message: {english: 'Your name and any messages you add after sharing stay private.',- translated: 'Seu nome e quaisquer mensagens que você adicionar após o compartilhamento permanecem privadas.',+ translated:+ 'Seu nome e quaisquer mensagens que você adicionar após o compartilhamento permanecem privadas.',},com_ui_share_created_message: {english:@@ -1027,7 +1024,7 @@ export const comparisons = {english:'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',translated:- 'Um link compartilhado para o seu chat foi atualizado. Gerencie conversas compartilhadas previamente a qualquer momento via Configurações.',+ 'Um link compartilhado para o seu chat foi atualizado. Gerencie conversas compartilhadas previamente a qualquer momento via Configurações.',},com_ui_shared_link_not_found: {english: 'Shared link not found',@@ -1037,7 +1034,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Excluir conversa?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Isso excluirá',},diff --git a/client/src/localization/languages/De.ts b/client/src/localization/languages/De.tsindex b0b62b0964..0ee7170b22 100644--- a/client/src/localization/languages/De.ts+++ b/client/src/localization/languages/De.ts@@ -116,8 +116,6 @@ export default {com_ui_submit: 'Abschicken',com_ui_upload_success: 'Erfolgreich hochgeladene Datei',com_ui_upload_error: 'Beim Hochladen deiner Datei ist ein Fehler aufgetreten',- com_ui_upload_invalid:- 'Ungültige Datei zum Hochladen. Muss ein Bild sein, das nicht größer als 2 MB ist',com_ui_cancel: 'Abbrechen',com_ui_save: 'Speichern',com_ui_save_submit: 'Speichern & Absenden',@@ -154,7 +152,8 @@ export default {com_ui_create_link: 'Link erstellen',com_ui_share_link_to_chat: 'Link zum Chat teilen',com_ui_share_error: 'Beim Teilen des Chat-Links ist ein Fehler aufgetreten',- com_ui_share_create_message: 'Ihr Name und alle Nachrichten, die Sie nach dem Teilen hinzufügen, bleiben privat.',+ com_ui_share_create_message:+ 'Ihr Name und alle Nachrichten, die Sie nach dem Teilen hinzufügen, bleiben privat.',com_ui_share_created_message:'Ein geteiltes Link zu Ihrem Chat wurde erstellt. Verwalten Sie zuvor geteilte Chats jederzeit über die Einstellungen.',com_ui_share_update_message:@@ -163,7 +162,7 @@ export default {'Ein geteiltes Link zu Ihrem Chat wurde aktualisiert. Verwalten Sie zuvor geteilte Chats jederzeit über die Einstellungen.',com_ui_shared_link_not_found: 'Geteilter Link nicht gefunden',com_ui_delete_conversation: 'Chat löschen?',- com_ui_delete_conversation_confirm: 'Damit wird gelöscht',+ com_ui_delete_confirm: 'Damit wird gelöscht',com_ui_delete_assistant_confirm:'Bist du sicher, dass du diesen Assistenten löschen willst? Dies kann nicht rückgängig gemacht werden.',com_ui_rename: 'Umbenennen',@@ -1012,10 +1011,6 @@ export const comparisons = {english: 'There was an error uploading your file',translated: 'Beim Hochladen deiner Datei ist ein Fehler aufgetreten',},- com_ui_upload_invalid: {- english: 'Invalid file for upload. Must be an image not exceeding 2 MB',- translated: 'Ungültige Datei zum Hochladen. Muss ein Bild sein, das nicht größer als 2 MB ist',- },com_ui_cancel: {english: 'Cancel',translated: 'Abbrechen',@@ -1162,7 +1157,8 @@ export const comparisons = {},com_ui_share_create_message: {english: 'Your name and any messages you add after sharing stay private.',- translated: 'Ihr Name und alle Nachrichten, die Sie nach dem Teilen hinzufügen, bleiben privat.',+ translated:+ 'Ihr Name und alle Nachrichten, die Sie nach dem Teilen hinzufügen, bleiben privat.',},com_ui_share_created_message: {english:@@ -1189,7 +1185,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Chat löschen?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Damit wird gelöscht',},diff --git a/client/src/localization/languages/Eng.ts b/client/src/localization/languages/Eng.tsindex a93878dd00..aa8aa03a5a 100644--- a/client/src/localization/languages/Eng.ts+++ b/client/src/localization/languages/Eng.ts@@ -86,18 +86,6 @@ export default {com_ui_examples: 'Examples',com_ui_new_chat: 'New chat',com_ui_happy_birthday: 'It\'s my 1st birthday!',- com_ui_example_quantum_computing: 'Explain quantum computing in simple terms',- com_ui_example_10_year_old_b_day: 'Got any creative ideas for a 10 year old\'s birthday?',- com_ui_example_http_in_js: 'How do I make an HTTP request in Javascript?',- com_ui_capabilities: 'Capabilities',- com_ui_capability_remember: 'Remembers what user said earlier in the conversation',- com_ui_capability_correction: 'Allows user to provide follow-up corrections',- com_ui_capability_decline_requests: 'Trained to decline inappropriate requests',- com_ui_limitations: 'Limitations',- com_ui_limitation_incorrect_info: 'May occasionally generate incorrect information',- com_ui_limitation_harmful_biased:- 'May occasionally produce harmful instructions or biased content',- com_ui_limitation_limited_2021: 'Limited knowledge of world and events after 2021',com_ui_experimental: 'Experimental Features',com_ui_on: 'On',com_ui_off: 'Off',@@ -130,8 +118,31 @@ export default {com_ui_next: 'Next',com_ui_stop: 'Stop',com_ui_upload_files: 'Upload files',- com_ui_prompt_templates: 'Prompt Templates',- com_ui_hide_prompt_templates: 'Hide Prompt Templates',+ com_ui_prompt: 'Prompt',+ com_ui_prompts: 'Prompts',+ com_ui_prompt_name: 'Prompt Name',+ com_ui_delete_prompt: 'Delete Prompt?',+ com_ui_admin: 'Admin',+ com_ui_simple: 'Simple',+ com_ui_versions: 'Versions',+ com_ui_version_var: 'Version {0}',+ com_ui_advanced: 'Advanced',+ com_ui_admin_settings: 'Admin Settings',+ com_ui_error_save_admin_settings: 'There was an error saving your admin settings.',+ com_ui_prompt_preview_not_shared: 'The author has not allowed collaboration for this prompt.',+ com_ui_is_required: '{0} is required',+ com_ui_text_prompt: 'Text',+ com_ui_back_to_chat: 'Back to Chat',+ com_ui_back_to_var: 'Back to {0}',+ com_ui_categories: 'Categories',+ com_ui_filter_prompts_name: 'Filter prompts by name',+ com_ui_search_var: 'Search {0}',+ com_ui_manage: 'Manage',+ com_ui_variables: 'Variables',+ com_ui_variables_info:+ 'Use double braces in your text to create variables, e.g. {{example variable}}, to later fill when using the prompt.',+ com_ui_special_variables:+ 'Special variables: Use {{current_date}} for the current date, and {{current_user}} for your given account name.',com_ui_showing: 'Showing',com_ui_of: 'of',com_ui_entries: 'Entries',@@ -142,9 +153,11 @@ export default {com_ui_none_selected: 'None selected',com_ui_upload_success: 'Successfully uploaded file',com_ui_upload_error: 'There was an error uploading your file',- com_ui_upload_invalid: 'Invalid file for upload. Must be an image not exceeding 2 MB',+ com_ui_upload_invalid: 'Invalid file for upload. Must be an image not exceeding the limit',+ com_ui_upload_invalid_var: 'Invalid file for upload. Must be an image not exceeding {0} MB',com_ui_cancel: 'Cancel',com_ui_save: 'Save',+ com_ui_renaming_var: 'Renaming "{0}"',com_ui_save_submit: 'Save & Submit',com_user_message: 'You',com_ui_read_aloud: 'Read aloud',@@ -186,8 +199,10 @@ export default {com_ui_regenerate: 'Regenerate',com_ui_continue: 'Continue',com_ui_edit: 'Edit',+ com_ui_loading: 'Loading...',com_ui_success: 'Success',com_ui_all: 'all',+ com_ui_all_proper: 'All',com_ui_clear: 'Clear',com_ui_revoke: 'Revoke',com_ui_revoke_info: 'Revoke all user provided credentials',@@ -199,6 +214,8 @@ export default {com_ui_import_conversation_error: 'There was an error importing your conversations',com_ui_import_conversation_file_type_error: 'Unsupported import type',com_ui_confirm_action: 'Confirm Action',+ com_ui_chat: 'Chat',+ com_ui_dashboard: 'Dashboard',com_ui_chats: 'chats',com_ui_avatar: 'Avatar',com_ui_unknown: 'Unknown',@@ -212,10 +229,23 @@ export default {com_ui_assistants_output: 'Assistants Output',com_ui_delete: 'Delete',com_ui_create: 'Create',+ com_ui_create_var: 'Create {0}',com_ui_share: 'Share',+ com_ui_share_var: 'Share {0}',com_ui_copy_link: 'Copy link',com_ui_update_link: 'Update link',com_ui_create_link: 'Create link',+ com_ui_share_to_all_users: 'Share to all users',+ com_ui_my_prompts: 'My Prompts',+ com_ui_no_category: 'No category',+ com_ui_shared_prompts: 'Shared Prompts',+ com_ui_prompts_allow_use: 'Allow using Prompts',+ com_ui_prompts_allow_create: 'Allow creating Prompts',+ com_ui_prompts_allow_share_global: 'Allow sharing Prompts to all users',+ com_ui_prompt_shared_to_all: 'This prompt is shared to all users',+ com_ui_prompt_already_shared_to_all: 'This prompt is already shared to all users',+ com_ui_description_placeholder: 'Optional: Enter a description to display in the prompt',+ com_ui_no_prompt_description: 'No description found.',com_ui_share_link_to_chat: 'Share link to chat',com_ui_share_error: 'There was an error sharing the chat link',com_ui_share_create_message: 'Your name and any messages you add after sharing stay private.',@@ -227,7 +257,9 @@ export default {'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',com_ui_shared_link_not_found: 'Shared link not found',com_ui_delete_conversation: 'Delete chat?',- com_ui_delete_conversation_confirm: 'This will delete',+ com_ui_delete_confirm: 'This will delete',+ com_ui_delete_confirm_prompt_version_var:+ 'This will delete the selected version for "{0}." If no other versions exist, the prompt will be deleted.',com_ui_delete_assistant_confirm:'Are you sure you want to delete this Assistant? This cannot be undone.',com_ui_rename: 'Rename',@@ -509,6 +541,16 @@ export default {com_nav_tool_add: 'Add',com_nav_tool_remove: 'Remove',com_nav_tool_dialog: 'Assistant Tools',+ com_ui_misc: 'Misc.',+ com_ui_roleplay: 'Roleplay',+ com_ui_write: 'Writing',+ com_ui_idea: 'Ideas',+ com_ui_shop: 'Shopping',+ com_ui_finance: 'Finance',+ com_ui_code: 'Code',+ com_ui_travel: 'Travel',+ com_ui_teach_or_explain: 'Learning',+ com_ui_select_a_category: 'No category selected',com_nav_tool_dialog_description: 'Assistant must be saved to persist tool selections.',com_show_agent_settings: 'Show Agent Settings',com_show_completion_settings: 'Show Completion Settings',@@ -544,6 +586,8 @@ export default {com_nav_user_name_display: 'Display username in messages',com_nav_save_drafts: 'Save drafts locally',com_nav_show_code: 'Always show code when using code interpreter',+ com_nav_auto_send_prompts: 'Auto-send Prompts',+ com_nav_always_make_prod: 'Always make new versions production',com_nav_clear_all_chats: 'Clear all chats',com_nav_confirm_clear: 'Confirm Clear',com_nav_close_sidebar: 'Close sidebar',diff --git a/client/src/localization/languages/Es.ts b/client/src/localization/languages/Es.tsindex c1157ec11b..34342e7c3f 100644--- a/client/src/localization/languages/Es.ts+++ b/client/src/localization/languages/Es.ts@@ -106,7 +106,6 @@ export default {com_ui_submit: 'Enviar',com_ui_upload_success: 'Archivo subido con éxito',com_ui_upload_error: 'Hubo un error al subir su archivo',- com_ui_upload_invalid: 'Archivo inválido para subir. Debe ser una imagen que no exceda los 2 MB',com_ui_cancel: 'Cancelar',com_ui_save: 'Guardar',com_ui_save_submit: 'Guardar y Enviar',@@ -143,7 +142,8 @@ export default {com_ui_create_link: 'Crear enlace',com_ui_share_link_to_chat: 'Compartir enlace en el chat',com_ui_share_error: 'Hubo un error al compartir el enlace del chat',- com_ui_share_create_message: 'Tu nombre y cualquier mensaje que agregues después de compartir se mantendrán privados.',+ com_ui_share_create_message:+ 'Tu nombre y cualquier mensaje que agregues después de compartir se mantendrán privados.',com_ui_share_created_message:'Se ha creado un enlace compartido para tu chat. Gestiona los chats compartidos anteriormente en cualquier momento a través de Configuración.',com_ui_share_update_message:@@ -152,7 +152,7 @@ export default {'Se ha actualizado un enlace compartido para tu chat. Gestiona los chats compartidos anteriormente en cualquier momento a través de Configuración.',com_ui_shared_link_not_found: 'Enlace compartido no encontrado',com_ui_delete_conversation: '¿Eliminar Chat?',- com_ui_delete_conversation_confirm: 'Esto eliminará',+ com_ui_delete_confirm: 'Esto eliminará',com_ui_delete_assistant_confirm:'¿Está seguro de que desea eliminar este Asistente? Esta acción no se puede deshacer.',com_ui_rename: 'Renombrar',@@ -984,10 +984,6 @@ export const comparisons = {english: 'There was an error uploading your file',translated: 'Hubo un error al subir su archivo',},- com_ui_upload_invalid: {- english: 'Invalid file for upload. Must be an image not exceeding 2 MB',- translated: 'Archivo inválido para subir. Debe ser una imagen que no exceda los 2 MB',- },com_ui_cancel: {english: 'Cancel',translated: 'Cancelar',@@ -1134,13 +1130,14 @@ export const comparisons = {},com_ui_share_create_message: {english: 'Your name and any messages you add after sharing stay private.',- translated: 'Tu nombre y cualquier mensaje que agregues después de compartir se mantendrán privados.',+ translated:+ 'Tu nombre y cualquier mensaje que agregues después de compartir se mantendrán privados.',},com_ui_share_created_message: {english:- 'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',+ 'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',translated:- 'Se ha creado un enlace compartido para tu chat. Gestiona los chats compartidos anteriormente en cualquier momento a través de Configuración.',+ 'Se ha creado un enlace compartido para tu chat. Gestiona los chats compartidos anteriormente en cualquier momento a través de Configuración.',},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',@@ -1149,9 +1146,9 @@ export const comparisons = {},com_ui_share_updated_message: {english:- 'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',+ 'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',translated:- 'Se ha actualizado un enlace compartido para tu chat. Gestiona los chats compartidos anteriormente en cualquier momento a través de Configuración.',+ 'Se ha actualizado un enlace compartido para tu chat. Gestiona los chats compartidos anteriormente en cualquier momento a través de Configuración.',},com_ui_shared_link_not_found: {english: 'Shared link not found',@@ -1161,7 +1158,7 @@ export const comparisons = {english: 'Delete chat?',translated: '¿Eliminar Chat?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Esto eliminará',},diff --git a/client/src/localization/languages/Fr.ts b/client/src/localization/languages/Fr.tsindex e98dde4d86..4111989a3c 100644--- a/client/src/localization/languages/Fr.ts+++ b/client/src/localization/languages/Fr.ts@@ -41,8 +41,6 @@ export default {com_ui_submit: 'Soumettre',com_ui_upload_success: 'Fichier téléversé avec succès',com_ui_upload_error: 'Une erreur s\'est produite lors du téléversement de votre fichier',- com_ui_upload_invalid:- 'Fichier invalide pour le téléversement. Doit être une image ne dépassant pas 2 Mo',com_ui_cancel: 'Annuler',com_ui_save: 'Sauvegarder',com_ui_save_submit: 'Enregistrer et Soumettre',@@ -78,7 +76,7 @@ export default {com_ui_shared_link_not_found: 'Shared link not found',com_ui_delete: 'Supprimer',com_ui_delete_conversation: 'Supprimer la discussions?',- com_ui_delete_conversation_confirm: 'Cela supprimera',+ com_ui_delete_confirm: 'Cela supprimera',com_ui_rename: 'Renombrar',com_ui_archive: 'Archiver',com_ui_archive_error: 'échec de l\'archivage de la conversation',@@ -738,10 +736,6 @@ export const comparisons = {english: 'There was an error uploading your file',translated: 'Une erreur s\'est produite lors du téléversement de votre fichier',},- com_ui_upload_invalid: {- english: 'Invalid file for upload. Must be an image not exceeding 2 MB',- translated: 'Fichier invalide pour le téléversement. Doit être une image ne dépassant pas 2 Mo',- },com_ui_cancel: {english: 'Cancel',translated: 'Annuler',@@ -840,19 +834,20 @@ export const comparisons = {},com_ui_share_created_message: {english:- 'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',+ 'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',translated:'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',- translated: 'Your name, custom instructions, and any messages you add after sharing stay private.',+ translated:+ 'Your name, custom instructions, and any messages you add after sharing stay private.',},com_ui_share_updated_message: {english:- 'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',+ 'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',translated:- 'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',+ 'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',},com_ui_shared_link_not_found: {english: 'Shared link not found',@@ -866,7 +861,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Supprimer la discussions?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Cela supprimera',},diff --git a/client/src/localization/languages/He.ts b/client/src/localization/languages/He.tsindex 1b6c8518e1..d2ade2f1bc 100644--- a/client/src/localization/languages/He.ts+++ b/client/src/localization/languages/He.ts@@ -67,7 +67,6 @@ export default {com_ui_submit: 'שלח',com_ui_upload_success: 'קובץ שהועלה בהצלחה',com_ui_upload_error: 'אירעה שגיאה בהעלאת הקובץ שלך',- com_ui_upload_invalid: 'קובץ לא חוקי להעלאה. חייבת להיות תמונה שגודלה לא עולה על 2 MB',com_ui_cancel: 'בטל',com_ui_save: 'שמור',com_ui_save_submit: 'שמור ושלח',@@ -106,7 +105,7 @@ export default {'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',com_ui_shared_link_not_found: 'Shared link not found',com_ui_delete_conversation: 'למחוק את השיחה (צאט)?',- com_ui_delete_conversation_confirm: 'זה ימחק',+ com_ui_delete_confirm: 'זה ימחק',com_ui_delete_assistant_confirm:'האם אתה בטוח שאתה רוצה למחוק את הסייען הזה? אי אפשר לבטל את זה.',com_ui_rename: 'שם מחדש',@@ -648,10 +647,6 @@ export const comparisons = {english: 'There was an error uploading your file',translated: 'אירעה שגיאה בהעלאת הקובץ שלך',},- com_ui_upload_invalid: {- english: 'Invalid file for upload. Must be an image not exceeding 2 MB',- translated: 'קובץ לא חוקי להעלאה. חייבת להיות תמונה שגודלה לא עולה על 2 MB',- },com_ui_cancel: {english: 'Cancel',translated: 'בטל',@@ -780,7 +775,8 @@ export const comparisons = {},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',- translated: 'Your name, custom instructions, and any messages you add after sharing stay private.',+ translated:+ 'Your name, custom instructions, and any messages you add after sharing stay private.',},com_ui_share_updated_message: {english:@@ -796,7 +792,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'למחוק את השיחה (צאט)?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'זה ימחק',},diff --git a/client/src/localization/languages/Id.ts b/client/src/localization/languages/Id.tsindex a6d7f624c3..d4216dfa00 100644--- a/client/src/localization/languages/Id.ts+++ b/client/src/localization/languages/Id.ts@@ -39,8 +39,6 @@ export default {com_ui_submit: 'Kirim',com_ui_upload_success: 'Berhasil mengunggah file',com_ui_upload_error: 'Ada kesalahan saat mengunggah file Anda',- com_ui_upload_invalid:- 'File tidak valid untuk diunggah. Harus berupa gambar yang tidak melebihi 2 MB',com_ui_cancel: 'Batal',com_ui_save: 'Simpan',com_ui_save_submit: 'Simpan & Kirim',@@ -67,7 +65,8 @@ export default {com_ui_create_link: 'Buat tautan',com_ui_share_link_to_chat: 'Bagikan tautan ke chat',com_ui_share_error: 'Terjadi kesalahan saat membagikan tautan chat',- com_ui_share_create_message: 'Nama Anda dan pesan apa pun yang Anda tambahkan setelah berbagi tetap pribadi.',+ com_ui_share_create_message:+ 'Nama Anda dan pesan apa pun yang Anda tambahkan setelah berbagi tetap pribadi.',com_ui_share_created_message:'Tautan berbagi ke chat Anda telah dibuat. Kelola chat yang pernah dibagikan kapan saja melalui Pengaturan.',com_ui_share_update_message:@@ -77,7 +76,7 @@ export default {com_ui_shared_link_not_found: 'Tautan berbagi tidak ditemukan',com_ui_delete: 'Hapus',com_ui_delete_conversation: 'Hapus chat?',- com_ui_delete_conversation_confirm: 'Ini akan menghapus',+ com_ui_delete_confirm: 'Ini akan menghapus',com_ui_rename: 'Renombrar',com_ui_archive: 'Arsip',com_ui_archive_error: 'Gagal mengarsipkan percakapan',@@ -628,16 +627,19 @@ export const comparisons = {com_ui_share_created_message: {english:'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',- translated: 'Tautan berbagi ke chat Anda telah dibuat. Kelola chat yang pernah dibagikan kapan saja melalui Pengaturan.',+ translated:+ 'Tautan berbagi ke chat Anda telah dibuat. Kelola chat yang pernah dibagikan kapan saja melalui Pengaturan.',},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',- translated: 'Nama Anda, petunjuk khusus, dan pesan apa pun yang Anda tambahkan setelah berbagi tetap pribadi.',+ translated:+ 'Nama Anda, petunjuk khusus, dan pesan apa pun yang Anda tambahkan setelah berbagi tetap pribadi.',},com_ui_share_updated_message: {english:'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',- translated: 'Tautan berbagi ke chat Anda telah diperbarui. Kelola chat yang pernah dibagikan kapan saja melalui Pengaturan.',+ translated:+ 'Tautan berbagi ke chat Anda telah diperbarui. Kelola chat yang pernah dibagikan kapan saja melalui Pengaturan.',},com_ui_shared_link_not_found: {english: 'Shared link not found',@@ -651,7 +653,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Hapus chat?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Ini akan menghapus',},diff --git a/client/src/localization/languages/It.ts b/client/src/localization/languages/It.tsindex 23ce99126b..d5ee2f98df 100644--- a/client/src/localization/languages/It.ts+++ b/client/src/localization/languages/It.ts@@ -124,8 +124,6 @@ export default {com_ui_none_selected: 'Nessuna selezionata',com_ui_upload_success: 'File caricato con successo',com_ui_upload_error: 'Si è verificato un errore durante il caricamento del file',- com_ui_upload_invalid:- 'File non valido per il caricamento. Deve essere un\'immagine non superiore a 2 MB',com_ui_cancel: 'Annulla',com_ui_save: 'Salva',com_ui_save_submit: 'Salva e Invia',@@ -194,7 +192,8 @@ export default {com_ui_create_link: 'Crea link',com_ui_share_link_to_chat: 'Condividi link a chat',com_ui_share_error: 'Si è verificato un errore durante la condivisione del link della chat',- com_ui_share_create_message: 'Il tuo nome e qualsiasi messaggio aggiunto dopo la condivisione rimarranno privati.',+ com_ui_share_create_message:+ 'Il tuo nome e qualsiasi messaggio aggiunto dopo la condivisione rimarranno privati.',com_ui_share_created_message:'È stato creato un link condiviso per la tua chat. Gestisci le chat condivise in precedenza in qualsiasi momento tramite Impostazioni.',com_ui_share_update_message:@@ -203,7 +202,7 @@ export default {'Il link condiviso per la tua chat è stato aggiornato. Gestisci le chat condivise in precedenza in qualsiasi momento tramite Impostazioni.',com_ui_shared_link_not_found: 'Link condiviso non trovato',com_ui_delete_conversation: 'Eliminare la chat?',- com_ui_delete_conversation_confirm: 'Questo eliminerà',+ com_ui_delete_confirm: 'Questo eliminerà',com_ui_rename: 'Rinominare',com_ui_archive: 'Arsip',com_ui_archive_error: 'Errore durante l\'archiviazione della conversazione',@@ -1293,7 +1292,8 @@ export const comparisons = {},com_ui_share_create_message: {english: 'Your name and any messages you add after sharing stay private.',- translated: 'Il tuo nome e qualsiasi messaggio aggiunto dopo la condivisione rimarranno privati.',+ translated:+ 'Il tuo nome e qualsiasi messaggio aggiunto dopo la condivisione rimarranno privati.',},com_ui_share_created_message: {english:@@ -1303,7 +1303,8 @@ export const comparisons = {},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',- translated: 'Il tuo nome, istruzioni personalizzate e qualsiasi messaggio aggiunto dopo la condivisione rimarranno privati.',+ translated:+ 'Il tuo nome, istruzioni personalizzate e qualsiasi messaggio aggiunto dopo la condivisione rimarranno privati.',},com_ui_share_updated_message: {english:@@ -1319,7 +1320,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Eliminare la chat?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Questo eliminerà',},diff --git a/client/src/localization/languages/Jp.ts b/client/src/localization/languages/Jp.tsindex 3a90a96825..a3af3ea227 100644--- a/client/src/localization/languages/Jp.ts+++ b/client/src/localization/languages/Jp.ts@@ -116,7 +116,6 @@ export default {com_ui_submit: '送信する',com_ui_upload_success: 'アップロード成功',com_ui_upload_error: 'ファイルのアップロード中にエラーが発生しました。',- com_ui_upload_invalid: '不正なファイルです',com_ui_cancel: 'キャンセル',com_ui_save: '保存',com_ui_save_submit: '保存 & 送信',@@ -163,7 +162,7 @@ export default {'チャットの共有リンクが更新されました。設定から以前共有したチャットを管理できます。',com_ui_shared_link_not_found: '共有リンクが見つかりません',com_ui_delete_conversation: 'チャットを削除しますか?',- com_ui_delete_conversation_confirm: 'このチャットは削除されます。',+ com_ui_delete_confirm: 'このチャットは削除されます。',com_ui_delete_assistant_confirm: 'このアシスタントを削除しますか? この操作は元に戻せません。',com_ui_rename: 'タイトル変更',com_ui_archive: 'アーカイブ',@@ -1174,7 +1173,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'チャットを削除しますか?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'このチャットは削除されます。',},diff --git a/client/src/localization/languages/Ko.ts b/client/src/localization/languages/Ko.tsindex 6ca4d55e8c..ddd09881e7 100644--- a/client/src/localization/languages/Ko.ts+++ b/client/src/localization/languages/Ko.ts@@ -31,7 +31,6 @@ export default {com_ui_enter: 'Enter',com_ui_submit: '제출',com_ui_upload_success: '파일 업로드 성공',- com_ui_upload_invalid: '잘못된 파일입니다',com_ui_cancel: '취소',com_ui_save: '저장',com_ui_copy_to_clipboard: '클립보드에 복사',@@ -66,7 +65,7 @@ export default {com_ui_shared_link_not_found: '공유 링크를 찾을 수 없습니다',com_ui_delete: '삭제',com_ui_delete_conversation: '채팅을 삭제하시겠습니까?',- com_ui_delete_conversation_confirm: '이 채팅이 삭제됩니다',+ com_ui_delete_confirm: '이 채팅이 삭제됩니다',com_ui_rename: '이름 바꾸기',com_ui_archive: '아카이브',com_ui_archive_error: '대화 아카이브 실패',@@ -803,7 +802,8 @@ export const comparisons = {com_ui_share_updated_message: {english:'A shared link to your chat has been updated. Manage previously shared chats at any time via Settings.',- translated: '귀하의 채팅에 대한 공유 링크가 업데이트되었습니다. 설정을 통해 언제든지 이전에 공유한 채팅을 관리할 수 있습니다.',+ translated:+ '귀하의 채팅에 대한 공유 링크가 업데이트되었습니다. 설정을 통해 언제든지 이전에 공유한 채팅을 관리할 수 있습니다.',},com_ui_shared_link_not_found: {english: 'Shared link not found',@@ -817,7 +817,7 @@ export const comparisons = {english: 'Delete chat?',translated: '채팅을 삭제하시겠습니까?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: '이 채팅이 삭제됩니다',},diff --git a/client/src/localization/languages/Nl.ts b/client/src/localization/languages/Nl.tsindex 79904ea260..85a332ec21 100644--- a/client/src/localization/languages/Nl.ts+++ b/client/src/localization/languages/Nl.ts@@ -34,7 +34,6 @@ export default {com_ui_enter: 'Invoeren',com_ui_submit: 'Indienen',com_ui_upload_success: 'Bestand succesvol geüpload',- com_ui_upload_invalid: 'Ongeldig bestand voor uploaden',com_ui_cancel: 'Annuleren',com_ui_save: 'Opslaan',com_ui_copy_to_clipboard: 'Kopiëren naar klembord',@@ -60,7 +59,8 @@ export default {com_ui_create_link: 'Link aanmaken',com_ui_share_link_to_chat: 'Deel link naar chat',com_ui_share_error: 'Er is een fout opgetreden bij het delen van de chatlink',- com_ui_share_create_message: 'Uw naam en alle berichten die u na het delen toevoegt, blijven privé.',+ com_ui_share_create_message:+ 'Uw naam en alle berichten die u na het delen toevoegt, blijven privé.',com_ui_share_created_message:'Een gedeelde link naar uw chat is aangemaakt. Beheer eerder gedeelde chats op elk moment via Instellingen.',com_ui_share_update_message:@@ -70,7 +70,7 @@ export default {com_ui_shared_link_not_found: 'Gedeelde link niet gevonden',com_ui_delete: 'Verwijderen',com_ui_delete_conversation: 'Chat verwijderen?',- com_ui_delete_conversation_confirm: 'Hiermee wordt',+ com_ui_delete_confirm: 'Hiermee wordt',com_ui_rename: 'Hernoemen',com_ui_archive: 'Archiveren',com_ui_archive_error: 'Kan conversatie niet archiveren',@@ -546,11 +546,12 @@ export const comparisons = {english:'A shared link to your chat has been created. Manage previously shared chats at any time via Settings.',translated:- 'Een gedeelde link naar uw chat is aangemaakt. Beheer eerder gedeelde chats op elk moment via Instellingen.',+ 'Een gedeelde link naar uw chat is aangemaakt. Beheer eerder gedeelde chats op elk moment via Instellingen.',},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',- translated: 'Uw naam, aangepaste instructies en alle berichten die u na het delen toevoegt, blijven privé.',+ translated:+ 'Uw naam, aangepaste instructies en alle berichten die u na het delen toevoegt, blijven privé.',},com_ui_share_updated_message: {english:@@ -570,7 +571,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Chat verwijderen?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Hiermee wordt',},diff --git a/client/src/localization/languages/Ru.ts b/client/src/localization/languages/Ru.tsindex ee746be9df..03158011c8 100644--- a/client/src/localization/languages/Ru.ts+++ b/client/src/localization/languages/Ru.ts@@ -42,7 +42,6 @@ export default {com_ui_enter: 'Ввести',com_ui_submit: 'Отправить',com_ui_upload_success: 'Файл успешно загружен',- com_ui_upload_invalid: 'Недопустимый файл для загрузки',com_ui_cancel: 'Отмена',com_ui_save: 'Сохранить',com_ui_save_submit: 'Сохранить и отправить',@@ -72,7 +71,8 @@ export default {com_ui_create_link: 'Создать ссылку',com_ui_share_link_to_chat: 'Поделиться ссылкой в чате',com_ui_share_error: 'Произошла ошибка при попытке поделиться ссылкой на чат',- com_ui_share_create_message: 'Ваше имя и любые сообщения, которые вы добавите после обмена, останутся конфиденциальными.',+ com_ui_share_create_message:+ 'Ваше имя и любые сообщения, которые вы добавите после обмена, останутся конфиденциальными.',com_ui_share_created_message:'Создана общая ссылка на ваш чат. Управляйте ранее общими чатами в любое время через Настройки.',com_ui_share_update_message:@@ -81,7 +81,7 @@ export default {'Обновлена общая ссылка на ваш чат. Управляйте ранее общими чатами в любое время через Настройки.',com_ui_shared_link_not_found: 'Общая ссылка не найдена',com_ui_delete_conversation: 'Удалить чат?',- com_ui_delete_conversation_confirm: 'Будет удален следующий чат: ',+ com_ui_delete_confirm: 'Будет удален следующий чат: ',com_ui_rename: 'Переименовать',com_ui_archive: 'Архивировать',com_ui_archive_error: 'Nie udało się archiwizować rozmowy',@@ -860,7 +860,8 @@ export const comparisons = {},com_ui_share_create_message: {english: 'Your name and any messages you add after sharing stay private.',- translated: 'Ваше имя и любые сообщения, которые вы добавите после обмена, останутся конфиденциальными.',+ translated:+ 'Ваше имя и любые сообщения, которые вы добавите после обмена, останутся конфиденциальными.',},com_ui_share_created_message: {english:@@ -887,7 +888,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Удалить чат?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Будет удален следующий чат: ',},diff --git a/client/src/localization/languages/Sv.ts b/client/src/localization/languages/Sv.tsindex 777ae3ccfe..04bb815f4d 100644--- a/client/src/localization/languages/Sv.ts+++ b/client/src/localization/languages/Sv.ts@@ -32,7 +32,6 @@ export default {com_ui_enter: 'Ange',com_ui_submit: 'Skicka',com_ui_upload_success: 'Uppladdningen av filen lyckades',- com_ui_upload_invalid: 'Ogiltig fil för uppladdning',com_ui_cancel: 'Avbryt',com_ui_save: 'Spara',com_ui_copy_to_clipboard: 'Kopiera till urklipp',@@ -57,7 +56,8 @@ export default {com_ui_create_link: 'Skapa länk',com_ui_share_link_to_chat: 'Dela länk till chatt',com_ui_share_error: 'Ett fel uppstod vid delning av chattlänken',- com_ui_share_create_message: 'Ditt namn och alla meddelanden du lägger till efter delningen förblir privata.',+ com_ui_share_create_message:+ 'Ditt namn och alla meddelanden du lägger till efter delningen förblir privata.',com_ui_share_created_message:'En delad länk till din chatt har skapats. Hantera tidigare delade chattar när som helst via Inställningar.',com_ui_share_update_message:@@ -67,7 +67,7 @@ export default {com_ui_shared_link_not_found: 'Delad länk hittades inte',com_ui_delete: 'Radera',com_ui_delete_conversation: 'Radera chatt?',- com_ui_delete_conversation_confirm: 'Detta kommer att radera',+ com_ui_delete_confirm: 'Detta kommer att radera',com_ui_rename: 'byta namn på',com_ui_archive: 'Arkiv',com_ui_archive_error: 'Kunde inte arkivera chatt',@@ -551,7 +551,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Radera chatt?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Detta kommer att radera',},diff --git a/client/src/localization/languages/Tr.ts b/client/src/localization/languages/Tr.tsindex e6c8a3c890..e517e15d8e 100644--- a/client/src/localization/languages/Tr.ts+++ b/client/src/localization/languages/Tr.ts@@ -34,7 +34,6 @@ export default {com_ui_enter: 'Gir',com_ui_submit: 'Gönder',com_ui_upload_success: 'Dosya başarıyla yüklendi',- com_ui_upload_invalid: 'Geçersiz dosya yükleme',com_ui_cancel: 'İptal',com_ui_save: 'Kaydet',com_ui_copy_to_clipboard: 'Panoya kopyala',@@ -59,7 +58,8 @@ export default {com_ui_create_link: 'Bağlantı oluştur',com_ui_share_link_to_chat: 'Bağlantıyı sohbete paylaş',com_ui_share_error: 'Sohbet bağlantısını paylaşırken bir hata oluştu',- com_ui_share_create_message: 'Adınız ve paylaşım sonrasında eklediğiniz herhangi bir mesaj özel kalır.',+ com_ui_share_create_message:+ 'Adınız ve paylaşım sonrasında eklediğiniz herhangi bir mesaj özel kalır.',com_ui_share_created_message:'Sohbetiniz için paylaşılan bir bağlantı oluşturuldu. Ayarlar aracılığıyla önceden paylaşılan sohbetleri istediğiniz zaman yönetin.',com_ui_share_update_message:@@ -69,7 +69,7 @@ export default {com_ui_shared_link_not_found: 'Paylaşılan bağlantı bulunamadı',com_ui_delete: 'Sil',com_ui_delete_conversation: 'Sohbet silinecek?',- com_ui_delete_conversation_confirm: 'Bu silinecek',+ com_ui_delete_confirm: 'Bu silinecek',com_ui_rename: 'Yeniden adlandır',com_ui_archive: 'Arşivle',com_ui_archive_error: 'Sohbet arşivlemeye çalışırken bir hata oluştu',@@ -587,7 +587,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Sohbet silinecek?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Bu silinecek',},diff --git a/client/src/localization/languages/Vi.ts b/client/src/localization/languages/Vi.tsindex d72ad1538e..3a660b3457 100644--- a/client/src/localization/languages/Vi.ts+++ b/client/src/localization/languages/Vi.ts@@ -34,7 +34,6 @@ export default {com_ui_enter: 'Nhập',com_ui_submit: 'Gửi',com_ui_upload_success: 'Tải tệp thành công',- com_ui_upload_invalid: 'Tệp không hợp lệ để tải lên',com_ui_cancel: 'Hủy',com_ui_save: 'Lưu',com_ui_copy_to_clipboard: 'Sao chép vào clipboard',@@ -59,7 +58,8 @@ export default {com_ui_create_link: 'Tạo liên kết',com_ui_share_link_to_chat: 'Chia sẻ liên kết đến cuộc trò chuyện',com_ui_share_error: 'Có lỗi xảy ra khi chia sẻ liên kết trò chuyện',- com_ui_share_create_message: 'Tên của bạn và bất kỳ tin nhắn nào bạn thêm sau khi chia sẻ sẽ được giữ kín.',+ com_ui_share_create_message:+ 'Tên của bạn và bất kỳ tin nhắn nào bạn thêm sau khi chia sẻ sẽ được giữ kín.',com_ui_share_created_message:'Liên kết chia sẻ đến cuộc trò chuyện của bạn đã được tạo. Quản lý các cuộc trò chuyện đã chia sẻ trước đây bất cứ lúc nào thông qua Cài đặt.',com_ui_share_update_message:@@ -69,7 +69,7 @@ export default {com_ui_shared_link_not_found: 'Không tìm thấy liên kết chia sẻ',com_ui_delete: 'Xóa',com_ui_delete_conversation: 'Xóa cuộc trò chuyện?',- com_ui_delete_conversation_confirm: 'Điều này sẽ xóa',+ com_ui_delete_confirm: 'Điều này sẽ xóa',com_ui_rename: 'Đổi tên',com_ui_archive: 'Lưu trữ',com_ui_archive_error: 'Không thể lưu trữ cuộc trò chuyện',@@ -529,7 +529,8 @@ export const comparisons = {},com_ui_share_update_message: {english: 'Your name, custom instructions, and any messages you add after sharing stay private.',- translated: 'Tên của bạn, hướng dẫn tùy chỉnh và bất kỳ tin nhắn nào bạn thêm sau khi chia sẻ sẽ được giữ kín.',+ translated:+ 'Tên của bạn, hướng dẫn tùy chỉnh và bất kỳ tin nhắn nào bạn thêm sau khi chia sẻ sẽ được giữ kín.',},com_ui_share_updated_message: {english:@@ -549,7 +550,7 @@ export const comparisons = {english: 'Delete chat?',translated: 'Xóa cuộc trò chuyện?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: 'Điều này sẽ xóa',},diff --git a/client/src/localization/languages/Zh.ts b/client/src/localization/languages/Zh.tsindex ffc78ace66..b0d1dce847 100644--- a/client/src/localization/languages/Zh.ts+++ b/client/src/localization/languages/Zh.ts@@ -101,7 +101,6 @@ export default {com_ui_submit: '提交',com_ui_upload_success: '上传文件成功',com_ui_upload_error: '上传文件错误',- com_ui_upload_invalid: '无效的上传文件,请上传不超过2M大小的图片',com_ui_cancel: '取消',com_ui_save: '保存',com_ui_save_submit: '保存并提交',@@ -139,15 +138,12 @@ export default {com_ui_share_link_to_chat: '分享链接到聊天',com_ui_share_error: '分享聊天链接时发生错误',com_ui_share_create_message: '您的名字及您在分享后添加的任何消息将保持私密。',- com_ui_share_created_message:- '已创建到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',- com_ui_share_update_message:- '您的名字、定制指令及您在分享后添加的任何消息将保持私密。',- com_ui_share_updated_message:- '已更新到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',+ com_ui_share_created_message: '已创建到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',+ com_ui_share_update_message: '您的名字、定制指令及您在分享后添加的任何消息将保持私密。',+ com_ui_share_updated_message: '已更新到您聊天的共享链接。可以通过设置随时管理以前共享的聊天。',com_ui_shared_link_not_found: '未找到共享链接',com_ui_delete_conversation: '删除对话?',- com_ui_delete_conversation_confirm: '这将删除',+ com_ui_delete_confirm: '这将删除',com_ui_delete_assistant_confirm: '确定要删除此助手吗?该操作无法撤销。',com_ui_rename: '重命名',com_ui_archive: '归档',@@ -1107,7 +1103,7 @@ export const comparisons = {english: 'Delete chat?',translated: '删除对话?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: '这将删除',},diff --git a/client/src/localization/languages/ZhTraditional.ts b/client/src/localization/languages/ZhTraditional.tsindex 04de2ea588..8efc37116f 100644--- a/client/src/localization/languages/ZhTraditional.ts+++ b/client/src/localization/languages/ZhTraditional.ts@@ -31,7 +31,6 @@ export default {com_ui_enter: '輸入',com_ui_submit: '送出',com_ui_upload_success: '檔案上傳成功',- com_ui_upload_invalid: '上傳檔案無效',com_ui_cancel: '取消',com_ui_save: '儲存',com_ui_copy_to_clipboard: '複製到剪貼簿',@@ -57,16 +56,13 @@ export default {com_ui_share_link_to_chat: '分享鏈接到聊天',com_ui_share_error: '分享聊天鏈接時發生錯誤',com_ui_share_create_message: '您的姓名以及您在共享後添加的任何消息都會保密。',- com_ui_share_created_message:- '已創建到您的聊天的共享鏈接。可以隨時通過設置管理以前共享的聊天。',- com_ui_share_update_message:- '您的姓名、自定義指示以及您在共享後添加的任何消息都會保密。',- com_ui_share_updated_message:- '已更新到您的聊天的共享鏈接。可以隨時通過設置管理以前共享的聊天。',+ com_ui_share_created_message: '已創建到您的聊天的共享鏈接。可以隨時通過設置管理以前共享的聊天。',+ com_ui_share_update_message: '您的姓名、自定義指示以及您在共享後添加的任何消息都會保密。',+ com_ui_share_updated_message: '已更新到您的聊天的共享鏈接。可以隨時通過設置管理以前共享的聊天。',com_ui_shared_link_not_found: '未找到共享鏈接',com_ui_delete: '刪除',com_ui_delete_conversation: '刪除對話?',- com_ui_delete_conversation_confirm: '這將刪除',+ com_ui_delete_confirm: '這將刪除',com_ui_rename: '重新命名',com_ui_archive: '封存',com_ui_archive_error: '封存對話時發生錯誤',@@ -797,7 +793,7 @@ export const comparisons = {english: 'Delete chat?',translated: '刪除對話?',},- com_ui_delete_conversation_confirm: {+ com_ui_delete_confirm: {english: 'This will delete',translated: '這將刪除',},diff --git a/client/src/localization/prompts/instructions/Ar.md b/client/src/localization/prompts/instructions/Ar.mdindex ec62adf2a3..9b0efad006 100644--- a/client/src/localization/prompts/instructions/Ar.md+++ b/client/src/localization/prompts/instructions/Ar.md@@ -207,7 +207,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: حذف الدردشة؟-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: سيتم حذف هذاdiff --git a/client/src/localization/prompts/instructions/Br.md b/client/src/localization/prompts/instructions/Br.mdindex 043e75d2f0..4a873f05e2 100644--- a/client/src/localization/prompts/instructions/Br.md+++ b/client/src/localization/prompts/instructions/Br.md@@ -511,7 +511,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Excluir conversa?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Isso excluirádiff --git a/client/src/localization/prompts/instructions/De.md b/client/src/localization/prompts/instructions/De.mdindex c621ddad98..4302adc5e1 100644--- a/client/src/localization/prompts/instructions/De.md+++ b/client/src/localization/prompts/instructions/De.md@@ -539,7 +539,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Chat löschen?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Damit wird gelöschtdiff --git a/client/src/localization/prompts/instructions/Es.md b/client/src/localization/prompts/instructions/Es.mdindex 04b0c53920..6eff2c979b 100644--- a/client/src/localization/prompts/instructions/Es.md+++ b/client/src/localization/prompts/instructions/Es.md@@ -511,7 +511,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: ¿Eliminar Chat?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Esto eliminarádiff --git a/client/src/localization/prompts/instructions/Fr.md b/client/src/localization/prompts/instructions/Fr.mdindex ba86ef17e5..f678b3a91d 100644--- a/client/src/localization/prompts/instructions/Fr.md+++ b/client/src/localization/prompts/instructions/Fr.md@@ -231,7 +231,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Supprimer la discussions?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Cela supprimeradiff --git a/client/src/localization/prompts/instructions/He.md b/client/src/localization/prompts/instructions/He.mdindex ead0f5402c..fb72f05306 100644--- a/client/src/localization/prompts/instructions/He.md+++ b/client/src/localization/prompts/instructions/He.md@@ -351,7 +351,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: למחוק את השיחה (צאט)?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: זה ימחקdiff --git a/client/src/localization/prompts/instructions/Id.md b/client/src/localization/prompts/instructions/Id.mdindex 840fd8081e..857e65e13a 100644--- a/client/src/localization/prompts/instructions/Id.md+++ b/client/src/localization/prompts/instructions/Id.md@@ -231,7 +231,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Hapus chat?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Ini akan menghapusdiff --git a/client/src/localization/prompts/instructions/It.md b/client/src/localization/prompts/instructions/It.mdindex c6c22a1007..a5483e9efb 100644--- a/client/src/localization/prompts/instructions/It.md+++ b/client/src/localization/prompts/instructions/It.md@@ -647,7 +647,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Eliminare la chat?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Questo elimineràdiff --git a/client/src/localization/prompts/instructions/Jp.md b/client/src/localization/prompts/instructions/Jp.mdindex 7f9303815d..2d190a9bfb 100644--- a/client/src/localization/prompts/instructions/Jp.md+++ b/client/src/localization/prompts/instructions/Jp.md@@ -555,7 +555,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: チャットを削除しますか?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: このチャットは削除されます。diff --git a/client/src/localization/prompts/instructions/Ko.md b/client/src/localization/prompts/instructions/Ko.mdindex d5f0322ac3..4ca8d49d8c 100644--- a/client/src/localization/prompts/instructions/Ko.md+++ b/client/src/localization/prompts/instructions/Ko.md@@ -207,7 +207,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: 채팅을 삭제하시겠습니까?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: 이 채팅이 삭제됩니다diff --git a/client/src/localization/prompts/instructions/Nl.md b/client/src/localization/prompts/instructions/Nl.mdindex 63808f3720..8b75701b0d 100644--- a/client/src/localization/prompts/instructions/Nl.md+++ b/client/src/localization/prompts/instructions/Nl.md@@ -215,7 +215,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Chat verwijderen?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Hiermee wordtdiff --git a/client/src/localization/prompts/instructions/Ru.md b/client/src/localization/prompts/instructions/Ru.mdindex 6f42d98876..ede307b2ca 100644--- a/client/src/localization/prompts/instructions/Ru.md+++ b/client/src/localization/prompts/instructions/Ru.md@@ -259,7 +259,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Удалить чат?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Будет удален следующий чат:diff --git a/client/src/localization/prompts/instructions/Sv.md b/client/src/localization/prompts/instructions/Sv.mdindex 91c2eb9ac0..6f0fd38e57 100644--- a/client/src/localization/prompts/instructions/Sv.md+++ b/client/src/localization/prompts/instructions/Sv.md@@ -207,7 +207,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Radera chatt?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Detta kommer att raderadiff --git a/client/src/localization/prompts/instructions/Tr.md b/client/src/localization/prompts/instructions/Tr.mdindex 70a92c3300..dd93d0afd1 100644--- a/client/src/localization/prompts/instructions/Tr.md+++ b/client/src/localization/prompts/instructions/Tr.md@@ -215,7 +215,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Sohbet silinecek?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Bu silinecekdiff --git a/client/src/localization/prompts/instructions/Vi.md b/client/src/localization/prompts/instructions/Vi.mdindex 338cabc997..3d6b14bb09 100644--- a/client/src/localization/prompts/instructions/Vi.md+++ b/client/src/localization/prompts/instructions/Vi.md@@ -207,7 +207,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: Xóa cuộc trò chuyện?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: Điều này sẽ xóadiff --git a/client/src/localization/prompts/instructions/Zh.md b/client/src/localization/prompts/instructions/Zh.mdindex dfb9583f28..f99ce824b1 100644--- a/client/src/localization/prompts/instructions/Zh.md+++ b/client/src/localization/prompts/instructions/Zh.md@@ -519,7 +519,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: 删除对话?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: 这将删除diff --git a/client/src/localization/prompts/instructions/ZhTraditional.md b/client/src/localization/prompts/instructions/ZhTraditional.mdindex 898e5bbe54..df4cc8f265 100644--- a/client/src/localization/prompts/instructions/ZhTraditional.md+++ b/client/src/localization/prompts/instructions/ZhTraditional.md@@ -207,7 +207,7 @@ Write a prompt that is mindful of the nuances in the language with respect to it- **english**: Delete chat?- **translated**: 刪除對話?-- **com_ui_delete_conversation_confirm**:+- **com_ui_delete_confirm**:- **english**: This will delete- **translated**: 這將刪除diff --git a/client/src/mobile.css b/client/src/mobile.cssindex 80235fc107..ee8b79d8a6 100644--- a/client/src/mobile.css+++ b/client/src/mobile.css@@ -274,4 +274,17 @@.azure-bg-color {background: linear-gradient(0.375turn, #61bde2, #4389d0);+}++@keyframes slowPulse {+ 0%, 100% {+ opacity: 1;+ }+ 50% {+ opacity: 0.7;+ }+}++.slow-pulse {+ animation: slowPulse 2.5s ease-in-out infinite;}\ No newline at end of filediff --git a/client/src/routes/Dashboard.tsx b/client/src/routes/Dashboard.tsxnew file mode 100644index 0000000000..9554f7d9de--- /dev/null+++ b/client/src/routes/Dashboard.tsx@@ -0,0 +1,82 @@+import { Navigate } from 'react-router-dom';+import {+ PromptsView,+ PromptForm,+ CreatePromptForm,+ EmptyPromptPreview,+} from '~/components/Prompts';+import DashboardRoute from './Layouts/Dashboard';++const dashboardRoutes = {+ path: 'd/*',+ element: <DashboardRoute />,+ children: [+ /*+ {+ element: <FileDashboardView />,+ children: [+ {+ index: true,+ element: <EmptyVectorStorePreview />,+ },+ {+ path: ':vectorStoreId',+ element: <DataTableFilePreview />,+ },+ ],+ },+ {+ path: 'files/*',+ element: <FilesListView />,+ children: [+ {+ index: true,+ element: <EmptyFilePreview />,+ },+ {+ path: ':fileId',+ element: <FilePreview />,+ },+ ],+ },+ {+ path: 'vector-stores/*',+ element: <VectorStoreView />,+ children: [+ {+ index: true,+ element: <EmptyVectorStorePreview />,+ },+ {+ path: ':vectorStoreId',+ element: <VectorStorePreview />,+ },+ ],+ },+ */+ {+ path: 'prompts/*',+ element: <PromptsView />,+ children: [+ {+ index: true,+ element: <EmptyPromptPreview />,+ },+ {+ path: 'new',+ element: <CreatePromptForm />,+ },+ {+ path: ':promptId',+ element: <PromptForm />,+ },+ ],+ },+ {+ path: '*',+ element: <Navigate to="/d/files" replace={true} />,+ },+ ],+};++export default dashboardRoutes;diff --git a/client/src/routes/Layouts/DashBreadcrumb.tsx b/client/src/routes/Layouts/DashBreadcrumb.tsxnew file mode 100644index 0000000000..1ccc32d22a--- /dev/null+++ b/client/src/routes/Layouts/DashBreadcrumb.tsx@@ -0,0 +1,110 @@+import { useSetRecoilState } from 'recoil';+import { useMemo, useCallback } from 'react';+import { useLocation } from 'react-router-dom';+import { SystemRoles } from 'librechat-data-provider';+import { ArrowLeft, MessageSquareQuote } from 'lucide-react';+import {+ Breadcrumb,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbList,+ BreadcrumbSeparator,+ // BreadcrumbEllipsis,+ DropdownMenu,+ // DropdownMenuItem,+ // DropdownMenuContent,+ DropdownMenuTrigger,+} from '~/components/ui';+import { useLocalize, useCustomLink, useAuthContext } from '~/hooks';+import AdvancedSwitch from '~/components/Prompts/AdvancedSwitch';+import AdminSettings from '~/components/Prompts/AdminSettings';+import { useDashboardContext } from '~/Providers';+import store from '~/store';++const promptsPathPattern = /prompts\/.*/;++const getConversationId = (prevLocationPath: string) => {+ if (!prevLocationPath || prevLocationPath.includes('/d/')) {+ return 'new';+ }+ const lastPathnameParts = prevLocationPath.split('/');+ return lastPathnameParts[lastPathnameParts.length - 1];+};++export default function DashBreadcrumb() {+ const location = useLocation();+ const localize = useLocalize();+ const { user } = useAuthContext();+ const { prevLocationPath } = useDashboardContext();+ const lastConversationId = useMemo(() => getConversationId(prevLocationPath), [prevLocationPath]);++ const setPromptsName = useSetRecoilState(store.promptsName);+ const setPromptsCategory = useSetRecoilState(store.promptsCategory);++ const clickCallback = useCallback(() => {+ setPromptsName('');+ setPromptsCategory('');+ }, [setPromptsName, setPromptsCategory]);++ const chatLinkHandler = useCustomLink('/c/' + lastConversationId, clickCallback);+ const promptsLinkHandler = useCustomLink('/d/prompts');++ const isPromptsPath = useMemo(+ () => promptsPathPattern.test(location.pathname),+ [location.pathname],+ );++ return (+ <div className="mr-4 flex h-10 items-center justify-between">+ <Breadcrumb className="mt-1 px-2 dark:text-gray-200">+ <BreadcrumbList>+ <BreadcrumbItem className="hover:dark:text-white">+ <BreadcrumbLink+ href="/"+ className="flex flex-row items-center gap-1"+ onClick={chatLinkHandler}+ >+ <ArrowLeft className="icon-xs" />+ <span className="hidden md:flex">{localize('com_ui_back_to_chat')}</span>+ <span className="flex md:hidden">{localize('com_ui_chat')}</span>+ </BreadcrumbLink>+ </BreadcrumbItem>+ <BreadcrumbSeparator />+ {/*+ <BreadcrumbItem className="hover:dark:text-white">+ <DropdownMenu>+ <DropdownMenuTrigger className="flex cursor-default items-center gap-1">+ <BreadcrumbEllipsis className="h-4 w-4" />+ <BreadcrumbItem className="hover:dark:text-white">+ <span className="text-gray-400">{localize('com_ui_dashboard')}</span>+ </BreadcrumbItem>+ <span className="sr-only">Toggle menu</span>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start">+ <DropdownMenuItem>Documentation</DropdownMenuItem>+ <DropdownMenuItem>Themes</DropdownMenuItem>+ <DropdownMenuItem>GitHub</DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </BreadcrumbItem>+ <BreadcrumbSeparator />+ */}+ <BreadcrumbItem className="hover:dark:text-white">+ <BreadcrumbLink+ href="/d/prompts"+ className="flex flex-row items-center gap-1"+ onClick={promptsLinkHandler}+ >+ <MessageSquareQuote className="h-4 w-4 dark:text-gray-300" />+ {localize('com_ui_prompts')}+ </BreadcrumbLink>+ </BreadcrumbItem>+ </BreadcrumbList>+ </Breadcrumb>+ <div className="flex items-center justify-center gap-2">+ {isPromptsPath && <AdvancedSwitch />}+ {user?.role === SystemRoles.ADMIN && <AdminSettings />}+ </div>+ </div>+ );+}diff --git a/client/src/routes/Layouts/Dashboard.tsx b/client/src/routes/Layouts/Dashboard.tsxnew file mode 100644index 0000000000..aa329af48d--- /dev/null+++ b/client/src/routes/Layouts/Dashboard.tsx@@ -0,0 +1,36 @@+import { useEffect, useState } from 'react';+import { Outlet } from 'react-router-dom';+import { QueryKeys } from 'librechat-data-provider';+import { useQueryClient } from '@tanstack/react-query';+import { useAuthContext, usePreviousLocation } from '~/hooks';+import { DashboardContext } from '~/Providers';+import store from '~/store';++export default function DashboardRoute() {+ const queryClient = useQueryClient();+ const { isAuthenticated } = useAuthContext();+ const prevLocationRef = usePreviousLocation();+ const clearConvoState = store.useClearConvoState();+ const [prevLocationPath, setPrevLocationPath] = useState('');++ useEffect(() => {+ setPrevLocationPath(prevLocationRef.current?.pathname || '');+ }, [prevLocationRef]);++ useEffect(() => {+ queryClient.removeQueries([QueryKeys.messages, 'new']);+ clearConvoState();+ }, [queryClient, clearConvoState]);++ if (!isAuthenticated) {+ return null;+ }++ return (+ <DashboardContext.Provider value={{ prevLocationPath }}>+ <div className="h-screen w-full">+ <Outlet />+ </div>+ </DashboardContext.Provider>+ );+}diff --git a/client/src/routes/index.tsx b/client/src/routes/index.tsxindex 67aacf0f5f..3d87140c15 100644--- a/client/src/routes/index.tsx+++ b/client/src/routes/index.tsx@@ -10,6 +10,7 @@ import {import { AuthContextProvider } from '~/hooks/AuthContext';import StartupLayout from './Layouts/Startup';import LoginLayout from './Layouts/Login';+import dashboardRoutes from './Dashboard';import ShareRoute from './ShareRoute';import ChatRoute from './ChatRoute';import Search from './Search';@@ -62,6 +63,7 @@ export const router = createBrowserRouter([},],},+ dashboardRoutes,{path: '/',element: <Root />,diff --git a/client/src/store/families.ts b/client/src/store/families.tsindex 035718c0cb..3cc8019cd6 100644--- a/client/src/store/families.ts+++ b/client/src/store/families.ts@@ -115,6 +115,11 @@ const showPopoverFamily = atomFamily({default: false,});+const activePromptByIndex = atomFamily<string | undefined, string | number | null>({+ key: 'activePromptByIndex',+ default: undefined,+});+const showMentionPopoverFamily = atomFamily<boolean, string | number | null>({key: 'showMentionPopoverByIndex',default: false,@@ -210,4 +215,5 @@ export default {audioRunFamily,globalAudioPlayingFamily,globalAudioFetchingFamily,+ activePromptByIndex,};diff --git a/client/src/store/index.ts b/client/src/store/index.tsindex 5212ecbe31..445690ab2a 100644--- a/client/src/store/index.ts+++ b/client/src/store/index.ts@@ -8,6 +8,7 @@ import toast from './toast';import submission from './submission';import search from './search';import preset from './preset';+import prompts from './prompts';import lang from './language';import settings from './settings';@@ -21,6 +22,7 @@ export default {...toast,...submission,...search,+ ...prompts,...preset,...lang,...settings,diff --git a/client/src/store/prompts.ts b/client/src/store/prompts.tsnew file mode 100644index 0000000000..e3d5f81e29--- /dev/null+++ b/client/src/store/prompts.ts@@ -0,0 +1,29 @@+import { atom } from 'recoil';+import { atomWithLocalStorage } from '~/store/utils';++enum PromptsEditorMode {+ SIMPLE = 'simple',+ ADVANCED = 'advanced',+}++// Static atoms without localStorage+const staticAtoms = {+ // `name` filter+ promptsName: atom<string>({ key: 'promptsName', default: '' }),+ // `category` filter+ promptsCategory: atom<string>({ key: 'promptsCategory', default: '' }),+ // `pageNumber` filter+ promptsPageNumber: atom<number>({ key: 'promptsPageNumber', default: 1 }),+ // `pageSize` filter+ promptsPageSize: atom<number>({ key: 'promptsPageSize', default: 10 }),+};++// Atoms with localStorage+const localStorageAtoms = {+ autoSendPrompts: atomWithLocalStorage('autoSendPrompts', true),+ alwaysMakeProd: atomWithLocalStorage('alwaysMakeProd', true),+ // Editor mode+ promptsEditorMode: atomWithLocalStorage<string>('promptsEditorMode', PromptsEditorMode.SIMPLE),+};++export default { ...staticAtoms, ...localStorageAtoms, PromptsEditorMode };diff --git a/client/src/store/settings.ts b/client/src/store/settings.tsindex d9ed29fb52..362e2dadd0 100644--- a/client/src/store/settings.ts+++ b/client/src/store/settings.ts@@ -1,37 +1,8 @@import { atom } from 'recoil';import { SettingsViews } from 'librechat-data-provider';+import { atomWithLocalStorage } from '~/store/utils';import type { TOptionSettings } from '~/common';-// Improved helper function to create atoms with localStorage-function atomWithLocalStorage<T>(key: string, defaultValue: T) {- return atom<T>({- key,- default: defaultValue,- effects_UNSTABLE: [- ({ setSelf, onSet }) => {- const savedValue = localStorage.getItem(key);- if (savedValue !== null) {- try {- const parsedValue = JSON.parse(savedValue);- setSelf(parsedValue);- } catch (e) {- console.error(- `Error parsing localStorage key "${key}", \`savedValue\`: defaultValue, error:`,- e,- );- localStorage.setItem(key, JSON.stringify(defaultValue));- setSelf(defaultValue);- }- }-- onSet((newValue: T) => {- localStorage.setItem(key, JSON.stringify(newValue));- });- },- ],- });-}-// Static atoms without localStorageconst staticAtoms = {abortScroll: atom<boolean>({ key: 'abortScroll', default: false }),diff --git a/client/src/store/utils.ts b/client/src/store/utils.tsnew file mode 100644index 0000000000..bf2b7a2389--- /dev/null+++ b/client/src/store/utils.ts@@ -0,0 +1,31 @@+import { atom } from 'recoil';++// Improved helper function to create atoms with localStorage+export function atomWithLocalStorage<T>(key: string, defaultValue: T) {+ return atom<T>({+ key,+ default: defaultValue,+ effects_UNSTABLE: [+ ({ setSelf, onSet }) => {+ const savedValue = localStorage.getItem(key);+ if (savedValue !== null) {+ try {+ const parsedValue = JSON.parse(savedValue);+ setSelf(parsedValue);+ } catch (e) {+ console.error(+ `Error parsing localStorage key "${key}", \`savedValue\`: defaultValue, error:`,+ e,+ );+ localStorage.setItem(key, JSON.stringify(defaultValue));+ setSelf(defaultValue);+ }+ }++ onSet((newValue: T) => {+ localStorage.setItem(key, JSON.stringify(newValue));+ });+ },+ ],+ });+}diff --git a/client/src/style.css b/client/src/style.cssindex 8c968a67f2..8bc056b2f9 100644--- a/client/src/style.css+++ b/client/src/style.css@@ -2,12 +2,176 @@@tailwind components;@tailwind utilities;+/* Custom Variables */+:root {+ --white:#fff;+ --black:#000;+ --gray-20: #ececf1;+ --gray-50: #f7f7f8;+ --gray-100: #ececec;+ --gray-200: #e3e3e3;+ --gray-300: #cdcdcd;+ --gray-400: #999696;+ --gray-500: #595959;+ --gray-600: #424242;+ --gray-700: #2f2f2f;+ --gray-800: #212121;+ --gray-850: #171717;+ --gray-900: #0d0d0d;+ --gizmo-gray-500:#999;+ --gizmo-gray-600:#666;+ --gizmo-gray-950:#0f0f0f+}+html {+ --text-primary:var(--gray-800);+ --text-secondary:var(--gray-600);+ --text-tertiary:var(--gray-500);+ --surface-primary:var(--white);+ --surface-primary-alt:var(--white);+ --surface-secondary:var(--gray-50);+ --surface-tertiary:var(--gray-100);+ --border-light:var(--gray-100);+ --border-medium-alt:var(--gray-300);+ --border-medium:var(--gray-200);+ --border-heavy:var(--gray-300);+ --border-xheavy:var(--gray-400)+}+.dark {+ --text-primary:var(--gray-100);+ --text-secondary:var(--gray-300);+ --text-tertiary:var(--gray-500);+ --surface-primary:var(--gray-900);+ --surface-secondary:var(--gray-800);+ --surface-primary-alt:var(--gray-850);+ --surface-tertiary:var(--gray-700);+ --border-light:var(--gray-700);+ --border-medium-alt:var(--gray-600);+ --border-medium:var(--gray-600);+ --border-heavy:var(--gray-500);+ --border-xheavy:var(--gray-400)+}+.gizmo {+ --text-primary:var(--gizmo-gray-950);+ --text-secondary:var(--gizmo-gray-600);+ --text-tertiary:var(--gizmo-gray-500);+ --surface-primary:var(--white);+ --surface-secondary:var(--gray-50);+ --surface-tertiary:var(--gray-100);+ --border-light:rgba(0,0,0,.1);+ --border-medium:rgba(0,0,0,.15);+ --border-heavy:rgba(0,0,0,.2);+ --border-xheavy:rgba(0,0,0,.25)+}+.gizmo.dark {+ --text-primary:var(--gray-100);+ --text-secondary:var(--gray-300);+ --text-tertiary:var(--gizmo-gray-500);+ --surface-primary:var(--gray-900);+ --surface-secondary:var(--gray-800);+ --surface-tertiary:var(--gray-700);+ --border-light:rgba(217,217,227,.1);+ --border-medium:rgba(217,217,227,.15);+ --border-heavy:rgba(217,217,227,.2);+ --border-xheavy:rgba(217,217,227,.25)+}++.text-token-text-primary {+ color:#171717;+ color:var(--text-primary)+}+.text-token-text-secondary {+ color:#565869;+ color:var(--text-secondary)+}+.text-token-text-tertiary {+ color:#8e8ea0;+ color:var(--text-tertiary)+}++.icon-xs {+ stroke-width:1.5;+ height:.75rem;+ width:.75rem+}+.icon-sm {+ stroke-width:2;+ height:1rem;+ width:1rem+}+.icon-md, .icon-md-heavy {+ stroke-width:1.5;+ height:1.125rem;+ width:1.125rem+}+.icon-md-heavy {+ stroke-width: 2.5;+}+.icon-lg {+ stroke-width:1.5;+ height:1.5rem;+ width:1.5rem+}+.icon-xl {+ stroke-width:1.5;+ height:1.75rem;+ width:1.75rem+}+.icon-2xl {+ stroke-width:1.5;+ height:2rem;+ width:2rem+}+.icon-cover {+ stroke-width:1.5;+ height:234px;+ width:234px+}++.border-token-border-heavy {+ border-color: #c5c5d2;+ border-color: var(--border-heavy)+}++.border-token-border-light {+ border-color: #ececf1;+ border-color: var(--border-light)+}++.border-token-border-medium {+ border-color: #d9d9e3;+ border-color: var(--border-medium)+}++.border-token-surface-primary {+ border-color: #fff;+ border-color: var(--surface-primary)+}++.border-token-surface-secondary {+ border-color: var(--surface-secondary)+}++.border-token-surface-tertiary {+ border-color: #ececf1;+ border-color: var(--surface-tertiary)+}++.bg-token-surface-secondary {+ background-color: var(--surface-secondary);+}+@media (max-width: 640px) {.no-gradient-sm {background: none !important;}}+.ellipsis {+ overflow: hidden;+ white-space: nowrap;+ text-overflow: ellipsis;+}+@font-face {font-display: swap;font-family: Inter;@@ -305,6 +469,19 @@ p > small {animation: fadein 3s forwards;}+.fade-in {+ animation: fadeInWithOutTranslate 0.3s ease-in-out;+}++@keyframes fadeInWithOutTranslate {+ from {+ opacity: 0;+ }+ to {+ opacity: 1;+ }+}+@keyframes fadein {from { opacity: 0; transform: translateY(-20px); }to { opacity: 1; transform: translateY(0); }@@ -669,7 +846,7 @@ blockquote, dd, dl, fieldset, figure, h1, h2, h3, h4, h5, h6, hr, p, pre {margin-top:.75em}.prose :where(.prose>ul>li>:first-child):not(:where([class~=not-prose] *)) {- margin-top:1.25em+ margin-top:0}.prose :where(.prose>ul>li>:last-child):not(:where([class~=not-prose] *)) {margin-bottom:1.25em@@ -731,7 +908,7 @@ blockquote, dd, dl, fieldset, figure, h1, h2, h3, h4, h5, h6, hr, p, pre {margin-top:.75em}.prose-base :where(.prose>ul>li>:first-child):not(:where([class~=not-prose] *)) {- margin-top:1.25em+ margin-top:0}.prose-base :where(.prose>ul>li>:last-child):not(:where([class~=not-prose] *)) {margin-bottom:1.25em@@ -982,11 +1159,6 @@ button {padding: 0.25rem 0.5rem;}-.bg-token-surface-secondary {- background-color: #f7f7f8;- background-color: var(--surface-secondary);-}-.from-token-surface-secondary {--tw-gradient-from: var(--surface-secondary) var(--tw-gradient-from-position);--tw-gradient-to: hsla(0,0%,100%,0) var(--tw-gradient-to-position);@@ -1488,156 +1660,6 @@ button.scroll-convo {}}-:root {- --white:#fff;- --black:#000;- --gray-200:#ececf1;- --gray-50:#f7f7f8;- --gray-100:#ececec;- --gray-200:#e3e3e3;- --gray-300:#cdcdcd;- --gray-400:#999696;- --gray-500:#686262;- --gray-600:#424242;- --gray-700:#262626;- --gray-750:#333333;- --gray-800:#171717;- --gray-900:#0d0d0d;- --gizmo-gray-500:#999;- --gizmo-gray-600:#666;- --gizmo-gray-950:#0f0f0f-}-html {- --text-primary:var(--gray-800);- --text-secondary:var(--gray-600);- --text-tertiary:var(--gray-500);- --surface-primary:var(--white);- --surface-secondary:var(--gray-50);- --surface-tertiary:var(--gray-100);- --border-light:var(--gray-100);- --border-medium:var(--gray-200);- --border-heavy:var(--gray-300);- --border-xheavy:var(--gray-400)-}-.dark {- --text-primary:var(--gray-100);- --text-secondary:var(--gray-300);- --text-tertiary:var(--gray-500);- --surface-primary:var(--gray-900);- --surface-secondary:var(--gray-800);- --surface-tertiary:var(--gray-700);- --border-light:var(--gray-700);- --border-medium:var(--gray-600);- --border-heavy:var(--gray-500);- --border-xheavy:var(--gray-400)-}-.gizmo {- --text-primary:var(--gizmo-gray-950);- --text-secondary:var(--gizmo-gray-600);- --text-tertiary:var(--gizmo-gray-500);- --surface-primary:var(--white);- --surface-secondary:var(--gray-50);- --surface-tertiary:var(--gray-100);- --border-light:rgba(0,0,0,.1);- --border-medium:rgba(0,0,0,.15);- --border-heavy:rgba(0,0,0,.2);- --border-xheavy:rgba(0,0,0,.25)-}-.gizmo.dark {- --text-primary:var(--gray-100);- --text-secondary:var(--gray-300);- --text-tertiary:var(--gizmo-gray-500);- --surface-primary:var(--gray-900);- --surface-secondary:var(--gray-800);- --surface-tertiary:var(--gray-700);- --border-light:rgba(217,217,227,.1);- --border-medium:rgba(217,217,227,.15);- --border-heavy:rgba(217,217,227,.2);- --border-xheavy:rgba(217,217,227,.25)-}--.text-token-text-primary {- color:#171717;- color:var(--text-primary)-}-.text-token-text-secondary {- color:#565869;- color:var(--text-secondary)-}-.text-token-text-tertiary {- color:#8e8ea0;- color:var(--text-tertiary)-}--.icon-xs {- stroke-width:1.5;- height:.75rem;- width:.75rem-}-.icon-sm {- stroke-width:2;- height:1rem;- width:1rem-}-.icon-md, .icon-md-heavy {- stroke-width:1.5;- height:1.125rem;- width:1.125rem-}-.icon-md-heavy {- stroke-width: 2.5;-}-.icon-lg {- stroke-width:1.5;- height:1.5rem;- width:1.5rem-}-.icon-xl {- stroke-width:1.5;- height:1.75rem;- width:1.75rem-}-.icon-2xl {- stroke-width:1.5;- height:2rem;- width:2rem-}-.icon-cover {- stroke-width:1.5;- height:234px;- width:234px-}--.border-token-border-heavy {- border-color: #c5c5d2;- border-color: var(--border-heavy)-}--.border-token-border-light {- border-color: #ececf1;- border-color: var(--border-light)-}--.border-token-border-medium {- border-color: #d9d9e3;- border-color: var(--border-medium)-}--.border-token-surface-primary {- border-color: #fff;- border-color: var(--surface-primary)-}--.border-token-surface-secondary {- border-color: #f7f7f8;- border-color: var(--surface-secondary)-}--.border-token-surface-tertiary {- border-color: #ececf1;- border-color: var(--surface-tertiary)-}-@-webkit-keyframes pulseSize {0%,to {@@ -1833,7 +1855,7 @@ html {.prose :where(ol):not(:where([class~=not-prose] *)) {list-style-type:decimal;margin-bottom:1.25em;- margin-top:1.25em;+ margin-top:0;padding-left:1.625em}.prose :where(ol[type=A]):not(:where([class~=not-prose] *)) {@@ -1871,7 +1893,7 @@ html {padding-left:.375em}.prose :where(.prose>ol>li>:first-child):not(:where([class~=not-prose] *)) {- margin-top:1.25em+ margin-top:0}.prose :where(.prose>ol>li>:last-child):not(:where([class~=not-prose] *)) {margin-bottom:1.25em@@ -1890,7 +1912,7 @@ ol ol):not(:where([class~=not-prose] *)) {margin-bottom:1.1428571em}.prose-base :where(.prose>ol>li>:first-child):not(:where([class~=not-prose] *)) {- margin-top:1.25em+ margin-top:0}.prose-base :where(.prose>ol>li>:last-child):not(:where([class~=not-prose] *)) {margin-bottom:1.25emdiff --git a/client/src/utils/collection.ts b/client/src/utils/collection.tsindex 0af07fb412..36972d2f71 100644--- a/client/src/utils/collection.ts+++ b/client/src/utils/collection.ts@@ -20,6 +20,25 @@ export const addData = <TCollection, TData>(return dataJson;};+export const getRecordByProperty = <TCollection, TData>(+ data: InfiniteData<TCollection>,+ collectionName: string,+ findProperty: (item: TData) => boolean,+): TData | undefined => {+ // Find the page and the index of the record in that page+ const { pageIndex, index } = findPage<TCollection>(data, (page) =>+ page[collectionName].findIndex(findProperty),+ );++ // If found, return the record+ if (pageIndex !== -1 && index !== -1) {+ return data.pages[pageIndex][collectionName][index];+ }++ // Return undefined if the record is not found+ return undefined;+};+export function findPage<TData>(data: InfiniteData<TData>, findIndex: (page: TData) => number) {for (let pageIndex = 0; pageIndex < data.pages.length; pageIndex++) {const page = data.pages[pageIndex];@@ -75,6 +94,7 @@ export const normalizeData = <TCollection, TData>(data: InfiniteData<TCollection>,collectionName: string,pageSize: number,+ uniqueProperty?: keyof TData,): InfiniteData<TCollection> => {const infiniteData = JSON.parse(JSON.stringify(data)) as InfiniteData<TCollection>;const pageCount = infiniteData.pages.length;@@ -85,12 +105,24 @@ export const normalizeData = <TCollection, TData>(const pageParams = infiniteData.pageParams;// Combine all conversations of all pages into one array- const collection = infiniteData.pages.flatMap((page) => page[collectionName]);+ let collection = infiniteData.pages.flatMap((page) => page[collectionName]);if (collection.length === 0) {return infiniteData;}+ if (uniqueProperty) {+ const seen = new Set<TData>();+ collection = collection.filter((item) => {+ const value = item[uniqueProperty];+ if (seen.has(value)) {+ return false;+ }+ seen.add(value);+ return true;+ });+ }+// Create the restructured pagesconst restructuredPages = Array.from({ length: pageCount }, (_, i) => ({...infiniteData.pages[i],@@ -102,3 +134,34 @@ export const normalizeData = <TCollection, TData>(pages: restructuredPages,};};++export const updateFields = <TCollection, TData>(+ data: InfiniteData<TCollection>,+ updatedItem: Partial<TData>,+ collectionName: string,+ identifierField: keyof TData,+ callback?: (newItem: TData) => void,+): InfiniteData<TCollection> => {+ const newData = JSON.parse(JSON.stringify(data)) as InfiniteData<TCollection>;+ const { pageIndex, index } = findPage<TCollection>(newData, (page) =>+ page[collectionName].findIndex(+ (item: TData) => item[identifierField] === updatedItem[identifierField],+ ),+ );++ if (pageIndex !== -1 && index !== -1) {+ const deleted = newData.pages[pageIndex][collectionName].splice(index, 1);+ const oldItem = deleted[0];+ const newItem = {+ ...oldItem,+ ...updatedItem,+ updatedAt: new Date().toISOString(),+ };+ if (callback) {+ callback(newItem);+ }+ newData.pages[0][collectionName].unshift(newItem);+ }++ return newData;+};diff --git a/client/src/utils/files.ts b/client/src/utils/files.tsindex 53fa9233e4..4ca1431eb9 100644--- a/client/src/utils/files.ts+++ b/client/src/utils/files.ts@@ -159,3 +159,13 @@ export function addFileToCache(queryClient: QueryClient, newfile: TFile) {],);}++export function formatBytes(bytes: number, decimals = 2) {+ if (bytes === 0) {+ return 0;+ }+ const k = 1024;+ const dm = decimals < 0 ? 0 : decimals;+ const i = Math.floor(Math.log(bytes) / Math.log(k));+ return parseFloat((bytes / Math.pow(k, i)).toFixed(dm));+}diff --git a/client/src/utils/index.ts b/client/src/utils/index.tsindex a0cf9d54b9..dce24cebe3 100644--- a/client/src/utils/index.ts+++ b/client/src/utils/index.ts@@ -4,11 +4,13 @@ export * from './files';export * from './latex';export * from './convos';export * from './presets';+export * from './prompts';export * from './textarea';export * from './messages';export * from './languages';export * from './endpoints';export * from './sharedLink';+export * from './promptGroups';export { default as cn } from './cn';export { default as buildTree } from './buildTree';export { default as getLoginError } from './getLoginError';diff --git a/client/src/utils/promptGroups.ts b/client/src/utils/promptGroups.tsnew file mode 100644index 0000000000..499735b145--- /dev/null+++ b/client/src/utils/promptGroups.ts@@ -0,0 +1,72 @@+import { InfiniteCollections } from 'librechat-data-provider';+import type {+ PromptGroupListResponse,+ PromptGroupListData,+ TPromptGroup,+} from 'librechat-data-provider';+import { addData, deleteData, updateData, updateFields, getRecordByProperty } from './collection';+import { InfiniteData } from '@tanstack/react-query';++export const addPromptGroup = (+ data: InfiniteData<PromptGroupListResponse>,+ newPromptGroup: TPromptGroup,+): PromptGroupListData => {+ return addData<PromptGroupListResponse, TPromptGroup>(+ data,+ InfiniteCollections.PROMPT_GROUPS,+ newPromptGroup,+ (page) => page.promptGroups.findIndex((group) => group._id === newPromptGroup._id),+ );+};++export const updatePromptGroup = (+ data: InfiniteData<PromptGroupListResponse>,+ updatedPromptGroup: TPromptGroup,+): PromptGroupListData => {+ return updateData<PromptGroupListResponse, TPromptGroup>(+ data,+ InfiniteCollections.PROMPT_GROUPS,+ updatedPromptGroup,+ (page) => page.promptGroups.findIndex((group) => group._id === updatedPromptGroup._id),+ );+};++export const deletePromptGroup = (+ data: InfiniteData<PromptGroupListResponse>,+ groupId: string,+): PromptGroupListData => {+ return deleteData<PromptGroupListResponse, PromptGroupListData>(+ data,+ InfiniteCollections.PROMPT_GROUPS,+ (page) => page.promptGroups.findIndex((group) => group._id === groupId),+ );+};++export const updateGroupFields = (+ data: InfiniteData<PromptGroupListResponse>,+ updatedGroup: Partial<TPromptGroup>,+ callback?: (group: TPromptGroup) => void,+): InfiniteData<PromptGroupListResponse> => {+ return updateFields<PromptGroupListResponse, TPromptGroup>(+ data,+ updatedGroup,+ InfiniteCollections.PROMPT_GROUPS,+ '_id',+ callback,+ );+};++export const getSnippet = (promptText: string, length = 56) => {+ return promptText.length > length ? `${promptText.slice(0, length - 3)}...` : promptText;+};++export const findPromptGroup = (+ data: InfiniteData<PromptGroupListResponse>,+ findProperty: (group: TPromptGroup) => boolean,+): TPromptGroup | undefined => {+ return getRecordByProperty<PromptGroupListResponse, TPromptGroup>(+ data,+ InfiniteCollections.PROMPT_GROUPS,+ findProperty,+ );+};diff --git a/client/src/utils/prompts.ts b/client/src/utils/prompts.tsnew file mode 100644index 0000000000..e4267f27e6--- /dev/null+++ b/client/src/utils/prompts.ts@@ -0,0 +1,94 @@+import { format } from 'date-fns';+import type { TUser } from 'librechat-data-provider';++export function replaceSpecialVars({ text, user }: { text: string; user?: TUser }) {+ if (!text) {+ return text;+ }++ const currentDate = format(new Date(), 'yyyy-MM-dd');+ text = text.replace(/{{current_date}}/gi, currentDate);++ if (!user) {+ return text;+ }+ const currentUser = user.name;+ text = text.replace(/{{current_user}}/gi, currentUser);++ return text;+}++/**+ * Detects the presence of variables in the given text, excluding {{current_date}} and {{current_user}}.+ */+export const detectVariables = (text: string): boolean => {+ const regex = /{{(?!current_date|current_user)[^{}]{1,}}}/gi;+ return regex.test(text);+};++export const wrapVariable = (variable: string) => `{{${variable}}}`;++export const extractUniqueVariables = (text: string): string[] => {+ const regex = /{{(.*?)}}/g;+ let match: RegExpExecArray | null;+ const variables = new Set<string>();+ while ((match = regex.exec(text)) !== null) {+ variables.add(match[1]);+ }+ return Array.from(variables);+};++export const extractVariableInfo = (text: string) => {+ const regex = /{{(.*?)}}/g;+ let match: RegExpExecArray | null;+ const allVariables: string[] = [];+ const uniqueVariables: string[] = [];+ const repeatedVariables: Set<string> = new Set();+ const variableCount: Map<string, number> = new Map();+ const variableIndexMap: Map<string, number> = new Map();++ while ((match = regex.exec(text)) !== null) {+ const variable = match[1];+ allVariables.push(variable);++ const count = variableCount.get(variable) ?? 0;+ variableCount.set(variable, count + 1);++ if (count > 0) {+ repeatedVariables.add(variable);+ } else {+ uniqueVariables.push(variable);+ variableIndexMap.set(variable, uniqueVariables.length - 1);+ }+ }++ return {+ allVariables,+ uniqueVariables,+ repeatedVariables,+ variableIndexMap,+ };+};++export function formatDateTime(dateTimeString: string) {+ const date = new Date(dateTimeString);++ const month = date.getMonth() + 1;+ const day = date.getDate();+ const year = date.getFullYear();+ const hours = date.getHours();+ const minutes = date.getMinutes();+ const seconds = date.getSeconds();++ const formattedMinutes = minutes.toString().padStart(2, '0');+ const formattedSeconds = seconds.toString().padStart(2, '0');++ const ampm = hours >= 12 ? 'PM' : 'AM';++ const formattedHours = hours % 12 || 12;++ const formattedDate = `${month}/${day}/${year}`;+ const formattedTime = `${formattedHours}:${formattedMinutes}:${formattedSeconds} ${ampm}`;++ return `${formattedDate}, ${formattedTime}`;+}diff --git a/client/src/utils/sharedLink.ts b/client/src/utils/sharedLink.tsindex 4eb2a7bc99..3d273cb719 100644--- a/client/src/utils/sharedLink.ts+++ b/client/src/utils/sharedLink.ts@@ -1,3 +1,4 @@+import { InfiniteCollections } from 'librechat-data-provider';import { SharedLinkListData, SharedLinkListResponse, TSharedLink } from 'librechat-data-provider';import { addData, deleteData, updateData } from './collection';import { InfiniteData } from '@tanstack/react-query';@@ -6,8 +7,11 @@ export const addSharedLink = (data: InfiniteData<SharedLinkListResponse>,newSharedLink: TSharedLink,): SharedLinkListData => {- return addData<SharedLinkListResponse, TSharedLink>(data, 'sharedLinks', newSharedLink, (page) =>- page.sharedLinks.findIndex((c) => c.shareId === newSharedLink.shareId),+ return addData<SharedLinkListResponse, TSharedLink>(+ data,+ InfiniteCollections.SHARED_LINKS,+ newSharedLink,+ (page) => page.sharedLinks.findIndex((c) => c.shareId === newSharedLink.shareId),);};@@ -17,14 +21,16 @@ export const updateSharedLink = (): SharedLinkListData => {return updateData<SharedLinkListResponse, TSharedLink>(data,- 'sharedLinks',+ InfiniteCollections.SHARED_LINKS,newSharedLink,(page) => page.sharedLinks.findIndex((c) => c.shareId === newSharedLink.shareId),);};export const deleteSharedLink = (data: SharedLinkListData, shareId: string): SharedLinkListData => {- return deleteData<SharedLinkListResponse, SharedLinkListData>(data, 'sharedLinks', (page) =>- page.sharedLinks.findIndex((c) => c.shareId === shareId),+ return deleteData<SharedLinkListResponse, SharedLinkListData>(+ data,+ InfiniteCollections.SHARED_LINKS,+ (page) => page.sharedLinks.findIndex((c) => c.shareId === shareId),);};diff --git a/client/src/utils/textarea.ts b/client/src/utils/textarea.tsindex d2954fa0bb..aa742c9ae3 100644--- a/client/src/utils/textarea.ts+++ b/client/src/utils/textarea.ts@@ -31,13 +31,12 @@ export function insertTextAtCursor(element: HTMLTextAreaElement, textToInsert: s3) Reseting back to scrollHeight reads and applies the ideal height for the current content dynamically*/-export const forceResize = (textAreaRef: React.RefObject<HTMLTextAreaElement>) => {- if (!textAreaRef.current) {+export const forceResize = (element: HTMLTextAreaElement | null) => {+ if (!element) {return;}- textAreaRef.current.style.height = 'auto';- textAreaRef.current.offsetHeight;- textAreaRef.current.style.height = `${textAreaRef.current.scrollHeight}px`;+ element.style.height = 'auto';+ element.style.height = `${element.scrollHeight}px`;};/**diff --git a/client/tailwind.config.cjs b/client/tailwind.config.cjsindex 7d6bdb7402..d4583684cc 100644--- a/client/tailwind.config.cjs+++ b/client/tailwind.config.cjs@@ -45,11 +45,10 @@ module.exports = {400: '#999696',500: '#595959',600: '#424242',- 700: '#2f2f2f', // Replacing .dark .dark:bg-gray-700 and .dark .dark:hover:bg-gray-700:hover- 750: '#171717',- 800: '#212121', // Replacing .dark .dark:bg-gray-800, .bg-gray-800, and .dark .dark:hover:bg-gray-800\/90+ 700: '#2f2f2f',+ 800: '#212121',850: '#171717',- 900: '#0d0d0d', // Replacing .dark .dark:bg-gray-900, .bg-gray-900, and .dark .dark:hover:bg-gray-900:hover+ 900: '#0d0d0d',},green: {50: '#f1f9f7',@@ -65,14 +64,16 @@ module.exports = {900: '#031f29',},'brand-purple': '#ab68ff',- 'text-primary': 'var(--gray-800)',- 'text-secondary': 'var(--gray-600)',- 'text-tertiary': 'var(--gray-500)',- 'surface-primary': 'var(--white)',- 'surface-secondary': 'var(--gray-50)',- 'surface-tertiary': 'var(--gray-100)',- 'border-light': 'var(--gray-100)',- 'border-medium': 'var(--gray-200)',+ 'text-primary': 'var(--text-primary)',+ 'text-secondary': 'var(--text-secondary)',+ 'text-tertiary': 'var(--text-tertiary)',+ 'surface-primary': 'var(--surface-primary)',+ 'surface-primary-alt': 'var(--surface-primary-alt)',+ 'surface-secondary': 'var(--surface-secondary)',+ 'surface-tertiary': 'var(--surface-tertiary)',+ 'border-light': 'var(--border-light)',+ 'border-medium': 'var(--border-medium)',+ 'border-medium-alt': 'var(--border-medium-alt)','border-heavy': 'var(--gray-300)','border-xheavy': 'var(--gray-400',},diff --git a/package-lock.json b/package-lock.jsonindex 3cc15e1e85..b9df8a03f2 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,12 +1,12 @@{"name": "LibreChat",- "version": "0.7.3",+ "version": "0.7.4-rc1","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "LibreChat",- "version": "0.7.3",+ "version": "0.7.4-rc1","license": "ISC","workspaces": ["api",@@ -38,7 +38,7 @@},"api": {"name": "@librechat/backend",- "version": "0.7.3",+ "version": "0.7.4-rc1","license": "ISC","dependencies": {"@anthropic-ai/sdk": "^0.16.1",@@ -1110,7 +1110,7 @@},"client": {"name": "@librechat/frontend",- "version": "0.7.3",+ "version": "0.7.4-rc1","license": "ISC","dependencies": {"@ariakit/react": "^0.4.5",@@ -1151,7 +1151,7 @@"image-blob-reduce": "^4.1.0","librechat-data-provider": "*","lodash": "^4.17.21",- "lucide-react": "^0.220.0",+ "lucide-react": "^0.394.0","match-sorter": "^6.3.4","rc-input-number": "^7.4.2","react": "^18.2.0",@@ -1715,6 +1715,28 @@"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==","optional": true},+ "node_modules/@aws-sdk/client-sts/node_modules/fast-xml-parser": {+ "version": "4.2.5",+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",+ "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",+ "funding": [+ {+ "type": "paypal",+ "url": "https://paypal.me/naturalintelligence"+ },+ {+ "type": "github",+ "url": "https://github.com/sponsors/NaturalIntelligence"+ }+ ],+ "optional": true,+ "dependencies": {+ "strnum": "^1.0.5"+ },+ "bin": {+ "fxparser": "src/cli/cli.js"+ }+ },"node_modules/@aws-sdk/core": {"version": "3.496.0","resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.496.0.tgz",@@ -14795,20 +14817,21 @@"integrity": "sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw=="},"node_modules/fast-xml-parser": {- "version": "4.2.5",- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",- "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",+ "version": "4.4.0",+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz",+ "integrity": "sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==","funding": [- {- "type": "paypal",- "url": "https://paypal.me/naturalintelligence"- },{"type": "github","url": "https://github.com/sponsors/NaturalIntelligence"+ },+ {+ "type": "paypal",+ "url": "https://paypal.me/naturalintelligence"}],"optional": true,+ "peer": true,"dependencies": {"strnum": "^1.0.5"},@@ -19662,9 +19685,9 @@}},"node_modules/lucide-react": {- "version": "0.220.0",- "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.220.0.tgz",- "integrity": "sha512-bYtGUsLAWBvZu+BzAU/ziP1gzE4LwMEXLnlgSr1yUKEPPalLG77JLd5GdYebOVkpm+GtqRqnp6tEKDX7Bm8ZlQ==",+ "version": "0.394.0",+ "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.394.0.tgz",+ "integrity": "sha512-PzTbJ0bsyXRhH59k5qe7MpTd5MxlpYZUcM9kGSwvPGAfnn0J6FElDwu2EX6Vuh//F7y60rcVJiFQ7EK9DCMgfw==","peerDependencies": {"react": "^16.5.1 || ^17.0.0 || ^18.0.0"}@@ -29165,9 +29188,9 @@}},"node_modules/ws": {- "version": "8.17.0",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",- "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",+ "version": "8.17.1",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",+ "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==","engines": {"node": ">=10.0.0"},@@ -29325,7 +29348,7 @@},"packages/data-provider": {"name": "librechat-data-provider",- "version": "0.6.8",+ "version": "0.6.9","license": "ISC","dependencies": {"@types/js-yaml": "^4.0.9",diff --git a/packages/data-provider/package.json b/packages/data-provider/package.jsonindex 3c78d44603..b056524dc6 100644--- a/packages/data-provider/package.json+++ b/packages/data-provider/package.json@@ -1,6 +1,6 @@{"name": "librechat-data-provider",- "version": "0.6.8",+ "version": "0.6.9","description": "data services for librechat apps","main": "dist/index.js","module": "dist/index.es.js",diff --git a/packages/data-provider/src/api-endpoints.ts b/packages/data-provider/src/api-endpoints.tsindex 0331a2a831..c4b9a9aa66 100644--- a/packages/data-provider/src/api-endpoints.ts+++ b/packages/data-provider/src/api-endpoints.ts@@ -88,6 +88,8 @@ export const plugins = () => '/api/plugins';export const config = () => '/api/config';+export const prompts = () => '/api/prompts';+export const assistants = ({path,options,@@ -133,3 +135,50 @@ export const textToSpeech = () => `${files()}/tts`;export const textToSpeechManual = () => `${textToSpeech()}/manual`;export const textToSpeechVoices = () => `${textToSpeech()}/voices`;++export const getPromptGroup = (_id: string) => `${prompts()}/groups/${_id}`;++export const getPromptGroupsWithFilters = (filter: object) => {+ let url = `${prompts()}/groups`;+ if (Object.keys(filter).length > 0) {+ const queryParams = new URLSearchParams(filter as Record<string, string>).toString();+ url += `?${queryParams}`;+ }+ return url;+};++export const getPromptsWithFilters = (filter: object) => {+ let url = prompts();+ if (Object.keys(filter).length > 0) {+ const queryParams = new URLSearchParams(filter as Record<string, string>).toString();+ url += `?${queryParams}`;+ }+ return url;+};++export const getPrompt = (_id: string) => `${prompts()}/${_id}`;++export const getRandomPrompts = (limit: number, skip: number) =>+ `${prompts()}/random?limit=${limit}&skip=${skip}`;++export const postPrompt = prompts;++export const updatePromptGroup = getPromptGroup;++export const updatePromptLabels = (_id: string) => `${getPrompt(_id)}/labels`;++export const updatePromptTag = (_id: string) => `${getPrompt(_id)}/tags/production`;++export const deletePromptGroup = getPromptGroup;++export const deletePrompt = ({ _id, groupId }: { _id: string; groupId: string }) => {+ return `${prompts()}/${_id}?groupId=${groupId}`;+};++export const getCategories = () => '/api/categories';++/* Roles */+export const roles = () => '/api/roles';+export const getRole = (roleName: string) => `${roles()}/${roleName.toLowerCase()}`;+export const updatePromptPermissions = (roleName: string) =>+ `${roles()}/${roleName.toLowerCase()}/prompts`;diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.tsindex 11bc5f6b70..1bc5413d8c 100644--- a/packages/data-provider/src/config.ts+++ b/packages/data-provider/src/config.ts@@ -585,6 +585,20 @@ export function validateVisionModel({export const imageGenTools = new Set(['dalle', 'dall-e', 'stable-diffusion']);+/**+ * Enum for collections using infinite queries+ */+export enum InfiniteCollections {+ /**+ * Collection for Prompt Groups+ */+ PROMPT_GROUPS = 'promptGroups',+ /**+ * Collection for Shared Links+ */+ SHARED_LINKS = 'sharedLinks',+}+/*** Enum for cache keys.*/@@ -593,6 +607,10 @@ export enum CacheKeys {* Key for the config store namespace.*/CONFIG_STORE = 'configStore',+ /**+ * Key for the config store namespace.+ */+ ROLES = 'roles',/*** Key for the plugins cache.*/@@ -614,6 +632,10 @@ export enum CacheKeys {* Key for the model queries cache.*/MODEL_QUERIES = 'modelQueries',+ /**+ * Key for the default startup config cache.+ */+ STARTUP_CONFIG = 'startupConfig',/*** Key for the default endpoint config cache.*/@@ -824,6 +846,8 @@ export enum LocalStorageKeys {TEXT_DRAFT = 'textDraft_',/** Key for saving file drafts */FILES_DRAFT = 'filesDraft_',+ /** Key for last Selected Prompt Category */+ LAST_PROMPT_CATEGORY = 'lastPromptCategory',}export enum ForkOptions {@@ -860,3 +884,10 @@ export enum CohereConstants {*/TITLE_MESSAGE = 'TITLE:',}++export enum SystemCategories {+ ALL = 'sys__all__sys',+ MY_PROMPTS = 'sys__my__prompts__sys',+ NO_CATEGORY = 'sys__no__category__sys',+ SHARED_PROMPTS = 'sys__shared__prompts__sys',+}diff --git a/packages/data-provider/src/data-service.ts b/packages/data-provider/src/data-service.tsindex c063c6bf6d..89c1d6356b 100644--- a/packages/data-provider/src/data-service.ts+++ b/packages/data-provider/src/data-service.ts@@ -1,12 +1,13 @@+import type { AxiosResponse } from 'axios';import * as f from './types/files';import * as q from './types/queries';import * as m from './types/mutations';import * as a from './types/assistants';+import * as r from './roles';import * as t from './types';import * as s from './schemas';import request from './request';import * as endpoints from './api-endpoints';-import type { AxiosResponse } from 'axios';export function abortRequestWithMessage(endpoint: string,@@ -465,3 +466,70 @@ export function archiveConversation(export function genTitle(payload: m.TGenTitleRequest): Promise<m.TGenTitleResponse> {return request.post(endpoints.genTitle(), payload);}++export function getPrompt(id: string): Promise<{ prompt: t.TPrompt }> {+ return request.get(endpoints.getPrompt(id));+}++export function getPrompts(filter: t.TPromptsWithFilterRequest): Promise<t.TPrompt[]> {+ return request.get(endpoints.getPromptsWithFilters(filter));+}++export function getPromptGroups(+ filter: t.TPromptGroupsWithFilterRequest,+): Promise<t.PromptGroupListResponse> {+ return request.get(endpoints.getPromptGroupsWithFilters(filter));+}++export function getPromptGroup(id: string): Promise<t.TPromptGroup> {+ return request.get(endpoints.getPromptGroup(id));+}++export function createPrompt(payload: t.TCreatePrompt): Promise<t.TCreatePromptResponse> {+ return request.post(endpoints.postPrompt(), payload);+}++export function updatePromptGroup(+ variables: t.TUpdatePromptGroupVariables,+): Promise<t.TUpdatePromptGroupResponse> {+ return request.patch(endpoints.updatePromptGroup(variables.id), variables.payload);+}++export function deletePrompt(payload: t.TDeletePromptVariables): Promise<t.TDeletePromptResponse> {+ return request.delete(endpoints.deletePrompt(payload));+}++export function makePromptProduction(id: string): Promise<t.TMakePromptProductionResponse> {+ return request.patch(endpoints.updatePromptTag(id));+}++export function updatePromptLabels(+ variables: t.TUpdatePromptLabelsRequest,+): Promise<t.TUpdatePromptLabelsResponse> {+ return request.patch(endpoints.updatePromptLabels(variables.id), variables.payload);+}++export function deletePromptGroup(id: string): Promise<t.TDeletePromptGroupResponse> {+ return request.delete(endpoints.deletePromptGroup(id));+}++export function getCategories(): Promise<t.TGetCategoriesResponse> {+ return request.get(endpoints.getCategories());+}++export function getRandomPrompts(+ variables: t.TGetRandomPromptsRequest,+): Promise<t.TGetRandomPromptsResponse> {+ return request.get(endpoints.getRandomPrompts(variables.limit, variables.skip));+}++/* Roles */+export function getRole(roleName: string): Promise<r.TRole> {+ return request.get(endpoints.getRole(roleName));+}++export function updatePromptPermissions(+ variables: m.UpdatePromptPermVars,+): Promise<m.UpdatePromptPermResponse> {+ return request.put(endpoints.updatePromptPermissions(variables.roleName), variables.updates);+}diff --git a/packages/data-provider/src/index.ts b/packages/data-provider/src/index.tsindex c18a2ee98f..31d76f804d 100644--- a/packages/data-provider/src/index.ts+++ b/packages/data-provider/src/index.ts@@ -7,6 +7,8 @@ export * from './parsers';/* custom/dynamic configurations */export * from './models';export * from './generate';+/* RBAC */+export * from './roles';/* types (exports schemas from `./types` as they contain needed in other defs) */export * from './types';export * from './types/assistants';diff --git a/packages/data-provider/src/keys.ts b/packages/data-provider/src/keys.tsindex 5d80780b60..ec72f3d87e 100644--- a/packages/data-provider/src/keys.ts+++ b/packages/data-provider/src/keys.ts@@ -27,6 +27,13 @@ export enum QueryKeys {assistantDocs = 'assistantDocs',fileDownload = 'fileDownload',voices = 'voices',+ prompts = 'prompts',+ prompt = 'prompt',+ promptGroups = 'promptGroups',+ promptGroup = 'promptGroup',+ categories = 'categories',+ randomPrompts = 'randomPrompts',+ roles = 'roles',}export enum MutationKeys {@@ -42,4 +49,5 @@ export enum MutationKeys {updateAction = 'updateAction',deleteAction = 'deleteAction',deleteUser = 'deleteUser',+ updateRole = 'updateRole',}diff --git a/packages/data-provider/src/react-query/react-query-service.ts b/packages/data-provider/src/react-query/react-query-service.tsindex cb46340e15..feee35d5f1 100644--- a/packages/data-provider/src/react-query/react-query-service.ts+++ b/packages/data-provider/src/react-query/react-query-service.ts@@ -188,22 +188,6 @@ export const useRevokeAllUserKeysMutation = (): UseMutationResult<unknown> => {});};-export const useGetConversationsQuery = (- pageNumber: string,- config?: UseQueryOptions<t.TGetConversationsResponse>,-): QueryObserverResult<t.TGetConversationsResponse> => {- return useQuery<t.TGetConversationsResponse>(- [QueryKeys.allConversations],- () => dataService.getConversations(pageNumber),- {- refetchOnReconnect: false,- refetchOnMount: false,- retry: 1,- ...config,- },- );-};-export const useGetSearchEnabledQuery = (config?: UseQueryOptions<boolean>,): QueryObserverResult<boolean> => {diff --git a/packages/data-provider/src/roles.ts b/packages/data-provider/src/roles.tsnew file mode 100644index 0000000000..88368eefaf--- /dev/null+++ b/packages/data-provider/src/roles.ts@@ -0,0 +1,77 @@+import { z } from 'zod';++/**+ * Enum for System Defined Roles+ */+export enum SystemRoles {+ /**+ * The Admin role+ */+ ADMIN = 'ADMIN',+ /**+ * The default user role+ */+ USER = 'USER',+}++/**+ * Enum for Permission Types+ */+export enum PermissionTypes {+ /**+ * Type for Prompt Permissions+ */+ PROMPTS = 'PROMPTS',+}++/**+ * Enum for Role-Based Access Control Constants+ */+export enum Permissions {+ SHARED_GLOBAL = 'SHARED_GLOBAL',+ USE = 'USE',+ CREATE = 'CREATE',+ SHARE = 'SHARE',+}++export const promptPermissionsSchema = z.object({+ [Permissions.SHARED_GLOBAL]: z.boolean().default(false),+ [Permissions.USE]: z.boolean().default(true),+ [Permissions.CREATE]: z.boolean().default(true),+ [Permissions.SHARE]: z.boolean().default(false),+});++export const roleSchema = z.object({+ name: z.string(),+ [PermissionTypes.PROMPTS]: promptPermissionsSchema,+});++export type TRole = z.infer<typeof roleSchema>;+export type TPromptPermissions = z.infer<typeof promptPermissionsSchema>;++const defaultRolesSchema = z.object({+ [SystemRoles.ADMIN]: roleSchema.extend({+ name: z.literal(SystemRoles.ADMIN),+ [PermissionTypes.PROMPTS]: promptPermissionsSchema.extend({+ [Permissions.SHARED_GLOBAL]: z.boolean().default(true),+ [Permissions.USE]: z.boolean().default(true),+ [Permissions.CREATE]: z.boolean().default(true),+ [Permissions.SHARE]: z.boolean().default(true),+ }),+ }),+ [SystemRoles.USER]: roleSchema.extend({+ name: z.literal(SystemRoles.USER),+ [PermissionTypes.PROMPTS]: promptPermissionsSchema,+ }),+});++export const roleDefaults = defaultRolesSchema.parse({+ [SystemRoles.ADMIN]: {+ name: SystemRoles.ADMIN,+ [PermissionTypes.PROMPTS]: {},+ },+ [SystemRoles.USER]: {+ name: SystemRoles.USER,+ [PermissionTypes.PROMPTS]: {},+ },+});diff --git a/packages/data-provider/src/types.ts b/packages/data-provider/src/types.tsindex b7a8c465d0..f43ad2a2c1 100644--- a/packages/data-provider/src/types.ts+++ b/packages/data-provider/src/types.ts@@ -1,11 +1,12 @@import OpenAI from 'openai';+import type { InfiniteData } from '@tanstack/react-query';import type {- TResPlugin,TMessage,- TConversation,- EModelEndpoint,+ TResPlugin,ImageDetail,TSharedLink,+ TConversation,+ EModelEndpoint,} from './schemas';import type { TSpecsConfig } from './models';export type TOpenAIMessage = OpenAI.Chat.ChatCompletionMessageParam;@@ -74,6 +75,12 @@ export type TUpdateUserPlugins = {auth?: unknown;};+export type TCategory = {+ id?: string;+ value: string;+ label: string;+};+export type TError = {message: string;code?: number;@@ -299,6 +306,7 @@ export type TStartupConfig = {sharedLinksEnabled: boolean;publicSharedLinksEnabled: boolean;analyticsGtmId?: string;+ instanceProjectId: string;};export type TRefreshTokenResponse = {@@ -324,3 +332,129 @@ export type TImportResponse = {*/message: string;};++/** Prompts */++export type TPrompt = {+ groupId: string;+ author: string;+ prompt: string;+ type: 'text' | 'chat';+ createdAt: string;+ updatedAt: string;+ _id?: string;+};++export type TPromptGroup = {+ name: string;+ numberOfGenerations?: number;+ oneliner?: string;+ category?: string;+ projectIds?: string[];+ productionId?: string | null;+ productionPrompt?: Pick<TPrompt, 'prompt'> | null;+ author: string;+ authorName: string;+ createdAt?: Date;+ updatedAt?: Date;+ _id?: string;+};++export type TCreatePrompt = {+ prompt: Pick<TPrompt, 'prompt' | 'type'> & { groupId?: string };+ group?: { name: string; category?: string; oneliner?: string };+};++export type TCreatePromptRecord = TCreatePrompt & Pick<TPromptGroup, 'author' | 'authorName'>;++export type TPromptsWithFilterRequest = {+ groupId: string;+ tags?: string[];+ projectId?: string;+ version?: number;+};++export type TPromptGroupsWithFilterRequest = {+ category: string;+ pageNumber: string;+ pageSize: string | number;+ before?: string | null;+ after?: string | null;+ order?: 'asc' | 'desc';+ name?: string;+};++export type PromptGroupListResponse = {+ promptGroups: TPromptGroup[];+ pageNumber: string;+ pageSize: string | number;+ pages: string | number;+};++export type PromptGroupListData = InfiniteData<PromptGroupListResponse>;++export type TCreatePromptResponse = {+ prompt: TPrompt;+ group?: TPromptGroup;+};++export type TUpdatePromptGroupPayload = Partial<TPromptGroup> & {+ removeProjectIds?: string[];+};++export type TUpdatePromptGroupVariables = {+ id: string;+ payload: TUpdatePromptGroupPayload;+};++export type TUpdatePromptGroupResponse = TPromptGroup;++export type TDeletePromptResponse = {+ prompt: string;+ promptGroup?: { message: string; id: string };+};++export type TDeletePromptVariables = {+ _id: string;+ groupId: string;+};++export type TMakePromptProductionResponse = {+ message: string;+};++export type TMakePromptProductionRequest = {+ id: string;+ groupId: string;+ productionPrompt: Pick<TPrompt, 'prompt'>;+};++export type TUpdatePromptLabelsRequest = {+ id: string;+ payload: {+ labels: string[];+ };+};++export type TUpdatePromptLabelsResponse = {+ message: string;+};++export type TDeletePromptGroupResponse = {+ promptGroup: string;+};++export type TDeletePromptGroupRequest = {+ id: string;+};++export type TGetCategoriesResponse = TCategory[];++export type TGetRandomPromptsResponse = {+ prompts: TPromptGroup[];+};++export type TGetRandomPromptsRequest = {+ limit: number;+ skip: number;+};diff --git a/packages/data-provider/src/types/mutations.ts b/packages/data-provider/src/types/mutations.tsindex e0ce31a75a..fb602aa9bb 100644--- a/packages/data-provider/src/types/mutations.ts+++ b/packages/data-provider/src/types/mutations.ts@@ -1,4 +1,5 @@-import type * as types from '../types';+import * as types from '../types';+import * as r from '../roles';import {Assistant,AssistantCreateParams,@@ -110,6 +111,42 @@ export type UpdateSharedLinkOptions = MutationOptions<>;export type DeleteSharedLinkOptions = MutationOptions<types.TSharedLink, { shareId: string }>;+export type TUpdatePromptContext =+ | {+ group?: types.TPromptGroup;+ previousListData?: types.PromptGroupListData;+ }+ | undefined;++export type UpdatePromptGroupOptions = MutationOptions<+ types.TUpdatePromptGroupResponse,+ types.TUpdatePromptGroupVariables,+ TUpdatePromptContext+>;++export type CreatePromptOptions = MutationOptions<types.TCreatePromptResponse, types.TCreatePrompt>;++export type DeletePromptOptions = MutationOptions<+ types.TDeletePromptResponse,+ types.TDeletePromptVariables+>;++export type DeletePromptGroupOptions = MutationOptions<+ types.TDeletePromptGroupResponse,+ types.TDeletePromptGroupRequest+>;++export type UpdatePromptLabelOptions = MutationOptions<+ types.TUpdatePromptLabelsResponse,+ types.TUpdatePromptLabelsRequest+>;++export type MakePromptProductionOptions = MutationOptions<+ types.TMakePromptProductionResponse,+ types.TMakePromptProductionRequest,+ TUpdatePromptContext+>;+/* Auth mutations */export type VerifyEmailOptions = MutationOptions<types.VerifyEmailResponse, types.TVerifyEmail>;export type ResendVerifcationOptions = MutationOptions<@@ -122,3 +159,17 @@ export type RegistrationOptions = MutationOptions<unknown,types.TError>;++export type UpdatePromptPermVars = {+ roleName: string;+ updates: Partial<r.TPromptPermissions>;+};++export type UpdatePromptPermResponse = r.TRole;++export type UpdatePromptPermOptions = MutationOptions<+ UpdatePromptPermResponse,+ UpdatePromptPermVars,+ unknown,+ types.TError+>;