feat: Implement Default Preset Selection for Conversations 📌 (#1275)

* fix: type issues with icons

* refactor: use react query for presets, show toasts on preset crud, refactor mutations, remove presetsQuery from Root (breaking change)

* refactor: change preset titling

* refactor: update preset schemas and methods for necessary new properties `order` and `defaultPreset`

* feat: add `defaultPreset` Recoil value

* refactor(getPresetTitle): make logic cleaner and more concise

* feat: complete UI portion of defaultPreset feature, with animations added to preset items

* chore: remove console.logs()

* feat: complete default preset handling

* refactor: remove user sensitive values on logout

* fix: allow endpoint selection without default preset overwriting
This commit is contained in:
Danny Avila 2023-12-06 14:00:15 -05:00 committed by GitHub
parent fdb65366d7
commit ca64efec1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 681 additions and 270 deletions

View file

@ -14,24 +14,53 @@ module.exports = {
getPreset,
getPresets: async (user, filter) => {
try {
return await Preset.find({ ...filter, user }).lean();
const presets = await Preset.find({ ...filter, user }).lean();
const defaultValue = 10000;
presets.sort((a, b) => {
let orderA = a.order !== undefined ? a.order : defaultValue;
let orderB = b.order !== undefined ? b.order : defaultValue;
if (orderA !== orderB) {
return orderA - orderB;
}
return b.updatedAt - a.updatedAt;
});
return presets;
} catch (error) {
console.log(error);
return { message: 'Error retrieving presets' };
}
},
savePreset: async (user, { presetId, newPresetId, ...preset }) => {
savePreset: async (user, { presetId, newPresetId, defaultPreset, ...preset }) => {
try {
const setter = { $set: {} };
const update = { presetId, ...preset };
if (newPresetId) {
update.presetId = newPresetId;
}
return await Preset.findOneAndUpdate(
{ presetId, user },
{ $set: update },
{ new: true, upsert: true },
);
if (defaultPreset) {
update.defaultPreset = defaultPreset;
update.order = 0;
const currentDefault = await Preset.findOne({ defaultPreset: true, user });
if (currentDefault && currentDefault.presetId !== presetId) {
await Preset.findByIdAndUpdate(currentDefault._id, {
$unset: { defaultPreset: '', order: '' },
});
}
} else if (defaultPreset === false) {
update.defaultPreset = undefined;
update.order = undefined;
setter['$unset'] = { defaultPreset: '', order: '' };
}
setter.$set = update;
return await Preset.findOneAndUpdate({ presetId, user }, setter, { new: true, upsert: true });
} catch (error) {
console.log(error);
return { message: 'Error saving preset' };

View file

@ -17,6 +17,12 @@ const presetSchema = mongoose.Schema(
type: String,
default: null,
},
defaultPreset: {
type: Boolean,
},
order: {
type: Number,
},
// google only
examples: [{ type: mongoose.Schema.Types.Mixed }],
...conversationPreset,

View file

@ -5,9 +5,7 @@ const crypto = require('crypto');
const requireJwtAuth = require('../middleware/requireJwtAuth');
router.get('/', requireJwtAuth, async (req, res) => {
const presets = (await getPresets(req.user.id)).map((preset) => {
return preset;
});
const presets = (await getPresets(req.user.id)).map((preset) => preset);
res.status(200).send(presets);
});
@ -17,12 +15,8 @@ router.post('/', requireJwtAuth, async (req, res) => {
update.presetId = update?.presetId || crypto.randomUUID();
try {
await savePreset(req.user.id, update);
const presets = (await getPresets(req.user.id)).map((preset) => {
return preset;
});
res.status(201).send(presets);
const preset = await savePreset(req.user.id, update);
res.status(201).send(preset);
} catch (error) {
console.error(error);
res.status(500).send(error);
@ -31,7 +25,7 @@ router.post('/', requireJwtAuth, async (req, res) => {
router.post('/delete', requireJwtAuth, async (req, res) => {
let filter = {};
const { presetId } = req.body.arg || {};
const { presetId } = req.body || {};
if (presetId) {
filter = { presetId };
@ -40,9 +34,8 @@ router.post('/delete', requireJwtAuth, async (req, res) => {
console.log('delete preset filter', filter);
try {
await deletePresets(req.user.id, filter);
const presets = await getPresets(req.user.id);
res.status(201).send(presets);
const deleteCount = await deletePresets(req.user.id, filter);
res.status(201).send(deleteCount);
} catch (error) {
console.error(error);
res.status(500).send(error);