diff --git a/application/controllers/api/frontend/v1/Bookmark.php b/application/controllers/api/frontend/v1/Bookmark.php index f925e9662..e152907b3 100644 --- a/application/controllers/api/frontend/v1/Bookmark.php +++ b/application/controllers/api/frontend/v1/Bookmark.php @@ -29,10 +29,11 @@ class Bookmark extends FHCAPI_Controller parent::__construct([ 'getBookmarks' => self::PERM_LOGGED, 'delete' => self::PERM_LOGGED, - 'insert' => self::PERM_LOGGED, + 'insert' => self::PERM_LOGGED, 'update' => self::PERM_LOGGED, 'changeOrder' => self::PERM_LOGGED, - ]); + 'getAllBookmarkTags' => self::PERM_LOGGED, + ]); $this->load->model('dashboard/Bookmark_model', 'BookmarkModel'); @@ -100,6 +101,9 @@ class Bookmark extends FHCAPI_Controller $url = $this->input->post('url',true); $title = $this->input->post('title',true); $tag = $this->input->post('tag', true); + if (is_array($tag)) { + $tag = json_encode($tag); // convert PHP array to JSON string + } $sort = $this->input->post('sort', true); $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL, 'sort'=>$sort,]); @@ -125,11 +129,15 @@ class Bookmark extends FHCAPI_Controller $url = $this->input->post('url',true); $title = $this->input->post('title',true); + $tag = $this->input->post('tag', true); + if (is_array($tag)) { + $tag = json_encode($tag); + } $now = new DateTime(); $now = $now->format('Y-m-d H:i:s'); - $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]); + $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title, 'tag'=>$tag, 'updateamum'=>$now]); $update_result = $this->getDataOrTerminateWithError($update_result); @@ -159,9 +167,22 @@ class Bookmark extends FHCAPI_Controller $update_result2 = $this->BookmarkModel->update($bookmark_id2,['sort'=>$sort1,]); $update_result[] = $this->getDataOrTerminateWithError($update_result2); - - $this->terminateWithSuccess($update_result); } + + /** + * get all the bookmark tags associated to a user + * @access public + * @return void + */ + public function getAllBookmarkTags() + { + $this->BookmarkModel->addOrder("sort"); + $result = $this->BookmarkModel->getAllBookmarkTags($this->uid); + + $bookmarks = $this->getDataOrTerminateWithError($result); + + $this->terminateWithSuccess(current($bookmarks)); + } } diff --git a/application/models/dashboard/Bookmark_model.php b/application/models/dashboard/Bookmark_model.php index 5efacc26b..8c70faf04 100644 --- a/application/models/dashboard/Bookmark_model.php +++ b/application/models/dashboard/Bookmark_model.php @@ -12,7 +12,20 @@ class Bookmark_model extends DB_Model $this->pk = 'bookmark_id'; } + /** + * returns all bookmark tags of a user + */ + public function getAllBookmarkTags($uid) + { + $qry = " + SELECT array_agg(DISTINCT tag) AS data + FROM ( + SELECT jsonb_array_elements_text(tag) AS tag + FROM dashboard.tbl_bookmark + WHERE uid = ? + ) t; + "; - - + return $this->execQuery($qry, array('uid' => $uid)); + } } diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php index 4a0e02620..badb2eda2 100644 --- a/application/views/CisRouterView/CisRouterView.php +++ b/application/views/CisRouterView/CisRouterView.php @@ -31,6 +31,7 @@ $includesArray = array( 'vendor/npm-asset/primevue/textarea/textarea.min.js', 'vendor/npm-asset/primevue/checkbox/checkbox.min.js', 'vendor/npm-asset/primevue/chips/chips.min.js', + 'vendor/npm-asset/primevue/multiselect/multiselect.min.js', 'vendor/moment/luxonjs/luxon.min.js' ), 'customJSModules' => array( diff --git a/public/js/api/factory/widget/bookmark.js b/public/js/api/factory/widget/bookmark.js index 76c38cea7..d9e8c2a2a 100644 --- a/public/js/api/factory/widget/bookmark.js +++ b/public/js/api/factory/widget/bookmark.js @@ -28,11 +28,11 @@ export default { url: `/api/frontend/v1/Bookmark/delete/${bookmark_id}` }; }, - update({ bookmark_id, url, title, tag=null }) { + update({ bookmark_id, url, title, tag }) { return { method: 'post', url: `/api/frontend/v1/Bookmark/update/${bookmark_id}`, - params: { url, title } + params: { url, title, tag } }; }, insert({ url, title, tag, sort }) { @@ -47,5 +47,11 @@ export default { method: 'post', url: `/api/frontend/v1/Bookmark/changeOrder/${bookmark_id1}/${bookmark_id2}`, }; - } + }, + getAllBookmarkTags() { + return { + method: 'get', + url: '/api/frontend/v1/Bookmark/getAllBookmarkTags' + }; + }, }; \ No newline at end of file diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js index 6409650b3..b5158e3c0 100644 --- a/public/js/components/DashboardWidget/Url.js +++ b/public/js/components/DashboardWidget/Url.js @@ -19,7 +19,7 @@ export default { FormInput, BsModal, PvChips: primevue.chips, - PvAutoComplete: primevue.autocomplete + PvMultiSelect: primevue.multiselect }, data: () => ({ bookmark_id: null, @@ -30,8 +30,11 @@ export default { invalidURL: false, invalidTitel: false, }, + tagsArray: [ + ], + selectedTags: [], + newTag: null, }), - computed: { tagName() { return this.config.tag !== undefined && this.config.tag.length > 0 @@ -63,6 +66,9 @@ export default { else return Math.min(...this.shared.map(b => b.sort)); }, + tagsInput(){ + return this.selectedTags.map(item => item.tag); + }, }, methods: { @@ -71,7 +77,8 @@ export default { }, clearInputs(){ this.title_input = ""; - this.url_input = ""; + this.url_input = ""; + this.selectedTags = []; }, openCreateModal() { this.$refs.createModal.show() @@ -80,23 +87,27 @@ export default { this.title_input = bookmark.title; this.url_input = bookmark.url; this.bookmark_id = bookmark.bookmark_id; - this.$refs.editModal.show() + this.selectedTags = this.prepareTag(bookmark.tag); + + this.$refs.editModal.show(); }, editBookmark(event){ event.preventDefault(); if(!this.bookmark_id || !this.url_input || !this.title_input) return; - + this.$api .call(ApiBookmark.update({ bookmark_id: this.bookmark_id, title: this.title_input, url: this.url_input, + tag: this.tagsInput, })) .then((res) => res.data) .then((result) => { this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkUpdated")); // refetch the bookmarks to see the updates this.fetchBookmarks(); + this.getAllBookmarkTags(); // reset the values for the title and url inputs this.clearInputs(); this.$refs.editModal.hide(); @@ -121,7 +132,8 @@ export default { this.$api .call(ApiBookmark.insert({ - tag: this.config.tag, + //tag: this.config.tag, + tag: this.tagsInput, title: this.title_input, url: this.url_input, sort: this.sort @@ -131,6 +143,7 @@ export default { this.$fhcAlert.alertInfo(this.$p.t("bookmark", "bookmarkAdded")); // refetch the bookmarks to see the updates this.fetchBookmarks(); + this.getAllBookmarkTags(); this.$refs.createModal.hide(); // reset the values for the title and url inputs this.clearInputs(); @@ -202,6 +215,15 @@ export default { } this.changeOrder(current.bookmark_id, next.bookmark_id); }, + addNewTag(){ + if(this.newTag != null && this.newTag.length) { + this.tagsArray.push({tag: this.newTag, code: this.newTag}); + this.selectedTags.push({tag: this.newTag, code: this.newTag}); + this.newTag = null; + } + else + this.$fhcAlert.alertError("Eingabe eines Zeichens erforderlich!"); + }, changeOrder(bookmark_id_1, bookmark_id_2){ this.$api .call(ApiBookmark.changeOrder(bookmark_id_1, bookmark_id_2)) @@ -211,10 +233,46 @@ export default { this.fetchBookmarks(); }) .catch(this.$fhcAlert.handleSystemError); + }, + hasTags(link) { + if (!link || !link.tag) return false; + + let tags = link.tag; + if (typeof tags === 'string') { + try { + tags = JSON.parse(tags) + } catch { + return false; + } + } + return Array.isArray(tags) && tags.length > 0; + }, + prepareTag(bookmarkArr){ + // parse if string + const parsedArr = Array.isArray(bookmarkArr) + ? bookmarkArr + : JSON.parse(bookmarkArr); + + const result = parsedArr.map(tag => ({ + tag, + code: tag + })); + + return result; + }, + getAllBookmarkTags(){ + this.$api + .call(ApiBookmark.getAllBookmarkTags()) + .then((res) => res.data) + .then((result) => { + this.tagsArray = this.prepareTag(result.data); + }) + .catch(this.$fhcAlert.handleSystemError); } }, async mounted() { await this.fetchBookmarks(); + this.getAllBookmarkTags(); }, created() { // @@ -224,17 +282,24 @@ export default { template: /*html*/ `
+ +
- - -