Skip to content

Commit

Permalink
#496 Support Symbols in DrawTool Folders and Tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@tariqksoliman
tariqksoliman committed Feb 6, 2024
1 parent 533028f commit c68d974
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 30 deletions.
27 changes: 19 additions & 8 deletions API/Backend/Draw/routes/files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,19 +517,19 @@ router.post("/change", function (req, res, next) {
router.post("/modifykeyword", function (req, res, next) {
let Table = req.body.test === "true" ? UserfilesTEST : Userfiles;

const keyword = req.body.keyword;
let keyword = req.body.keyword;
const type = req.body.type;
const newKeyword = req.body.newKeyword;
let symbol = null;
switch (type.toLowerCase()) {
case "tags":
symbol = "#";
symbol = "~#";
break;
case "folders":
symbol = "@";
symbol = "~@";
break;
case "efolders":
symbol = "^";
symbol = "~^";
break;
default:
break;
Expand All @@ -538,12 +538,16 @@ router.post("/modifykeyword", function (req, res, next) {
if (
symbol == null ||
keyword == null ||
keyword.match(/^[a-z0-9_]+$/i) == null ||
(newKeyword != null && newKeyword.match(/^[a-z0-9_]+$/i) == null)
(keyword != null &&
(keyword.indexOf(" ") > -1 || keyword.indexOf("~") > -1)) ||
(newKeyword != null &&
(newKeyword.indexOf(" ") > -1 ||
newKeyword.indexOf("~") > -1 ||
newKeyword.indexOf("$") > -1))
) {
res.send({
status: "failure",
message: `Bad Input. Either: no 'keyword', no 'type', 'keyword' or 'newKeyword' contains non-alphanumerics.`,
message: `Bad Input. Either: no 'keyword', no 'type', 'keyword' or 'newKeyword' contains spaces, dollar-signs, tildes.`,
body: {},
});
return;
Expand All @@ -564,7 +568,14 @@ router.post("/modifykeyword", function (req, res, next) {
},
{
where: {
file_description: { [Sequelize.Op.iRegexp]: `[${existing}]` },
file_description: {
// Escape special chars so that regex works
[Sequelize.Op.like]: sequelize.literal(
`'%${existing
.replaceAll("%", "$%")
.replaceAll("_", "$_")}%' ESCAPE '$'`
),
},
},
}
)
Expand Down
15 changes: 8 additions & 7 deletions src/essence/Tools/Draw/DrawTool.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -925,17 +925,17 @@ var DrawTool = {
}
if (typeof file_description !== 'string') return []

const tags = file_description.match(/~#\w+/g) || []
const tags = file_description.match(/~#([^\s])+/g) || []
const uniqueTags = [...tags]
// remove '#'s
tagFolders.tags = uniqueTags.map((t) => t.substring(2)) || []

const folders = file_description.match(/~@\w+/g) || []
const folders = file_description.match(/~@([^\s])+/g) || []
const uniqueFolders = [...folders]
// remove '@'s
tagFolders.folders = uniqueFolders.map((t) => t.substring(2)) || []

const efolders = file_description.match(/~\^\w+/g) || []
const efolders = file_description.match(/~\^([^\s])+/g) || []
const uniqueEFolders = [...efolders]
// remove '^'s
tagFolders.efolders = uniqueEFolders.map((t) => t.substring(2)) || []
Expand Down Expand Up @@ -975,15 +975,14 @@ var DrawTool = {
.concat(tagFolders.folders)
.concat(tagFolders.efolders)
}

return tagFolders
},
stripTagsFromDescription(file_description) {
if (typeof file_description !== 'string') return ''
return file_description
.replaceAll(/~#\w+/g, '')
.replaceAll(/~@\w+/g, '')
.replaceAll(/~\^\w+/g, '')
.replaceAll(/~#([^\s])+/g, '')
.replaceAll(/~@([^\s])+/g, '')
.replaceAll(/~\^([^\s])+/g, '')
.trimStart()
.trimEnd()
},
Expand Down Expand Up @@ -1015,6 +1014,8 @@ var DrawTool = {

// Add tags and folders
for (let i = 0; i < DrawTool.files.length; i++) {
DrawTool.files[i].file_description =
DrawTool.files[i].file_description || ''
DrawTool.files[i]._tagFolders =
DrawTool.getTagsFoldersFromFileDescription(
DrawTool.files[i]
Expand Down
39 changes: 24 additions & 15 deletions src/essence/Tools/Draw/DrawTool_Files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ var Files = {
'type'
)
const filesInGroupOrder = JSON.parse(JSON.stringify(DrawTool.files))

if (groupingType != 'none') {
filesInGroupOrder.sort((a, b) => {
if (
Expand Down Expand Up @@ -414,22 +415,23 @@ var Files = {
} else {
if (file._tagFolders[groupingType]) {
file._tagFolders[groupingType].forEach((g) => {
const gEnc = encodeURIComponent(g)

const group = d3.select(
`#drawToolDrawFilesList > .drawToolDrawFilesGroupElem[group_name="${g}"]`
`#drawToolDrawFilesList > .drawToolDrawFilesGroupElem[group_name="${gEnc}"]`
)

let iconClass =
Files.getGroupingIcons(groupingType).closed

if (group.size() === 0) {
// prettier-ignore
d3.select('#drawToolDrawFilesList')
.append('div')
.attr('class', `drawToolDrawFilesGroupElem`)
.attr('group_name', g)
.attr('group_name', gEnc)
.html(
[
`<div class='drawToolDrawFilesGroupElemHead' state='off' group_name='${g}' groupingtype='${groupingType}'>`,
`<div class='drawToolDrawFilesGroupElemHead' state='off' group_name='${gEnc}' groupingtype='${groupingType}'>`,
`<div class='${g === 'unassigned' || g === 'untagged' ? 'drawToolDrawFilesGroupElemUn' : ''}'>`,
`<div class='drawToolDrawFilesGroupElemChevron'><i class='mdi ${iconClass} mdi-18px'></i></div>`,
`<div>${groupingType === 'alphabetical' ? g.substring(1) : g}</div>`,
Expand All @@ -442,11 +444,11 @@ var Files = {
}
if (
$(
`.drawToolDrawFilesGroupElem[group_name="${g}"] .drawToolDrawFilesGroupListElem > .drawToolDrawFilesListElem[file_id="${file.id}"]`
`.drawToolDrawFilesGroupElem[group_name="${gEnc}"] .drawToolDrawFilesGroupListElem > .drawToolDrawFilesListElem[file_id="${file.id}"]`
).length === 0
) {
d3.select(
`.drawToolDrawFilesGroupElem[group_name="${g}"] .drawToolDrawFilesGroupListElem`
`.drawToolDrawFilesGroupElem[group_name="${gEnc}"] .drawToolDrawFilesGroupListElem`
)
.append('li')
.attr(
Expand Down Expand Up @@ -515,7 +517,9 @@ var Files = {

if (Files.currentOpenFolderName != null)
$(
`.drawToolDrawFilesGroupElemHead[group_name=${Files.currentOpenFolderName}]`
`.drawToolDrawFilesGroupElemHead[group_name="${decodeURIComponent(
Files.currentOpenFolderName
)}"]`
).trigger('click')

//Li Elem Context Menu
Expand All @@ -528,23 +532,25 @@ var Files = {
e.preventDefault()
let elm = $(this)
const isPub = elm.attr('id') === 'drawToolDrawPublished'
const activeTagFolType = $(
let activeTagFolType = $(
'#drawToolDrawGroupingDiv > div.active'
).attr('type')
const isHead = elm.hasClass('drawToolDrawFilesGroupElemHead')
const headGroup = elm.attr('group_name')
if (isHead) activeTagFolType = elm.attr('groupingtype')
const headGroup = decodeURIComponent(elm.attr('group_name'))

const isLead = DrawTool.userGroups.indexOf('mmgis-group') != -1

const leadIsEdit =
isLead && DrawTool.vars.leadsCanEditFileInfo === true

if (
isHead &&
(!(
!(
activeTagFolType === 'tags' ||
activeTagFolType === 'folders'
) ||
!leadIsEdit)
) &&
!leadIsEdit
)
return

Expand Down Expand Up @@ -1271,11 +1277,15 @@ var Files = {
if (newTag.length === 0) return

// not alphanumeric
if (newTag.match(/^[a-z0-9_]+$/i) == null) {
if (
newTag.indexOf(' ') > -1 ||
newTag.indexOf('~') > -1 ||
newTag.indexOf('$') > -1
) {
CursorInfo.update(
`${
type === 'tag' ? 'Tags' : 'Folders'
} may only contain alphanumerics and underscores!`,
} may not contain spaces, dollar-signs or tildes!`,
3500,
true,
{
Expand Down Expand Up @@ -1421,7 +1431,6 @@ var Files = {
if (!description.replace(/\s/g, '').length) {
description = ''
}

var body = {
id: fileid,
file_name: filename,
Expand Down

0 comments on commit c68d974

Please sign in to comment.