geonetwork-ui 2.5.0-dev.77e75b46a → 2.5.0-dev.8be73f10b

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

@@ -3,14 +3,13 @@ import { UtilSharedModule } from '../../../../../libs/util/shared/src'
 import { TranslateModule } from '@ngx-translate/core'
 import { NgxDropzoneModule } from 'ngx-dropzone'
 import { ColorScaleComponent } from './color-scale/color-scale.component'
-import { StepBarComponent } from './step-bar/step-bar.component'
 import { TagInputModule } from 'ngx-chips'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
 import { CommonModule } from '@angular/common'
 
 @NgModule({
-  declarations: [ColorScaleComponent, StepBarComponent],
+  declarations: [ColorScaleComponent],
   imports: [
     CommonModule,
     TranslateModule.forChild(),
@@ -21,6 +20,6 @@ import { CommonModule } from '@angular/common'
     UtilSharedModule,
     MatProgressSpinnerModule,
   ],
-  exports: [StepBarComponent],
+  exports: [],
 })
 export class UiWidgetsModule {}

package/src/libs/util/data-fetcher/src/index.ts

@@ -5,6 +5,9 @@ export {
   DataItem,
   FetchError,
   FieldAggregation,
+  PropertyInfo,
 } from './lib/model'
 export { getJsonDataItemsProxy } from './lib/utils'
 export { BaseReader } from './lib/readers/base'
+export { BaseFileReader } from './lib/readers/base-file'
+export { GeojsonReader } from './lib/readers/geojson'

package/src/libs/util/data-fetcher/src/lib/data-fetcher.ts

@@ -17,10 +17,17 @@ export async function openDataset(
     namespace?: string
     wfsVersion?: WfsVersion
     wfsFeatureType?: string
-  }
+  },
+  cacheActive?: boolean
 ): Promise<BaseReader> {
   const fileType = await inferDatasetType(url, typeHint)
-  let reader: BaseReader
+  let reader:
+    | CsvReader
+    | JsonReader
+    | GeojsonReader
+    | ExcelReader
+    | GmlReader
+    | WfsReader
   try {
     switch (fileType) {
       case 'csv':
@@ -42,6 +49,7 @@ export async function openDataset(
         reader = await WfsReader.createReader(url, options.wfsFeatureType)
         break
     }
+    reader.setCacheActive(cacheActive)
     reader.load()
     return reader
   } catch (e: any) {
@@ -61,9 +69,10 @@ export async function openDataset(
 export async function readDataset(
   url: string,
   typeHint?: SupportedType,
-  options?: any
+  options?: any,
+  cacheActive = true
 ): Promise<DataItem[]> {
-  const reader = await openDataset(url, typeHint, options)
+  const reader = await openDataset(url, typeHint, options, cacheActive)
   try {
     return await reader.read()
   } catch (e: any) {

package/src/libs/util/data-fetcher/src/lib/model.ts

@@ -13,8 +13,12 @@ export class FetchError {
   ) {
     this.message = `An error happened in the data fetcher, type: ${type}, info: ${info}`
   }
-  static http(code: number) {
-    return new FetchError('http', '', code)
+  static http(code: number, body?: string) {
+    const info = body
+      ? `Error ${code}
+${body}`
+      : `${code}`
+    return new FetchError('http', info, code)
   }
   static corsOrNetwork(message: string) {
     return new FetchError('network', message, 0)

package/src/libs/util/data-fetcher/src/lib/readers/base-cache.ts

@@ -0,0 +1,14 @@
+import { BaseReader } from './base'
+
+export abstract class BaseCacheReader extends BaseReader {
+  constructor(
+    protected url: string,
+    protected cacheActive = true
+  ) {
+    super(url)
+  }
+
+  setCacheActive(value: boolean) {
+    this.cacheActive = value
+  }
+}

package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts

@@ -2,13 +2,14 @@ import { BaseReader } from './base'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
+import { BaseCacheReader } from './base-cache'
 
 type ParseResult = {
   items: DataItem[]
   properties: PropertyInfo[]
 }
 
-export class BaseFileReader extends BaseReader {
+export class BaseFileReader extends BaseCacheReader {
   private parseResult_: Promise<ParseResult>
 
   protected getData(): Promise<ParseResult> {

package/src/libs/util/data-fetcher/src/lib/readers/base.ts

@@ -11,8 +11,8 @@ import {
 
 export class BaseReader {
   protected selected: FieldName[] = null
-  protected groupedBy: FieldGroupBy[] = null
-  protected aggregations: FieldAggregation[] = null
+  public groupedBy: FieldGroupBy[] = null
+  public aggregations: FieldAggregation[] = null
   protected filter: FieldFilter = null
   protected sort: FieldSort[] = null
   protected startIndex: number = null

package/src/libs/util/data-fetcher/src/lib/readers/csv.ts

@@ -47,6 +47,6 @@ export function parseCsv(text: string): {
 
 export class CsvReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseCsv)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseCsv)
   }
 }

package/src/libs/util/data-fetcher/src/lib/readers/excel.ts

@@ -28,6 +28,6 @@ export function parseExcel(buffer: ArrayBuffer): Promise<{
 
 export class ExcelReader extends BaseFileReader {
   getData() {
-    return fetchDataAsArrayBuffer(this.url).then(parseExcel)
+    return fetchDataAsArrayBuffer(this.url, this.cacheActive).then(parseExcel)
   }
 }

package/src/libs/util/data-fetcher/src/lib/readers/geojson.ts

@@ -24,6 +24,6 @@ export function parseGeojson(text: string): {
 
 export class GeojsonReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseGeojson)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseGeojson)
   }
 }

package/src/libs/util/data-fetcher/src/lib/readers/gml.ts

@@ -37,17 +37,17 @@ export function parseGml(
 }
 
 export class GmlReader extends BaseFileReader {
-  namespace: string
-  version: WfsVersion
-
-  constructor(url, namespace, version) {
+  constructor(
+    protected url: string,
+    protected namespace: string,
+    protected version: WfsVersion,
+    protected cacheActive = true
+  ) {
     super(url)
-    this.namespace = namespace
-    this.version = version
   }
 
   protected getData() {
-    return fetchDataAsText(this.url).then((text) =>
+    return fetchDataAsText(this.url, this.cacheActive).then((text) =>
       parseGml(text, this.namespace, this.version)
     )
   }

package/src/libs/util/data-fetcher/src/lib/readers/json.ts

@@ -23,6 +23,6 @@ export function parseJson(text: string): {
 
 export class JsonReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseJson)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseJson)
   }
 }

package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts

@@ -1,24 +1,46 @@
 import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { fetchDataAsText } from '../utils'
-import { BaseReader } from './base'
 import { GmlReader, parseGml } from './gml'
 import { GeojsonReader, parseGeojson } from './geojson'
+import { BaseCacheReader } from './base-cache'
+import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
+import { generateSqlQuery } from '../sql-utils'
 
-export class WfsReader extends BaseReader {
+export class WfsReader extends BaseCacheReader {
   endpoint: WfsEndpoint
   featureTypeName: string
   version: WfsVersion
 
-  constructor(url: string, wfsEndpoint: WfsEndpoint, featureTypeName: string) {
-    super(url)
+  constructor(
+    url: string,
+    wfsEndpoint: WfsEndpoint,
+    featureTypeName: string,
+    cacheActive?: boolean
+  ) {
+    super(url, cacheActive)
     this.endpoint = wfsEndpoint
     this.featureTypeName = featureTypeName
     this.version = this.endpoint.getVersion()
   }
 
   get properties(): Promise<PropertyInfo[]> {
-    return this.getData().then((result) => result.properties)
+    return this.endpoint
+      .getFeatureTypeFull(this.featureTypeName)
+      .then((featureType) =>
+        Object.keys(featureType.properties).map((prop) => {
+          const originalType = featureType.properties[prop]
+          const type =
+            originalType === 'float' || originalType === 'integer'
+              ? 'number'
+              : (originalType as PropertyInfo['type']) // FIXME: ogc-client typing is incorrect, should be a string union
+          return {
+            name: prop,
+            label: prop,
+            type,
+          }
+        })
+      )
   }
 
   get info(): Promise<DatasetInfo> {
@@ -74,13 +96,18 @@ export class WfsReader extends BaseReader {
     }
   }
 
-  protected getData() {
+  public async getData(aggregation?, groupedBy?) {
+    if (aggregation || groupedBy) {
+      return { items: await this.getQueryData() }
+    }
     const asJson = this.endpoint.supportsJson(this.featureTypeName)
+    const attributes = this.selected ?? undefined
     let url = this.endpoint.getFeatureUrl(this.featureTypeName, {
       ...(this.startIndex !== null && { startIndex: this.startIndex }),
       ...(this.count !== null && { maxFeatures: this.count }),
       asJson,
       outputCrs: 'EPSG:4326',
+      attributes,
       // sortBy: this.sort // TODO: no sort in ogc-client?
     })
 
@@ -95,18 +122,36 @@ export class WfsReader extends BaseReader {
       url = `${url}${finalUrl.search ? '&' : ''}SORTBY=${sorts}`
     }
 
-    return fetchDataAsText(url).then((text) =>
+    return fetchDataAsText(url, this.cacheActive).then((text) =>
       asJson
         ? parseGeojson(text)
         : parseGml(text, this.featureTypeName, this.version)
     )
   }
 
+  public async getQueryData() {
+    const items = (await this.getData()).items
+    const jsonItems = getJsonDataItemsProxy(items)
+    const query = generateSqlQuery(
+      this.selected,
+      this.filter,
+      this.sort,
+      this.startIndex,
+      this.count,
+      this.groupedBy,
+      this.aggregations
+    )
+    const result = await import('alasql').then((module) =>
+      module.default(query, [jsonItems])
+    )
+    return result.map(jsonToGeojsonFeature)
+  }
+
   load() {
     // Nothing to load for Wfs
   }
 
   async read(): Promise<DataItem[]> {
-    return (await this.getData()).items
+    return (await this.getData(this.aggregations, this.groupedBy)).items
   }
 }

package/src/libs/util/data-fetcher/src/lib/utils.ts

@@ -51,39 +51,45 @@ export function fetchHeaders(url: string): Promise<DatasetHeaders> {
     })
 }
 
-export function fetchDataAsText(url: string): Promise<string> {
-  return useCache(
-    () =>
-      sharedFetch(url)
-        .catch((error) => {
-          throw FetchError.corsOrNetwork(error.message)
-        })
-        .then(async (response) => {
-          if (!response.ok) {
-            throw FetchError.http(response.status)
-          }
-          return response.text()
-        }),
-    url,
-    'asText'
-  )
+export function fetchDataAsText(
+  url: string,
+  cacheActive: boolean
+): Promise<string> {
+  const fetchFactory = () =>
+    sharedFetch(url)
+      .catch((error) => {
+        throw FetchError.corsOrNetwork(error.message)
+      })
+      .then(async (response) => {
+        if (!response.ok) {
+          const clonedResponse = response.clone()
+          throw FetchError.http(response.status, await clonedResponse.text())
+        }
+        const clonedResponse = response.clone()
+        return clonedResponse.text()
+      })
+
+  return cacheActive ? useCache(fetchFactory, url, 'asText') : fetchFactory()
 }
-export function fetchDataAsArrayBuffer(url: string): Promise<ArrayBuffer> {
-  return useCache(
-    () =>
-      sharedFetch(url)
-        .catch((error) => {
-          throw FetchError.corsOrNetwork(error.message)
-        })
-        .then(async (response) => {
-          if (!response.ok) {
-            throw FetchError.http(response.status)
-          }
-          // convert to a numeric array so that we can store the response in cache
-          return Array.from(new Uint8Array(await response.arrayBuffer()))
-        }),
-    url,
-    'asArrayBuffer'
+export function fetchDataAsArrayBuffer(
+  url: string,
+  cacheActive: boolean
+): Promise<ArrayBuffer> {
+  const fetchFactory = () =>
+    sharedFetch(url)
+      .catch((error) => {
+        throw FetchError.corsOrNetwork(error.message)
+      })
+      .then(async (response) => {
+        if (!response.ok) {
+          throw FetchError.http(response.status, await response.text())
+        }
+        // convert to a numeric array so that we can store the response in cache
+        return Array.from(new Uint8Array(await response.arrayBuffer()))
+      })
+
+  return (
+    cacheActive ? useCache(fetchFactory, url, 'asArrayBuffer') : fetchFactory()
   ).then((array) => {
     return new Uint8Array(array).buffer
   })

package/translations/de.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "Geglättes Liniendiagramm",
   "chart.type.pie": "Kreisdiagramm",
   "dashboard.catalog.allRecords": "Metadatenkatalog",
-  "dashboard.catalog.contacts": "Kontakte",
-  "dashboard.catalog.thesaurus": "Thesaurus",
   "dashboard.createRecord": "Neuer Eintrag",
   "dashboard.importRecord": "",
   "dashboard.importRecord.importExternal": "",
@@ -34,29 +32,10 @@
   "dashboard.records.myDraft": "Meine Entwürfe",
   "dashboard.records.myRecords": "Meine Datensätze",
   "dashboard.records.search": "Suche nach \"{searchText}\"",
-  "dashboard.records.templates": "Vorlagen",
   "dashboard.records.userDetail": "Name",
   "dashboard.records.userEmail": "E-Mail",
   "dashboard.records.username": "Benutzername",
   "dashboard.records.users": "{count, plural, =1{Benutzer} other{Benutzer}}",
-  "datafeeder.analysisProgressBar.illustration.fileFormatDetection": "Dateiformat-Erkennung",
-  "datafeeder.analysisProgressBar.illustration.gatheringDatasetInformation": "Sammeln von Datensatzinformationen",
-  "datafeeder.analysisProgressBar.illustration.samplingData": "Datenauswahl",
-  "datafeeder.analysisProgressBar.subtitle": "Die Analyse kann einige Minuten dauern. Bitte warten Sie.",
-  "datafeeder.analysisProgressBar.title": "Analyse in Bearbeitung",
-  "datafeeder.datasetValidation.datasetInformation": "Der bereitgestellte Datensatz enthält {number} Elemente",
-  "datafeeder.datasetValidation.submitButton": "OK, meine Daten sind korrekt",
-  "datafeeder.datasetValidation.title": "Stellen Sie sicher, dass Ihre Daten korrekt sind",
-  "datafeeder.datasetValidation.unknown": " - ",
-  "datafeeder.datasetValidationCsv.explicitLineNumbers": "",
-  "datafeeder.datasetValidationCsv.lineNumbers": "",
-  "datafeeder.form.abstract": "Wie würden Sie Ihren Datensatz beschreiben?",
-  "datafeeder.form.datepicker": "Wissen Sie, wann der Datensatz erstellt wurde?",
-  "datafeeder.form.description": "Beschreiben Sie abschließend den Prozess, der zur Erstellung des Datensatzes verwendet wurde",
-  "datafeeder.form.dropdown": "Für welche Skala wurde er erstellt?",
-  "datafeeder.form.tags": "Wählen Sie einen oder mehrere Tage aus, die zu Ihrem Datensatz passen",
-  "datafeeder.form.title": "Geben Sie Ihrem Datensatz den besten Titel",
-  "datafeeder.formsPage.title": "Erzählen Sie uns mehr über Ihren Datensatz",
   "datafeeder.month.april": "April",
   "datafeeder.month.august": "August",
   "datafeeder.month.december": "Dezember",
@@ -69,59 +48,6 @@
   "datafeeder.month.november": "November",
   "datafeeder.month.october": "Oktober",
   "datafeeder.month.september": "September",
-  "datafeeder.publish.hint": "Sie können diese Seite sicher verlassen. Sie werden benachrichtigt, wenn der Vorgang abgeschlossen ist.",
-  "datafeeder.publish.illustration.title": "Ein weiterer Datensatz \n zum Veröffentlichen?",
-  "datafeeder.publish.subtitle": "Das Veröffentlichen kann einige Minuten dauern.",
-  "datafeeder.publish.title": "Vielen Dank! \n Ihr Datensatz wird veröffentlicht",
-  "datafeeder.publish.upload": "Jetzt hochladen",
-  "datafeeder.publishSuccess.geonetworkRecord": "Metadatensatz",
-  "datafeeder.publishSuccess.illustration.title": "Erledigt, alles ist gut!",
-  "datafeeder.publishSuccess.mapViewer": "Kartenviewer",
-  "datafeeder.publishSuccess.ogcFeature": "",
-  "datafeeder.publishSuccess.subtitle": "Zeigen Sie Ihre Daten an in:",
-  "datafeeder.publishSuccess.title": "Herzlichen Glückwunsch! \n Ihr Datensatz wurde veröffentlicht",
-  "datafeeder.publishSuccess.uploadAnotherData": "Ein weiteren Datensatz hochladen",
-  "datafeeder.summarizePage.illustration": "Kein Fehler? Los geht's!",
-  "datafeeder.summarizePage.previous": "Zurück",
-  "datafeeder.summarizePage.submit": "Absenden",
-  "datafeeder.summarizePage.title": "Sie sind fast fertig...",
-  "datafeeder.upload.acceptedFormats": "Akzeptierte Dateiformate:",
-  "datafeeder.upload.checkboxLabel": "Ich besitze die Rechte zur Veröffentlichung dieses Datensatzes",
-  "datafeeder.upload.error.subtitle.analysis": "Überprüfen Sie, ob die Datei einen gültigen geografischen Datensatz enthält",
-  "datafeeder.upload.error.subtitle.cantOpenFile": "Bitte überprüfen Sie, ob die Datei gültig ist",
-  "datafeeder.upload.error.subtitle.fileFormat": "Beachten Sie: Nur SHP-Dateien",
-  "datafeeder.upload.error.subtitle.fileSize": "Beachten Sie: Maximale Dateigröße {size} MB",
-  "datafeeder.upload.error.title.analysis": "Fehler während der Datensatzanalyse",
-  "datafeeder.upload.error.title.cantOpenFile": "Fehler beim Öffnen der Datei",
-  "datafeeder.upload.error.title.fileFormat": "Das ausgewählte Dateiformat wird nicht unterstützt",
-  "datafeeder.upload.error.title.fileHasntSelected": "Keine Datei ausgewählt",
-  "datafeeder.upload.error.title.fileSize": "Die Dateigröße ist zu groß",
-  "datafeeder.upload.error.title.noRightsToSendData": "Sie dürfen diesen Datensatz nicht veröffentlichen",
-  "datafeeder.upload.illustration.enrichment": "Anreicherung",
-  "datafeeder.upload.illustration.import": "Import",
-  "datafeeder.upload.illustration.title": "Das Hinzufügen von Daten \n war noch nie so einfach",
-  "datafeeder.upload.illustration.validation": "Validierung",
-  "datafeeder.upload.illustration.verification": "Überprüfung",
-  "datafeeder.upload.inputLabel": "Importieren Sie Ihre Datei",
-  "datafeeder.upload.maxFileSize": "Maximale Dateigröße beträgt {size} MB",
-  "datafeeder.upload.title": "Laden Sie Ihren Datensatz hoch",
-  "datafeeder.upload.uploadButton": "Hochladen",
-  "datafeeder.validation.csv.delimiter": "",
-  "datafeeder.validation.csv.delimiter.comma": "",
-  "datafeeder.validation.csv.delimiter.semicolon": "",
-  "datafeeder.validation.csv.lat.field": "",
-  "datafeeder.validation.csv.lng.field": "",
-  "datafeeder.validation.csv.quote.double": "",
-  "datafeeder.validation.csv.quote.none": "",
-  "datafeeder.validation.csv.quote.simple": "",
-  "datafeeder.validation.csv.quoteChar": "",
-  "datafeeder.validation.encoding": "Codierung",
-  "datafeeder.validation.extent.title": "Hier ist der Datensatzumfang",
-  "datafeeder.validation.extent.title.unknown": "Das Projektionssystem ist unbekannt",
-  "datafeeder.validation.projection": "Raumbezugssystem:",
-  "datafeeder.validation.projection.unknown": "Wählen Sie ein Raumbezugssystem aus",
-  "datafeeder.validation.sample.title": "Und eine Beispielentität aus dem Datensatz",
-  "datafeeder.wizard.emptyRequiredValuesMessage": "Bitte füllen Sie die obligatorischen Felder aus",
   "datafeeder.wizardSummarize.createdAt": "Erstellt am",
   "datafeeder.wizardSummarize.scale": "Maßstab",
   "datahub.header.datasets": "Datensätze",
@@ -425,9 +351,10 @@
   "record.action.download": "Herunterladen",
   "record.action.duplicate": "",
   "record.action.duplicating": "",
+  "record.action.rollback": "",
   "record.action.view": "Anzeigen",
   "record.externalViewer.open": "In externem Kartenviewer öffnen",
-  "record.feature.limit": "Die Ressource enthält mehr als {count} Features und kann hier nicht angezeigt werden.",
+  "record.feature.limit": "Die Vorschau wurde aufgrund zu vieler Elemente deaktiviert",
   "record.metadata.about": "Beschreibung",
   "record.metadata.api": "API",
   "record.metadata.api.form.closeButton": "Schließen",
@@ -547,6 +474,8 @@
   "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
   "search.field.any.placeholder": "Suche Datensätze ...",
   "search.field.sortBy": "Sortieren nach:",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Letzte Aktualisierung",
   "search.filters.clear": "Zurücksetzen",
   "search.filters.contact": "Kontakte",
@@ -589,6 +518,12 @@
   "share.tab.webComponent": "Integrieren",
   "table.loading.data": "Daten werden geladen...",
   "table.object.count": "Objekte in diesem Datensatz",
+  "table.paginator.firstPage": "Erste Seite",
+  "table.paginator.itemsPerPage": "Elemente pro Seite",
+  "table.paginator.lastPage": "Letzte Seite",
+  "table.paginator.nextPage": "Nächste Seite",
+  "table.paginator.previousPage": "Vorherige Seite",
+  "table.paginator.rangeLabel": "{startIndex} - {endIndex} von {length}",
   "table.select.data": "Datenquelle",
   "tooltip.html.copy": "HTML kopieren",
   "tooltip.id.copy": "Eindeutige Kennung kopieren",

package/translations/en.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "smooth line chart",
   "chart.type.pie": "pie chart",
   "dashboard.catalog.allRecords": "Datasets",
-  "dashboard.catalog.contacts": "Contacts",
-  "dashboard.catalog.thesaurus": "Thesaurus",
   "dashboard.createRecord": "New dataset",
   "dashboard.importRecord": "Import",
   "dashboard.importRecord.importExternal": "Import an external file",
@@ -34,29 +32,10 @@
   "dashboard.records.myDraft": "My drafts",
   "dashboard.records.myRecords": "My datasets",
   "dashboard.records.search": "Search for \"{searchText}\"",
-  "dashboard.records.templates": "Templates",
   "dashboard.records.userDetail": "Name",
   "dashboard.records.userEmail": "Email",
   "dashboard.records.username": "Username",
   "dashboard.records.users": "{count, plural, =1{user} other{users}}",
-  "datafeeder.analysisProgressBar.illustration.fileFormatDetection": "File format \n detection",
-  "datafeeder.analysisProgressBar.illustration.gatheringDatasetInformation": "Gathering dataset \n information",
-  "datafeeder.analysisProgressBar.illustration.samplingData": "Sampling \n data",
-  "datafeeder.analysisProgressBar.subtitle": "The analysis may take several minutes, please wait.",
-  "datafeeder.analysisProgressBar.title": "Analysis in progress",
-  "datafeeder.datasetValidation.datasetInformation": "The provided dataset contains {number} entities",
-  "datafeeder.datasetValidation.submitButton": "OK, my data is correct",
-  "datafeeder.datasetValidation.title": "Make sure your data is correct",
-  "datafeeder.datasetValidation.unknown": " - ",
-  "datafeeder.datasetValidationCsv.explicitLineNumbers": "*The table must display the first 5 lines (excluding the header)<br>If this is not the case, check that the file is correctly formatted",
-  "datafeeder.datasetValidationCsv.lineNumbers": "Sample of the first 5 lines* of the dataset:",
-  "datafeeder.form.abstract": "How would you describe your dataset?",
-  "datafeeder.form.datepicker": "Do you know when the dataset was created?",
-  "datafeeder.form.description": "Finally, please describe the process used to create the dataset",
-  "datafeeder.form.dropdown": "For which scale was it created?",
-  "datafeeder.form.tags": "Select one or more tags that fit your dataset",
-  "datafeeder.form.title": "Give your dataset the best title",
-  "datafeeder.formsPage.title": "Tell us more about your dataset",
   "datafeeder.month.april": "April",
   "datafeeder.month.august": "August",
   "datafeeder.month.december": "December",
@@ -69,59 +48,6 @@
   "datafeeder.month.november": "November",
   "datafeeder.month.october": "October",
   "datafeeder.month.september": "September",
-  "datafeeder.publish.hint": "You can safely exit this page, you will be notified when the process is over",
-  "datafeeder.publish.illustration.title": "Another dataset \n to publish?",
-  "datafeeder.publish.subtitle": "Publishing may take several minutes.",
-  "datafeeder.publish.title": "Thank you! \n Your dataset is being published",
-  "datafeeder.publish.upload": "Upload it now",
-  "datafeeder.publishSuccess.geonetworkRecord": "Metadata record",
-  "datafeeder.publishSuccess.illustration.title": "Done, all is good!",
-  "datafeeder.publishSuccess.mapViewer": "Map viewer",
-  "datafeeder.publishSuccess.ogcFeature": "OGC API",
-  "datafeeder.publishSuccess.subtitle": "View your data in:",
-  "datafeeder.publishSuccess.title": "Congratulations! \n Your dataset has been published",
-  "datafeeder.publishSuccess.uploadAnotherData": "Upload another dataset",
-  "datafeeder.summarizePage.illustration": "No mistake? Let's go!",
-  "datafeeder.summarizePage.previous": "Previous",
-  "datafeeder.summarizePage.submit": "Submit",
-  "datafeeder.summarizePage.title": "You're almost there...",
-  "datafeeder.upload.acceptedFormats": "Accepted file formats:",
-  "datafeeder.upload.checkboxLabel": "I hold the rights to publish this dataset",
-  "datafeeder.upload.error.subtitle.analysis": "Check that the file contains a valid geospatial dataset",
-  "datafeeder.upload.error.subtitle.cantOpenFile": "Please check that the file is valid",
-  "datafeeder.upload.error.subtitle.fileFormat": "Remember: only SHP",
-  "datafeeder.upload.error.subtitle.fileSize": "Remember: {size} MB maximum",
-  "datafeeder.upload.error.title.analysis": "Error during the dataset analysis",
-  "datafeeder.upload.error.title.cantOpenFile": "Error while opening the file",
-  "datafeeder.upload.error.title.fileFormat": "The selected file format is not supported",
-  "datafeeder.upload.error.title.fileHasntSelected": "No file selected",
-  "datafeeder.upload.error.title.fileSize": "The file size is too large",
-  "datafeeder.upload.error.title.noRightsToSendData": "You are not allowed to publish this dataset",
-  "datafeeder.upload.illustration.enrichment": "Enrichment",
-  "datafeeder.upload.illustration.import": "Import",
-  "datafeeder.upload.illustration.title": "Adding data \n has never been easier",
-  "datafeeder.upload.illustration.validation": "Validation",
-  "datafeeder.upload.illustration.verification": "Verification",
-  "datafeeder.upload.inputLabel": "Import your file",
-  "datafeeder.upload.maxFileSize": "Maximum file size is {size} MB",
-  "datafeeder.upload.title": "Upload your dataset",
-  "datafeeder.upload.uploadButton": "Upload",
-  "datafeeder.validation.csv.delimiter": "Delimiter",
-  "datafeeder.validation.csv.delimiter.comma": "Comma",
-  "datafeeder.validation.csv.delimiter.semicolon": "Semicolon",
-  "datafeeder.validation.csv.lat.field": "Latitude column",
-  "datafeeder.validation.csv.lng.field": "Longitude column",
-  "datafeeder.validation.csv.quote.double": "Double quote",
-  "datafeeder.validation.csv.quote.none": "None",
-  "datafeeder.validation.csv.quote.simple": "Single quote",
-  "datafeeder.validation.csv.quoteChar": "Quote separator",
-  "datafeeder.validation.encoding": "Encoding",
-  "datafeeder.validation.extent.title": "Here is the dataset extent",
-  "datafeeder.validation.extent.title.unknown": "The projection system is unknown",
-  "datafeeder.validation.projection": "Spatial reference system:",
-  "datafeeder.validation.projection.unknown": "Choose a spatial reference system",
-  "datafeeder.validation.sample.title": "And a sample entity from the dataset",
-  "datafeeder.wizard.emptyRequiredValuesMessage": "Please fill in mandatory fields",
   "datafeeder.wizardSummarize.createdAt": "Created at",
   "datafeeder.wizardSummarize.scale": "Scale",
   "datahub.header.datasets": "Datasets",
@@ -425,9 +351,10 @@
   "record.action.download": "Download",
   "record.action.duplicate": "Duplicate",
   "record.action.duplicating": "Duplicating...",
+  "record.action.rollback": "Rollback",
   "record.action.view": "View",
   "record.externalViewer.open": "Open in the external map viewer",
-  "record.feature.limit": "The resource contains more than {count} features and cannot be displayed here.",
+  "record.feature.limit": "Preview disabled due to too many elements",
   "record.metadata.about": "Description",
   "record.metadata.api": "API",
   "record.metadata.api.form.closeButton": "Close",
@@ -547,6 +474,8 @@
   "search.error.recordNotFound": "The dataset with identifier \"{ id }\" could not be found.",
   "search.field.any.placeholder": "Search datasets ...",
   "search.field.sortBy": "Sort by:",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Updated",
   "search.filters.clear": "Reset",
   "search.filters.contact": "Contacts",
@@ -589,6 +518,12 @@
   "share.tab.webComponent": "Integrate",
   "table.loading.data": "Loading data...",
   "table.object.count": "Objects in this dataset",
+  "table.paginator.firstPage": "First page",
+  "table.paginator.itemsPerPage": "Items per page",
+  "table.paginator.lastPage": "Last page",
+  "table.paginator.nextPage": "Next page",
+  "table.paginator.previousPage": "Previous page",
+  "table.paginator.rangeLabel": "{startIndex} - {endIndex} of {length}",
   "table.select.data": "Data source",
   "tooltip.html.copy": "Copy HTML",
   "tooltip.id.copy": "Copy unique identifier",