fix - show private or public links in snippet tags

4drianMatei · 4drianMatei · commit 558e191d9b86 · 2023-02-11T18:14:56.000+01:00
depending if the user is public and not owned by the logged in user
diff --git a/backend/src/common/search.utils.js b/backend/src/common/search.utils.js
diff --git a/backend/src/common/snippets-search.service.js b/backend/src/common/snippets-search.service.js
@@ -1,15 +1,15 @@
 const Snippet = require('../model/snippet');
 
-const bookmarksSearchHelper = require('./bookmarks-search.helper');
+const searchUtils = require('./search.utils');
 
 let findSnippets = async function (userId, query, page, limit, searchInclude) {
   //split in text and tags
-  const searchedTermsAndTags = bookmarksSearchHelper.splitSearchQuery(query);
+  const searchedTermsAndTags = searchUtils.splitSearchQuery(query);
   let searchedTerms = searchedTermsAndTags.terms;
   const searchedTags = searchedTermsAndTags.tags;
   let snippets = [];
 
-  const {specialSearchFilters, nonSpecialSearchTerms} = bookmarksSearchHelper.extractSpecialSearchTerms(searchedTerms);
+  const {specialSearchFilters, nonSpecialSearchTerms} = searchUtils.extractSpecialSearchTerms(searchedTerms);
 
   if ( searchedTerms.length > 0 && searchedTags.length > 0 ) {
     snippets = await getSnippetsForTagsAndTerms(userId, searchedTags, nonSpecialSearchTerms, page, limit, specialSearchFilters, searchInclude);
@@ -39,7 +39,7 @@ let getSnippetsForTagsAndTerms = async function (userId, searchedTags, nonSpecia
     if ( searchInclude === 'any' ) {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
 
@@ -74,7 +74,7 @@ let getSnippetsForSearchedTerms = async function (userId, nonSpecialSearchTerms,
     if ( searchInclude === 'any' ) {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
 
@@ -124,7 +124,6 @@ let getSnippetsForSearchedTags = async function (userId, searchedTags, page, lim
 let addSpecialSearchFiltersToMongoFilter = function (specialSearchFilters, filter) {
   if ( specialSearchFilters.userId ) {
     filter.userId = specialSearchFilters.userId;
-    filter.public = true;
   } else if ( specialSearchFilters.privateOnly ) {
     filter.public = false;
   }
diff --git a/backend/src/routes/public/public-bookmarks-search.service.js b/backend/src/routes/public/public-bookmarks-search.service.js
@@ -1,16 +1,16 @@
 const Bookmark = require('../../model/bookmark');
 // TODO - remove
 //  const escapeStringRegexp = require('escape-string-regexp');
-const bookmarksSearchHelper = require('../../common/bookmarks-search.helper');
+const searchUtils = require('../../common/search.utils');
 
 let findPublicBookmarks = async function (query, page, limit, sort, searchInclude) {
   //split in text and tags
-  const searchedTermsAndTags = bookmarksSearchHelper.splitSearchQuery(query);
+  const searchedTermsAndTags = searchUtils.splitSearchQuery(query);
   const searchedTerms = searchedTermsAndTags.terms;
   const searchedTags = searchedTermsAndTags.tags;
   let bookmarks = [];
 
-  const {specialSearchFilters, nonSpecialSearchTerms} = bookmarksSearchHelper.extractSpecialSearchTerms(searchedTerms);
+  const {specialSearchFilters, nonSpecialSearchTerms} = searchUtils.extractSpecialSearchTerms(searchedTerms);
 
   if ( searchedTerms.length > 0 && searchedTags.length > 0 ) {
     bookmarks = await getPublicBookmarksForTagsAndTerms(searchedTags, nonSpecialSearchTerms, page, limit, sort, specialSearchFilters, searchInclude);
@@ -51,7 +51,7 @@ let getPublicBookmarksForTagsAndTerms = async function (searchedTags, nonSpecial
     if(searchInclude === 'any') {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
   addSpecialSearchFiltersToMongoFilter(specialSearchFilters, filter);
@@ -88,7 +88,7 @@ let getPublicBookmarksForSearchedTerms = async function (nonSpecialSearchTerms,
     if(searchInclude === 'any') {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
 
diff --git a/backend/src/routes/public/public-snippets.router.js b/backend/src/routes/public/public-snippets.router.js
@@ -6,7 +6,6 @@ const SnippetsSearchService = require('../../common/snippets-search.service');
 const PublicSnippetsService = require('./public-snippets.service');
 
 const PaginationQueryParamsHelper = require('../../common/pagination-query-params-helper');
-const PublicBookmarksService = require("./public-bookmarks.service");
 
 /**
  * Get snippet by shareableId
diff --git a/backend/src/routes/users/bookmarks/personal-bookmarks-search.service.js b/backend/src/routes/users/bookmarks/personal-bookmarks-search.service.js
@@ -1,14 +1,14 @@
 const Bookmark = require('../../../model/bookmark');
-const bookmarksSearchHelper = require('../../../common/bookmarks-search.helper');
+const searchUtils = require('../../../common/search.utils');
 
 let findPersonalBookmarks = async function (userId, query, page, limit, searchInclude) {
   //split in text and tags
-  const searchedTermsAndTags = bookmarksSearchHelper.splitSearchQuery(query);
+  const searchedTermsAndTags = searchUtils.splitSearchQuery(query);
   let searchedTerms = searchedTermsAndTags.terms;
   const searchedTags = searchedTermsAndTags.tags;
   let bookmarks = [];
 
-  const {specialSearchFilters, nonSpecialSearchTerms} = bookmarksSearchHelper.extractSpecialSearchTerms(searchedTerms);
+  const {specialSearchFilters, nonSpecialSearchTerms} = searchUtils.extractSpecialSearchTerms(searchedTerms);
 
   if ( searchedTerms.length > 0 && searchedTags.length > 0 ) {
     bookmarks = await getPersonalBookmarksForTagsAndTerms( userId, searchedTags, nonSpecialSearchTerms, page, limit, specialSearchFilters, searchInclude);
@@ -34,7 +34,7 @@ let getPersonalBookmarksForTagsAndTerms = async function (userId, searchedTags,
     if(searchInclude === 'any') {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
 
@@ -63,7 +63,7 @@ let getPersonalBookmarksForSearchedTerms = async function ( userId, nonSpecialSe
     if(searchInclude === 'any') {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
   addSpecialSearchFiltersToMongoFilter(specialSearchFilters, filter);
diff --git a/backend/src/routes/users/bookmarks/personal-bookmarks.router.js b/backend/src/routes/users/bookmarks/personal-bookmarks.router.js
@@ -52,7 +52,6 @@ personalBookmarksRouter.get('/', keycloak.protect(), async (request, response, n
   } else {
     next();
   }
-
 });
 
 /* GET bookmark of user by location*/
diff --git a/backend/src/routes/users/notes/notes-search.service.js b/backend/src/routes/users/notes/notes-search.service.js
@@ -1,15 +1,15 @@
-const Note = require('../model/note');
+const Note = require('../../../model/note');
 
-const bookmarksSearchHelper = require('./bookmarks-search.helper');
+const searchUtils = require('../../../common/search.utils');
 
 let findNotes = async function (userId, query, page, limit, searchInclude) {
   //split in text and tags
-  const searchedTermsAndTags = bookmarksSearchHelper.splitSearchQuery(query);
+  const searchedTermsAndTags = searchUtils.splitSearchQuery(query);
   let searchedTerms = searchedTermsAndTags.terms;
   const searchedTags = searchedTermsAndTags.tags;
   let notes = [];
 
-  const {specialSearchFilters, nonSpecialSearchTerms} = bookmarksSearchHelper.extractSpecialSearchTerms(searchedTerms);
+  const {specialSearchFilters, nonSpecialSearchTerms} = searchUtils.extractSpecialSearchTerms(searchedTerms);
 
   if ( searchedTerms.length > 0 && searchedTags.length > 0 ) {
     notes = await getNotesForTagsAndTerms(userId, searchedTags, nonSpecialSearchTerms, page, limit, specialSearchFilters, searchInclude);
@@ -36,7 +36,7 @@ let getNotesForTagsAndTerms = async function (userId, searchedTags, nonSpecialSe
     if ( searchInclude === 'any' ) {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
 
@@ -65,7 +65,7 @@ let getNotesForSearchedTerms = async function (userId, nonSpecialSearchTerms, pa
     if ( searchInclude === 'any' ) {
       filter.$text = {$search: nonSpecialSearchTerms.join(' ')}
     } else {
-      filter.$text = {$search: bookmarksSearchHelper.generateFullSearchText(nonSpecialSearchTerms)};
+      filter.$text = {$search: searchUtils.generateFullSearchText(nonSpecialSearchTerms)};
     }
   }
 
diff --git a/backend/src/routes/users/notes/personal-notes.router.js b/backend/src/routes/users/notes/personal-notes.router.js
@@ -3,7 +3,7 @@ const personalNotesRouter = express.Router({mergeParams: true});
 const Keycloak = require('keycloak-connect');
 
 const PersonalNotesService = require('./personal-notes.service');
-const NotesSearchService = require('../../../common/notes-search.service');
+const NotesSearchService = require('./notes-search.service');
 const UserIdValidator = require('../userid.validator');
 const PaginationQueryParamsHelper = require('../../../common/pagination-query-params-helper');
 
diff --git a/backend/src/routes/users/personal-search.service.js b/backend/src/routes/users/personal-search.service.js
@@ -1,6 +1,6 @@
 const personalBookmarksSearchService = require('./bookmarks/personal-bookmarks-search.service');
 const personalSnippetsSearchService = require('../../common/snippets-search.service');
-const personalNotesSearchService = require('../../common/notes-search.service');
+const personalNotesSearchService = require('./notes/notes-search.service');
 
 let getPersonalSearchResults = async function (userId, query, page, limit, searchInclude) {
 
@@ -9,31 +9,6 @@ let getPersonalSearchResults = async function (userId, query, page, limit, searc
   const foundNotes = await personalNotesSearchService.findNotes(userId, query, page, limit, searchInclude);
 
   return merge([foundBookmarks, foundSnippets, foundNotes], scoreDescending);
-  //return mergeResultsByScore(foundBookmarks, foundSnippets);
-}
-
-function mergeResultsByScore(arr1, arr2) {
-  let i = 0;
-  let j = 0;
-  let result = [];
-  while (i < arr1.length && j < arr2.length) {
-    if ( arr1[i].score >= arr2[j].score ) {
-      result.push(arr1[i]);
-      i++;
-    } else {
-      result.push(arr2[j]);
-      j++;
-    }
-  }
-  while (i < arr1.length) {
-    result.push(arr1[i]);
-    i++;
-  }
-  while (j < arr2.length) {
-    result.push(arr2[j]);
-    j++;
-  }
-  return result;
 }
 
 function merge(arrays, sortFunc) {
diff --git a/frontend/src/app/search-results/search-results-page.component.html b/frontend/src/app/search-results/search-results-page.component.html
@@ -21,6 +21,7 @@
             <i class="fa fa-search"></i> Search any
           </button>
         </span>
+          <br/>
           <br/>
           {{searchInOtherCategoriesTip}}
         </div>
@@ -54,6 +55,7 @@
             <i class="fa fa-search"></i> Search any
           </button>
         </span>
+          <br/>
           <br/>
           {{searchInOtherCategoriesTip}}
         </div>
@@ -88,6 +90,7 @@
               </button>
           </span>
           <br/>
+          <br/>
           {{searchInOtherCategoriesTip}}
         </div>
         <app-async-snippet-list
@@ -118,6 +121,7 @@
               </button>
           </span>
           <br/>
+          <br/>
           {{searchInOtherCategoriesTip}}
         </div>
         <app-async-note-list
@@ -147,6 +151,7 @@
         </button>
         </span>
         <br/>
+        <br/>
         {{searchInOtherCategoriesTip}}
       </div>
       <ng-template #showPubliBookmarksResults>
@@ -189,6 +194,7 @@
           </button>
         </span>
         <br/>
+        <br/>
         {{searchInOtherCategoriesTip}}
       </div>
       <app-async-snippet-list
diff --git a/frontend/src/app/search-results/search-results-page.component.ts b/frontend/src/app/search-results/search-results-page.component.ts
@@ -48,7 +48,7 @@ export class SearchResultsPageComponent implements OnInit, OnDestroy {
 
   searchTriggeredSubscription: any;
 
-  searchInOtherCategoriesTip = 'You can also try looking in other sections 👆👆 OR ';
+  searchInOtherCategoriesTip = 'You can also try looking in other sections 👆👆 OR find elsewhere 👇👇';
 
   constructor(private route: ActivatedRoute,
               private router: Router,
diff --git a/frontend/src/app/shared/bookmark-list-element/bookmark-list-element.component.html b/frontend/src/app/shared/bookmark-list-element/bookmark-list-element.component.html
@@ -98,8 +98,7 @@ <h6 class="card-subtitle mb-2 text-muted url-under-title">
         </ng-template>
       </div>
       <div *ngFor="let tag of bookmark.tags" class="btn-group tag-list  mr-2 mt-1">
-
-        <a *ngIf="bookmark.public; else linkToMyTagged" class="btn btn-secondary btn-sm"
+        <a *ngIf="bookmark.public && bookmark.userId !== userId; else linkToMyTagged" class="btn btn-secondary btn-sm"
            [routerLink]="['/bookmarks/t', tag]"
            title="Go to public bookmarks tagged {{tag}}"
            [innerHtml]="tag | highlight: filterText | highlight: queryText">
@@ -108,7 +107,7 @@ <h6 class="card-subtitle mb-2 text-muted url-under-title">
         <ng-template #linkToMyTagged>
           <a class="btn btn-secondary btn-sm"
              [routerLink]="['/search']"
-             [queryParams]="{q: '[' + tag + '] user:' + userId, sd: 'my-bookmarks'}"
+             [queryParams]="{q: '[' + tag + ']', sd: 'my-bookmarks'}"
              title="Search my bookmarks tagged {{tag}}"
              [innerHtml]="tag | highlight: filterText | highlight: queryText">
             {{tag}}
@@ -142,18 +141,20 @@ <h6 class="card-subtitle mb-2 text-muted url-under-title">
             <a (click)="ignoreTag(tag, userIsLoggedIn)" class="dropdown-item"><i class="fas fa-ban"></i> Ignore tag
             </a>
           </ng-template>
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item"
-             [routerLink]="['/tagged', tag]"
-             title='Public bookmarks tagged "{{tag}}"'>
-            <i class="fas fa-tag"></i> Public
-          </a>
-          <a *ngIf="userIsLoggedIn" class="dropdown-item"
-             [routerLink]="['/search']"
-             [queryParams]="{q: '[' + tag + '] user:' + userId, sd: 'my-bookmarks'}"
-             title='Search my bookmarks tagged "{{tag}}"'>
-            <i class="fas fa-tag"></i> Personal
-          </a>
+          <ng-container *ngIf="userIsLoggedIn">
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item"
+               [routerLink]="['/tagged', tag]"
+               title='Public bookmarks tagged "{{tag}}"'>
+              <i class="fas fa-tag"></i> Public
+            </a>
+            <a class="dropdown-item"
+               [routerLink]="['/search']"
+               [queryParams]="{q: '[' + tag + ']', sd: 'my-bookmarks'}"
+               title='Search my bookmarks tagged "{{tag}}"'>
+              <i class="fas fa-tag"></i> Personal
+            </a>
+          </ng-container>
         </div>
       </div>
 
diff --git a/frontend/src/app/shared/snippet-details/snippet-details.component.html b/frontend/src/app/shared/snippet-details/snippet-details.component.html
@@ -69,12 +69,22 @@ <h6 class="card-subtitle mb-2 text-muted url-under-title">
           </ng-template>
         </div>
         <div *ngFor="let tag of snippet.tags" class="btn-group tag-list  mr-2 mt-1">
-          <a class="badge badge-secondary float-xs-left pr-2 font-weight-bolder"
+          <a *ngIf="snippet.public && snippet.userId !== observables.userId; else linkToMyTagged"
+             class="badge badge-secondary float-xs-left pr-2 font-weight-bolder"
              [routerLink]="['/snippets/t', tag]"
              title="Go to snippets tagged [{{tag}}]"
              [innerHtml]="tag | highlight: queryText">
             {{tag}}
           </a>
+          <ng-template #linkToMyTagged>
+            <a class="badge badge-secondary float-xs-left pr-2 font-weight-bolder"
+               [routerLink]="['/search']"
+               [queryParams]="{q: '[' + tag + ']', sd: 'my-snippets'}"
+               title="Search my bookmarks tagged {{tag}}"
+               [innerHtml]="tag | highlight: queryText">
+              {{tag}}
+            </a>
+          </ng-template>
         </div>
         <div class="float-right mt-1">
           <button
@@ -93,9 +103,10 @@ <h6 class="card-subtitle mb-2 text-muted url-under-title">
             <i class="far fa-copy"></i> Copy to mine
           </button>
           <button *ngIf="snippet.public || (!snippet.public && snippet.userId === observables.userId)"
-            class="btn btn-light btn-sm float-right"
-            title="Share via email or on social media"
-            (click)="shareSnippetDialog(snippet, userIsLoggedIn, observables.userId)"><i class="fas fa-share"></i> Share
+                  class="btn btn-light btn-sm float-right"
+                  title="Share via email or on social media"
+                  (click)="shareSnippetDialog(snippet, userIsLoggedIn, observables.userId)"><i class="fas fa-share"></i>
+            Share
           </button>
         </div>
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Codever",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "description": "Codever - bookmarks, snippets and notes manager for developers & co",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ personalBookmarksRouter.get('/', keycloak.protect(), async (request, response, n`
`52`	`52`	`} else {`
`53`	`53`	`next();`
`54`	`54`	`}`
`55`		`-`
`56`	`55`	`});`
`57`	`56`
`58`	`57`	`/* GET bookmark of user by location*/`