Merge pull request #466 from PermanentOrg/PER-per-9070-replace-tag-with-keyword

replaced all tags with keywords

Author: crisnicandrei

constants/master_en.json

@@ -23,7 +23,7 @@
       "private": "Private",
       "relation": "Relation",
       "share": "Share",
-      "tag": "Tag",
+      "tag": "Keyword",
       "task": "Task",
       "unit_test": "UnitTest"
     }
@@ -214,7 +214,7 @@
       "mysql": ""
     },
     "tag": {
-      "lookup": "Tag not found"
+      "lookup": "Keyword not found"
     },
     "task_singleton": {
       "lookup": "Data lookup failed (TS)"

src/app/core/components/archive-settings-dialog/archive-settings-dialog.component.html

@@ -13,7 +13,7 @@
         (click)="setTab('manage-keywords')"
         [class.active]="activeTab === 'manage-keywords'"
       >
-        Manage Tags
+        Manage Keywords
       </div>
       <div
         class="dialog-tab"
@@ -40,15 +40,15 @@
     <div class="panel" #panel>
       <ng-container [ngSwitch]="activeTab">
         <ng-container *ngSwitchCase="'manage-keywords'">
-          <div class="panel-title">Manage Tags</div>
+          <div class="panel-title">Manage Keywords</div>
           <ng-container *ngIf="hasTagsAccess; else noAccess">
             <pr-manage-tags
               [tags]="tags"
               *ngIf="!loadingTags; else loadText"
               (refreshTags)="refreshTags()"
             >
             </pr-manage-tags>
-            <ng-template #loadText> Loading Archive Tags... </ng-template>
+            <ng-template #loadText> Loading Archive Keywords... </ng-template>
           </ng-container>
           <ng-template #noAccess>
             <p>

src/app/core/components/archive-settings-dialog/archive-settings-dialog.component.ts

@@ -62,7 +62,7 @@ export class ArchiveSettingsDialogComponent implements OnInit {
               this.ngOnInit();
             } else {
               throw new Error(
-                'Archive Settings: Maximum number of tag fetch attempts reached.',
+                'Archive Settings: Maximum number of keyword fetch attempts reached.',
               );
             }
           }, 1000);

src/app/core/components/manage-tags/manage-tags.component.html

@@ -1,7 +1,7 @@
 <div>
   <div *ngIf="tags.length > 0; else noTags">
-    <p>There are {{getTagCount()}} tags defined in the current archive.</p>
-    <input type="text" class="filter" placeholder="Search Tags..." (change)="filter = $event.target.value" (keyup)="filter = $event.target.value" />
+    <p>There are {{getTagCount()}} keywords defined in the current archive.</p>
+    <input type="text" class="filter" placeholder="Search Keywords..." (change)="filter = $event.target.value" (keyup)="filter = $event.target.value" />
     <div class="tagsList" *ngIf="getFilteredTags().length > 0; else noMatchedTags">
       <ng-container *ngFor="let tag of getFilteredTags();">
         <ng-container *ngIf="!isEditingTag(tag); else editMode">
@@ -27,10 +27,10 @@
       </ng-container>
     </div>
     <ng-template #noMatchedTags>
-      <div>No tags match your search query.</div>
+      <div>No keywords match your search query.</div>
     </ng-template>
   </div>
   <ng-template #noTags>
-    There are no tags used in this Archive.
+    There are no keywords used in this Archive.
   </ng-template>
 </div>

src/app/core/components/manage-tags/manage-tags.component.spec.ts

@@ -106,14 +106,14 @@ describe('ManageTagsComponent #manage-tags', () => {
     expect(find('.tag')[0].nativeElement.textContent).toContain('Potato');
   });
 
-  it('should have a delete button for each tag', async () => {
+  it('should have a delete button for each keyword', async () => {
     const { find, outputs } = await defaultRender();
 
     expect(find('.delete').length).toBeGreaterThan(0);
     expect(outputs.refreshTags.emit).not.toHaveBeenCalled();
   });
 
-  it('should be able to delete a tag', async () => {
+  it('should be able to delete a keyword', async () => {
     const { find, fixture, outputs } = await defaultRender();
     find('.delete')[0].nativeElement.click();
     await fixture.whenStable();
@@ -125,7 +125,7 @@ describe('ManageTagsComponent #manage-tags', () => {
     expect(find('.tag').length).toBe(1);
   });
 
-  it('should not delete a tag if an error happens', async () => {
+  it('should not delete a keyword if an error happens', async () => {
     const { element } = await defaultRender();
     throwError = true;
     try {
@@ -137,13 +137,13 @@ describe('ManageTagsComponent #manage-tags', () => {
     }
   });
 
-  it('should have edit buttons for each tag', async () => {
+  it('should have edit buttons for each keyword', async () => {
     const { find } = await defaultRender();
 
     expect(find('.edit').length).toBeGreaterThan(0);
   });
 
-  it('should be able to enter edit mode for a tag', async() => {
+  it('should be able to enter edit mode for a keyword', async() => {
     const { find, fixture } = await defaultRender();
     find('.edit')[0].nativeElement.click();
     await fixture.detectChanges();
@@ -169,7 +169,7 @@ describe('ManageTagsComponent #manage-tags', () => {
     expect(outputs.refreshTags.emit).toHaveBeenCalled();
   });
 
-  it('can cancel out of renaming a tag', async () => {
+  it('can cancel out of renaming a keyword', async () => {
     const { find, fixture } = await defaultRender();
     find('.edit')[0].nativeElement.click();
     await fixture.detectChanges();
@@ -189,7 +189,7 @@ describe('ManageTagsComponent #manage-tags', () => {
     expect(find('.tagList').length).toBe(0);
   });
 
-  describe('Tags filtering', () => {
+  describe('Keywords filtering', () => {
     async function testValue(val: string, expectedCount: number) {
       const { find, fixture } = await defaultRender();
       find('input.filter').nativeElement.value = val;

src/app/core/components/manage-tags/manage-tags.component.ts

@@ -52,7 +52,7 @@ export class ManageTagsComponent {
     return this.prompt
       .confirm(
         'Delete',
-        'Are you sure you want to delete this tag from all items in the current archive?',
+        'Are you sure you want to delete this keyword from all items in the current archive?',
       )
       .then(async () => {
         this.tags = this.tags.filter((t) => t.tagId !== tag.tagId);
@@ -64,7 +64,7 @@ export class ManageTagsComponent {
           .catch(() => {
             // Let's add the tag back to UI to show it isn't deleted.
             this.tags.push(tag);
-            throw new Error('Manage Tags: Error accessing delete endpoint');
+            throw new Error('Manage Keywords: Error accessing delete endpoint');
           });
       })
       .catch((e: Error) => {

src/app/core/services/edit/edit.service.ts

@@ -87,7 +87,7 @@ export const ItemActions: { [key: string]: PromptButton } = {
   },
   Tags: {
     buttonName: 'tags',
-    buttonText: 'Tags',
+    buttonText: 'Keywords',
   },
 };
 

src/app/file-browser/components/edit-tags/edit-tags.component.html

@@ -29,7 +29,7 @@
     <div *ngIf="newTagInputError" class="input-vertical-error">
       {{
         this.tagType === 'keyword'
-          ? "Tag cannot contain ':'"
+          ? "Keyword cannot contain ':'"
           : 'Format must be key:value'
       }}
     </div>
@@ -65,7 +65,7 @@
   </div>
   <p class="manage-tags-message" *ngIf="isEditing" @ngIfScaleAnimation>
     <span class="manage-tags-link" (click)="onManageTagsClick()">
-      Manage {{ this.tagType === 'keyword' ? 'tags' : 'custom metadata' }}</span
+      Manage {{ this.tagType === 'keyword' ? 'keywords' : 'custom metadata' }}</span
     >
     in archive settings.
   </p>
@@ -99,7 +99,7 @@
           <div *ngIf="newTagInputError" class="input-vertical-error">
             {{
               this.tagType === 'keyword'
-                ? "Tag cannot contain ':'"
+                ? "Keyword cannot contain ':'"
                 : 'Format must be key:value'
             }}
           </div>
@@ -134,13 +134,13 @@
             </div>
           </div>
           <div class="edit-tag" *ngIf="!matchingTags.length">
-            No existing tags found
+            No existing keywords found
           </div>
         </div>
         <p class="manage-tags-message" *ngIf="isEditing" @ngIfScaleAnimation>
           <span class="manage-tags-link" (click)="onManageTagsClick()">
             Manage
-            {{ this.tagType === 'keyword' ? 'tags' : 'custom metadata' }}</span
+            {{ this.tagType === 'keyword' ? 'keywords' : 'custom metadata' }}</span
           >
           in archive settings.
         </p>

src/app/file-browser/components/edit-tags/edit-tags.component.ts

@@ -123,7 +123,7 @@ export class EditTagsComponent
 
   ngOnInit() {
     this.placeholderText =
-      this.tagType === 'keyword' ? 'Add new tag' : 'Add new field:value';
+      this.tagType === 'keyword' ? 'Add new keyword' : 'Add new field:value';
     this.allTags = this.filterTagsByType(this.tagsService.getTags());
     this.matchingTags = this.allTags;
 
@@ -183,7 +183,7 @@ export class EditTagsComponent
     } catch (err) {
       if (err instanceof BaseResponse) {
         this.message.showError({
-          message: 'There was a problem saving tags for this item.',
+          message: 'There was a problem saving keywords for this item.',
         });
       }
     } finally {

src/app/file-browser/components/file-list-item/file-list-item.component.ts

@@ -117,7 +117,7 @@ export const ItemActions: { [key: string]: PromptButton } = {
   },
   Tags: {
     buttonName: 'tags',
-    buttonText: 'Tags',
+    buttonText: 'Keywords',
   },
 };
 

src/app/file-browser/components/file-viewer/file-viewer.component.html

@@ -147,7 +147,7 @@
       </pr-inline-value-edit>
       <table class="metadata-table">
         <tr>
-          <td class="title">Tags</td>
+          <td class="title">Keywords</td>
           <td (click)="onTagsClick('keyword')">
             <pr-tags [tags]="keywords" [canEdit]="canEdit"></pr-tags>
           </td>

src/app/file-browser/components/sidebar/sidebar.component.html

@@ -87,7 +87,7 @@
       ></pr-inline-value-edit>
     </div>
     <div class="sidebar-item">
-      <label>Tags</label>
+      <label>Keywords</label>
       <div class="sidebar-item-content">
         <pr-edit-tags
           [item]="selectedItem"

src/app/search/components/global-search-bar/global-search-bar.component.html

@@ -4,7 +4,7 @@
 <i class="ion-md-search"></i>
 <div class="search-results" *ngIf="showResults">
   <div class="search-result-group" *ngIf="tagResults?.length">
-    <div class="search-result-group-title">Tags</div>
+    <div class="search-result-group-title">Keywords</div>
     <div class="search-result-tags">
       <div class="tag" *ngFor="let tag of tagResults" (click)="onTagResultClick(tag)">{{tag.name}}</div>
     </div>

src/app/search/components/global-search-results/global-search-results.component.html

@@ -5,10 +5,10 @@
 </div>
 <div class="results">
   <div class="result-group" *ngIf="tagResults?.length">
-    <label>Tags</label>
+    <label>Keywords</label>
     <div class="tag-results">
       <div class="tag" *ngFor="let tag of tagResults"
-        (click)="onTagResultClick(tag)" ngbTooltip='Find items with tag "{{tag.name}}"'>
+        (click)="onTagResultClick(tag)" ngbTooltip='Find items with keyword "{{tag.name}}"'>
         {{tag.name}}
       </div>
     </div>

src/app/shared/components/tags/tags.component.html

@@ -4,7 +4,7 @@
 </div>
 <div class="tags">
   <div class="empty" *ngIf="!tags?.length">
-    {{ canEdit && !isEditing ? 'Click to add' : 'No tags' }}
+    {{ canEdit && !isEditing ? 'Click to add' : 'No keywords' }}
   </div>
   <ng-container *ngIf="tags?.length">
     <div

src/app/shared/components/tags/tags.component.spec.ts

@@ -79,6 +79,6 @@ describe('TagsComponent', () => {
     fixture.detectChanges();
     const div = fixture.debugElement.query(By.css('.empty'));
 
-    expect(div.nativeElement.textContent.trim()).toBe('No tags');
+    expect(div.nativeElement.textContent.trim()).toBe('No keywords');
   });
 });