Skip to content
This repository has been archived by the owner on Dec 6, 2023. It is now read-only.

Commit

Permalink
Issue 327 - Unique folder name create/update (#436)
Browse files Browse the repository at this point in the history 
* fix css to display error

* fix to make create/update folder name to be unique

* fix self edit folder name

* fix trim for added folder
  • Loading branch information
@Kevan-Y
Kevan-Y committed Oct 10, 2021
1 parent dd9f3d7 commit 65b288f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 96 deletions.
117 changes: 24 additions & 93 deletions src/app/components/dashboard/dashboard.component.ts
View file
Expand Up @@ -173,27 +173,6 @@ export class DashboardComponent implements OnInit {
document.getElementById(
`${obj._id}`
).style.background = `linear-gradient(to right, #e6dada, ${obj.folder_color})`;
} else if (`${obj.folder_color}` === '#96e6a1') {
document.getElementById(
`${obj._id}`
).style.background = `-webkit-linear-gradient(to right, #d4fc79,${obj.folder_color})`;
document.getElementById(
`${obj._id}`
).style.background = `linear-gradient(to right, #d4fc79, ${obj.folder_color})`;
} else if (`${obj.folder_color}` === '#66a6ff') {
document.getElementById(
`${obj._id}`
).style.background = `-webkit-linear-gradient(to right, #89f7fe,${obj.folder_color})`;
document.getElementById(
`${obj._id}`
).style.background = `linear-gradient(to right, #89f7fe, ${obj.folder_color})`;
} else if (`${obj.folder_color}` === '#274046') {
document.getElementById(
`${obj._id}`
).style.background = `-webkit-linear-gradient(to right, #e6dada,${obj.folder_color})`;
document.getElementById(
`${obj._id}`
).style.background = `linear-gradient(to right, #e6dada, ${obj.folder_color})`;
}

// Click action to enter files folder
Expand Down Expand Up @@ -242,6 +221,7 @@ export class DashboardComponent implements OnInit {
).style.borderColor = 'transparent';
}
});

// Click action to save the new edited name
$(`#button-edit-name-ok-${obj._id}`).click(() => {
const newName = (
Expand All @@ -256,65 +236,7 @@ export class DashboardComponent implements OnInit {
const editButton = document.getElementById(
`button-edit-name-${obj._id}`
);
if (newName === '') {
// If the new name is null then do not change the name.
document.getElementById(
`new-name-text-${obj._id}`
).style.borderColor = 'red';
} else {
document.getElementById(
`new-name-text-${obj._id}`
).style.borderColor = 'transparent';
this.renameFolder(obj, newName);
if (editText.style.display === 'block') {
editText.style.display = 'none';
folderName.style.display = 'block';
editButton.style.display = 'block';
} else {
editText.style.display = 'block';
folderName.style.display = 'none';
editButton.style.display = 'none';
}
}
});
// Click action to close the edit input
$(`#button-edit-name-no-${obj._id}`).click(() => {
const folderName = document.getElementById(`folder-name-${obj._id}`);
const editText = document.getElementById(
`edit-name-input-${obj._id}`
);
const editButton = document.getElementById(
`button-edit-name-${obj._id}`
);
if (editText.style.display === 'block') {
editText.style.display = 'none';
folderName.style.display = 'block';
editButton.style.display = 'block';
}
if (
document.getElementById(`new-name-text-${obj._id}`).style
.borderColor === 'red'
) {
document.getElementById(
`new-name-text-${obj._id}`
).style.borderColor = 'transparent';
}
});
// Click action to save the new edited name
$(`#button-edit-name-ok-${obj._id}`).click(() => {
const newName = (
document.getElementById(
`new-name-text-${obj._id}`
) as HTMLInputElement
).value;
const folderName = document.getElementById(`folder-name-${obj._id}`);
const editText = document.getElementById(
`edit-name-input-${obj._id}`
);
const editButton = document.getElementById(
`button-edit-name-${obj._id}`
);
if (newName === '') {
if (newName === '' || (this.getAllFolderNames().includes(newName) && this.data.find(x => x._id === obj._id).folder_name.trim() != newName)) { // If the new name is null then do not change the name.
// If the new name is null then do not change the name.
document.getElementById(
`new-name-text-${obj._id}`
Expand Down Expand Up @@ -549,7 +471,7 @@ export class DashboardComponent implements OnInit {
const folderName = document.getElementById(`folder-name-${obj._id}`);
const editText = document.getElementById(`edit-name-input-${obj._id}`);
const editButton = document.getElementById(`button-edit-name-${obj._id}`);
if (newName === '') {
if (newName === '' || (this.getAllFolderNames().includes(newName) && this.data.find(x => x._id === obj._id).folder_name.trim() != newName)) { // If the new name is null then do not change the name.
// If the new name is null then do not change the name.
document.getElementById(`new-name-text-${obj._id}`).style.borderColor =
'red';
Expand Down Expand Up @@ -597,18 +519,23 @@ export class DashboardComponent implements OnInit {
folder_tag: 'folder_tag',
is_nested_folder: false,
};
const response = await this.apiService.createFolder(body);
if (response.success) {
// Error Label in popup
document.getElementById('error-label').style.display = 'none';
// Adding the folder in HTML
this.addNewFolder(response.content);
// Empty the strings
folderName.value = '';
folderdescription.value = '';
folderColour.value = '';
// Closing popup
$('#newCard').modal('hide');
if (!this.getAllFolderNames().includes(body.folder_name)) {
const response = await this.apiService.createFolder(body);
if (response.success) {
// Error Label in popup
document.getElementById('error-label').style.display = 'none';
// Adding the folder in HTML
this.addNewFolder(response.content);
// Empty the strings
folderName.value = '';
folderdescription.value = '';
folderColour.value = '';
// Closing popup
$('#newCard').modal('hide');
} else {
// Error Label in popup
document.getElementById('error-label').style.display = 'block';
}
} else {
// Error Label in popup
document.getElementById('error-label').style.display = 'block';
Expand Down Expand Up @@ -654,4 +581,8 @@ export class DashboardComponent implements OnInit {
document.getElementById('error-label').style.display = 'block';
}
}

private getAllFolderNames(): string[] {
return [...document.querySelectorAll('h5.folder-title strong')].map(node => node.innerHTML.trim());
}
}
4 changes: 2 additions & 2 deletions src/styles.scss
View file
Expand Up @@ -214,7 +214,7 @@ overflow: auto;
font-size: 85%;
border-radius: 6px;
}

.named-fence-filename {
position: absolute;
top: 0;
Expand Down Expand Up @@ -347,7 +347,7 @@ border-radius: 6px;
}
}

.error-label {
#error-label {
display: none;
}

Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Expand Up @@ -18,7 +18,8 @@
"types": ["node"],
"lib": [
"es2018",
"dom"
"dom",
"dom.iterable"
]
},
"angularCompilerOptions": {
Expand Down

0 comments on commit 65b288f

Please sign in to comment.