geonetwork-ui 2.2.0-dev.438f1ef6 → 2.2.0-dev.55bb5e18

package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.ts

@@ -14,10 +14,7 @@ import { TranslateService } from '@ngx-translate/core'
 import { StarToggleComponent } from '../../../../../../../libs/ui/inputs/src'
 import { Observable, Subscription } from 'rxjs'
 import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
-import {
-  AuthService,
-  FavoritesService,
-} from '../../../../../../../libs/api/repository/src/lib/gn4'
+import { AuthService, FavoritesService } from '../../../../../../../libs/api/repository/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 @Component({
@@ -27,6 +24,7 @@ import { PlatformServiceInterface } from '../../../../../../../libs/common/domai
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FavoriteStarComponent implements AfterViewInit, OnDestroy {
+  @Input() displayCount? = true
   @Input() set record(value) {
     this.record_ = value
     this.favoriteCount =

package/src/libs/feature/search/src/lib/feature-search.module.ts

@@ -23,7 +23,7 @@ import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.compo
 import { Geometry } from 'geojson'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { RecordsRepositoryInterface } from '../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
-import { Gn4Repository } from '../../../../../libs/api/repository/src/lib/gn4'
+import { Gn4Repository } from '../../../../../libs/api/repository/src'
 
 // this geometry will be used to filter & boost results accordingly
 export const FILTER_GEOMETRY = new InjectionToken<Promise<Geometry>>(

package/src/libs/feature/search/src/lib/state/effects.ts

@@ -43,7 +43,7 @@ import { switchMapWithSearchId } from '../utils/operators/search.operator'
 import { Geometry } from 'geojson'
 import { FILTER_GEOMETRY } from '../feature-search.module'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
-import { FavoritesService } from '../../../../../../libs/api/repository/src/lib/gn4'
+import { FavoritesService } from '../../../../../../libs/api/repository/src'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { valid as validGeoJson } from 'geojson-validation'
 

package/src/libs/feature/search/src/lib/utils/service/fields.ts

@@ -13,7 +13,7 @@ import {
   FieldFilters,
   TermBucket,
 } from '../../../../../../../libs/common/domain/src/lib/model/search'
-import { ElasticsearchService } from '../../../../../../../libs/api/repository/src/lib/gn4'
+import { ElasticsearchService } from '../../../../../../../libs/api/repository/src'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
 
 export type FieldValue = string | number

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html

@@ -5,5 +5,6 @@
   [selected]="currentLang"
   ariaName="languages"
   [showTitle]="false"
+  [extraBtnClass]="'flex justify-items-center text-white !pl-2 !py-1'"
 >
 </gn-ui-dropdown-selector>

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.ts

@@ -34,7 +34,7 @@ export class LanguageSwitcherComponent implements OnInit {
   ngOnInit(): void {
     const languages = this.languagePlaceholder || DEFAULT_LANGUAGES
     this.languageList = languages.map((language) => ({
-      label: `language.${language}`,
+      label: `${language}`.toUpperCase(),
       value: language,
     }))
   }

package/src/libs/ui/elements/src/index.ts

@@ -19,3 +19,4 @@ export * from './lib/related-record-card/related-record-card.component'
 export * from './lib/search-results-error/search-results-error.component'
 export * from './lib/user-preview/user-preview.component'
 export * from './lib/record-api-form/record-api-form.component'
+export * from './lib/markdown-parser/markdown-parser.component'

package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.css

@@ -0,0 +1,264 @@
+/** Body **/
+:host /deep/ .markdown-body {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  margin: 0px 0px 1.5rem 0px;
+  line-height: 1.5;
+  word-wrap: break-word;
+}
+
+/** Emphasis **/
+
+:host /deep/ .markdown-body strong {
+  @apply font-bold;
+  color: var(--color-secondary-darker);
+}
+
+/** Headings **/
+
+:host /deep/ .markdown-body h1,
+:host /deep/ .markdown-body h2,
+:host /deep/ .markdown-body h3,
+:host /deep/ .markdown-body h4,
+:host /deep/ .markdown-body h5,
+:host /deep/ .markdown-body h6 {
+  margin-top: 24px;
+  margin-bottom: 16px;
+  line-height: 1.25;
+  @apply text-title font-title font-bold;
+}
+
+:host /deep/ .markdown-body h1 {
+  margin: 0.67em 0;
+  padding-bottom: 0.3em;
+  font-size: 2em;
+  color: var(--color-primary);
+}
+
+:host /deep/ .markdown-body h2 {
+  padding-bottom: 0.3em;
+  font-size: 1.5em;
+  color: var(--color-secondary);
+}
+
+:host /deep/ .markdown-body h3 {
+  font-size: 1.25em;
+  color: var(--color-secondary);
+}
+
+:host /deep/ .markdown-body h4 {
+  font-size: 1em;
+  color: var(--color-secondary);
+}
+
+:host /deep/ .markdown-body h5 {
+  font-size: 0.875em;
+  color: var(--color-secondary);
+}
+
+:host /deep/ .markdown-body h6 {
+  font-size: 0.85em;
+  color: var(--color-secondary-lighter);
+}
+
+/** Paragraphs **/
+
+:host /deep/ .markdown-body p {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+/** Links **/
+
+:host /deep/ .markdown-body p > a {
+  margin-top: 0;
+  margin-bottom: 10px;
+  color: var(--color-primary) !important;
+  text-decoration: none !important;
+  @apply font-bold;
+}
+
+:host /deep/ .markdown-body p > a:hover {
+  color: var(--color-primary-darker) !important;
+}
+
+/** Blockquotes **/
+
+:host /deep/ .markdown-body blockquote {
+  margin: 0;
+  padding: 0 1em;
+  color: var(--color-secondary-lighter);
+  border-left: 0.25em solid var(--color-primary-lighter);
+}
+
+/** Code **/
+
+:host /deep/ .markdown-body pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 12px;
+  background-color: var(--color-gray-100);
+  word-wrap: normal;
+}
+
+:host /deep/ .markdown-body pre {
+  padding: 16px;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  color: var(--color-secondary);
+  border-radius: 6px;
+}
+
+:host /deep/ .markdown-body code {
+  padding: 0.2em 0.4em;
+  margin: 0;
+  font-size: 85%;
+  white-space: break-spaces;
+  border-radius: 6px;
+}
+
+:host /deep/ .markdown-body pre code {
+  display: inline;
+  max-width: auto;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  line-height: inherit;
+  word-wrap: normal;
+  border: 0;
+}
+
+/** Horizontal rules **/
+
+:host /deep/ .markdown-body hr {
+  box-sizing: content-box;
+  overflow: hidden;
+  background: transparent;
+  border-bottom: 1px solid var(--color-secondary);
+  height: 0.15em;
+  padding: 0;
+  margin: 24px 0;
+  background-color: var(--color-secondary);
+  border: 0;
+}
+
+:host /deep/ .markdown-body hr::before {
+  display: table;
+  content: '';
+}
+
+:host /deep/ .markdown-body hr::after {
+  display: table;
+  clear: both;
+  content: '';
+}
+
+/** Lists **/
+
+:host /deep/ .markdown-body ul,
+:host /deep/ .markdown-body ol {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-left: 2em;
+  list-style: revert;
+}
+
+:host /deep/ .markdown-body ol ol,
+:host /deep/ .markdown-body ul ol {
+  list-style-type: lower-roman;
+}
+
+:host /deep/ .markdown-body ul ul ol,
+:host /deep/ .markdown-body ul ol ol,
+:host /deep/ .markdown-body ol ul ol,
+:host /deep/ .markdown-body ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+:host /deep/ .markdown-body ol[type='a s'] {
+  list-style-type: lower-alpha;
+}
+
+:host /deep/ .markdown-body ol[type='A s'] {
+  list-style-type: upper-alpha;
+}
+
+:host /deep/ .markdown-body ol[type='i s'] {
+  list-style-type: lower-roman;
+}
+
+:host /deep/ .markdown-body ol[type='I s'] {
+  list-style-type: upper-roman;
+}
+
+:host /deep/ .markdown-body ol[type='1'] {
+  list-style: unset;
+  list-style-type: decimal;
+}
+
+:host /deep/ .markdown-body div > ol:not([type]) {
+  list-style: unset;
+  list-style-type: decimal;
+}
+
+/** Table **/
+
+:host /deep/ .markdown-body table {
+  border-spacing: 0;
+  border-collapse: collapse;
+  display: block;
+  width: max-content;
+  max-width: 100%;
+  overflow: auto;
+  padding-bottom: 15px;
+}
+
+:host /deep/ .markdown-body td,
+:host /deep/ .markdown-body th {
+  padding: 0;
+}
+
+:host /deep/ .markdown-body th {
+  color: var(--color-secondary);
+}
+
+:host /deep/ .markdown-body table th,
+:host /deep/ .markdown-body table td {
+  padding: 6px 13px;
+  border: 1px solid var(--color-gray-500);
+}
+
+:host /deep/ .markdown-body table td > :last-child {
+  margin-bottom: 0;
+}
+
+:host /deep/ .markdown-body table tr {
+  background-color: #ffffff;
+  border-top: 1px solid var(--color-secondary-lighter);
+}
+
+:host /deep/ .markdown-body table tr:nth-child(2n) {
+  background-color: var(--color-gray-100);
+}
+
+:host /deep/ .markdown-body table img {
+  background-color: transparent;
+}
+
+/** Images **/
+
+:host /deep/ .markdown-body img {
+  border-style: none;
+  max-width: 100%;
+  box-sizing: content-box;
+  background-color: transparent;
+}
+
+:host /deep/ .markdown-body img[align='right'] {
+  padding-left: 20px;
+}
+
+:host /deep/ .markdown-body img[align='left'] {
+  padding-right: 20px;
+}

package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.html

@@ -0,0 +1 @@
+<div class="markdown-body" [innerHTML]="parsedMarkdown"></div>

package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts

@@ -0,0 +1,16 @@
+import { Component, Input, ChangeDetectionStrategy } from '@angular/core'
+import { marked } from 'marked'
+
+@Component({
+  selector: 'gn-ui-markdown-parser',
+  templateUrl: './markdown-parser.component.html',
+  styleUrls: ['./markdown-parser.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MarkdownParserComponent {
+  @Input() textContent: string
+
+  get parsedMarkdown() {
+    return marked.parse(this.textContent)
+  }
+}

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.html

@@ -1,32 +1,98 @@
-<div *ngIf="shownOrganization" class="mb-6 sm:mb-12">
-  <p class="text-gray-700 text-xs mb-3 uppercase" translate>
-    record.metadata.contact
-  </p>
-  <div class="flex mb-1">
+<div class="py-5 px-5 rounded bg-gray-100 text-black mb-6 sm:mb-12">
+  <div class="grid gap-3">
+    <div>
+      <p class="text-sm font-medium" translate>record.metadata.contact</p>
+    </div>
     <div
-      class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
-      (click)="onOrganizationClick()"
+      *ngIf="shownOrganization?.logoUrl?.href"
+      class="flex items-center justify-center border-solid border border-gray-300 rounded-md bg-white h-32 overflow-hidden"
     >
-      {{ shownOrganization.name }}
+      <gn-ui-thumbnail
+        class="relative h-full w-full"
+        [thumbnailUrl]="shownOrganization.logoUrl.href"
+        fit="contain"
+      ></gn-ui-thumbnail>
+    </div>
+    <div class="grid gap-1">
+      <div class="flex">
+        <div
+          class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
+          (click)="onOrganizationClick()"
+          data-cy="organization-name"
+        >
+          {{ shownOrganization.name }}
+        </div>
+      </div>
+      <div *ngIf="shownOrganization?.website">
+        <a
+          [href]="shownOrganization.website"
+          target="_blank"
+          class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
+          >{{ shownOrganization.website }}
+          <mat-icon
+            class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
+            >open_in_new</mat-icon
+          >
+        </a>
+      </div>
+    </div>
+    <div class="grid gap-5 py-3 overflow-hidden">
+      <div *ngIf="contacts[0]?.phone">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+            >call_outline</mat-icon
+          >
+          <div class="flex flex-col ml-2">
+            <p class="text-sm">{{ contacts[0].phone }}</p>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="contacts[0]?.email">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+          >
+            mail_outline</mat-icon
+          >
+          <a
+            *ngIf="contacts.length"
+            [href]="'mailto:' + contacts[0].email"
+            class="text-sm hover:underline ml-2"
+            target="_blank"
+            data-cy="contact-email"
+            >{{ contacts[0].email }}</a
+          >
+        </div>
+      </div>
+      <div *ngIf="contacts[0]?.firstName || contacts[0]?.lastName">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+            >person_outline</mat-icon
+          >
+          <div class="flex flex-col ml-2">
+            <p class="text-sm">
+              {{ contacts[0]?.firstName || '' }}
+              {{ contacts[0]?.lastName || '' }}
+            </p>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="contacts[0]?.address">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+          >
+            location_on</mat-icon
+          >
+          <div class="flex flex-col ml-2">
+            <p *ngFor="let addressPart of address" class="text-sm">
+              {{ addressPart }}
+            </p>
+          </div>
+        </div>
+      </div>
     </div>
-  </div>
-  <a
-    *ngIf="contacts.length"
-    [href]="'mailto:' + contacts[0].email"
-    class="text-gray-700 text-sm hover:underline"
-    target="_blank"
-    >{{ contacts[0].email }}</a
-  >
-  <div *ngIf="shownOrganization.website" class="mb-2">
-    <a
-      [href]="shownOrganization.website"
-      target="_blank"
-      class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
-      >{{ shownOrganization.website }}
-      <mat-icon
-        class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75"
-        >open_in_new</mat-icon
-      >
-    </a>
   </div>
 </div>

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts

@@ -34,6 +34,13 @@ export class MetadataContactComponent {
     )
   }
 
+  get address() {
+    const addressParts = this.contacts[0].address
+      .split(',')
+      .map((part) => part.trim())
+    return addressParts
+  }
+
   onOrganizationClick() {
     this.organizationClick.emit(this.shownOrganization)
   }

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -1,32 +1,10 @@
-<p
-  class="text-[28px] text-title text-center mb-6 font-title sm:text-left"
-  translate
->
-  record.metadata.about
-</p>
 <div class="mb-6 md-description sm:mb-4 sm:pr-16">
   <gn-ui-content-ghost ghostClass="h-32" [showContent]="fieldReady('abstract')">
     <gn-ui-max-lines [maxLines]="6" *ngIf="metadata.abstract">
       <div>
-        <p
-          class="whitespace-pre-line break-words sm:mb-4 sm:pr-16"
-          [innerHTML]="metadata.abstract"
-          gnUiLinkify
-        ></p>
-        <ng-container *ngIf="metadata.keywords?.length">
-          <p class="mb-3 font-medium text-primary text-sm" translate>
-            record.metadata.keywords
-          </p>
-          <div class="sm:pb-4 sm:pr-16">
-            <gn-ui-badge
-              class="inline-block mr-2 mb-2 lowercase"
-              (click)="onKeywordClick(keyword)"
-              [clickable]="true"
-              *ngFor="let keyword of metadata.keywords"
-              >{{ keyword }}</gn-ui-badge
-            >
-          </div>
-        </ng-container>
+        <gn-ui-markdown-parser
+          [textContent]="metadata.abstract"
+        ></gn-ui-markdown-parser>
       </div>
     </gn-ui-max-lines>
   </gn-ui-content-ghost>

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -52,8 +52,4 @@ export class MetadataInfoComponent {
   fieldReady(propName: string) {
     return !this.incomplete || propName in this.metadata
   }
-
-  onKeywordClick(keyword: string) {
-    this.keyword.emit(keyword)
-  }
 }

package/src/libs/ui/elements/src/lib/ui-elements.module.ts

@@ -29,6 +29,7 @@ import { GnUiLinkifyDirective } from './metadata-info/linkify.directive'
 import { PaginationButtonsComponent } from './pagination-buttons/pagination-buttons.component'
 import { MaxLinesComponent } from './max-lines/max-lines.component'
 import { RecordApiFormComponent } from './record-api-form/record-api-form.component'
+import { MarkdownParserComponent } from './markdown-parser/markdown-parser.component'
 
 @NgModule({
   imports: [
@@ -65,6 +66,7 @@ import { RecordApiFormComponent } from './record-api-form/record-api-form.compon
     PaginationButtonsComponent,
     MaxLinesComponent,
     RecordApiFormComponent,
+    MarkdownParserComponent,
   ],
   exports: [
     MetadataInfoComponent,
@@ -85,6 +87,7 @@ import { RecordApiFormComponent } from './record-api-form/record-api-form.compon
     UserPreviewComponent,
     PaginationButtonsComponent,
     RecordApiFormComponent,
+    MarkdownParserComponent,
   ],
 })
 export class UiElementsModule {}

package/src/libs/ui/inputs/src/lib/button/button.component.ts

@@ -14,14 +14,37 @@ import { propagateToDocumentOnly } from '../../../../../../libs/util/shared/src'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ButtonComponent {
-  @Input() type: 'primary' | 'secondary' | 'default' | 'outline' | 'light' =
-    'default'
+  private btnClass: string
+
+  // btn-classes are explicited to allow tailwind recognize them and add it in css.
+  @Input() set type(
+    value: 'primary' | 'secondary' | 'default' | 'outline' | 'light'
+  ) {
+    switch (value) {
+      case 'primary':
+        this.btnClass = 'btn-primary'
+        break
+      case 'secondary':
+        this.btnClass = 'btn-secondary'
+        break
+      case 'outline':
+        this.btnClass = 'btn-outline'
+        break
+      case 'light':
+        this.btnClass = 'btn-light'
+        break
+      default:
+        this.btnClass = 'btn-default'
+        break
+    }
+  }
+
   @Input() disabled = false
   @Input() extraClass = ''
   @Output() buttonClick = new EventEmitter<void>()
 
   get classList() {
-    return `btn-${this.type} ${this.extraClass}`
+    return `${this.btnClass} ${this.extraClass}`
   }
 
   handleClick(event: Event) {

package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.ts

@@ -17,7 +17,10 @@ import {
 } from '@angular/cdk/overlay'
 import { take } from 'rxjs/operators'
 import { Choice } from './dropdown-multiselect.model'
-import { propagateToDocumentOnly } from '../../../../../../libs/util/shared/src'
+import {
+  createFuzzyFilter,
+  propagateToDocumentOnly,
+} from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-dropdown-multiselect',
@@ -74,9 +77,9 @@ export class DropdownMultiselectComponent {
   }
 
   get filteredChoicesByText() {
-    return this.choices.filter((choice) =>
-      choice.label.toLowerCase().includes(this.searchInputValue?.toLowerCase())
-    )
+    if (!this.searchInputValue) return this.choices
+    const filter = createFuzzyFilter(this.searchInputValue)
+    return this.choices.filter((choice) => filter(choice.label))
   }
 
   get focusedIndex(): number | -1 {

package/src/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.html

@@ -1,6 +1,11 @@
 <button
-  class="group flex items-center justify-center backdrop-blur p-1 bg-primary-opacity-50 text-white rounded"
+  class="group flex items-center justify-center gap-1 backdrop-blur p-1 bg-primary-opacity-30 text-white rounded content-center"
 >
-  <mat-icon class="material-symbols-outlined align-middle">{{ icon }}</mat-icon>
-  <span class="mx-2 hidden group-hover:inline">{{ label }}</span>
+  <mat-icon class="material-symbols-outlined align-middle w-[18px]">{{
+    icon
+  }}</mat-icon>
+  <span
+    class="mx-2 mt-0.5 text-[16px] tracking-widest content-center opacity-75"
+    >{{ label.toUpperCase() }}</span
+  >
 </button>

package/src/libs/ui/inputs/src/lib/star-toggle/star-toggle.component.css

@@ -11,6 +11,7 @@ mat-icon {
   font-size: 1.5em;
   margin-top: -0.1em;
   font-variation-settings: 'opsz' 40;
+  stroke: var(--color-primary-darker);
 }
 
 .star-filled {

package/src/libs/util/i18n/src/index.ts

@@ -5,3 +5,4 @@ export * from './lib/lang.service'
 export * from './lib/file.translate.loader'
 export * from './lib/testing/test.translate.module'
 export * from './lib/embedded.translate.loader'
+export * from './lib/translate.loader.utils'