Reorganize client shared modules

6 files changed, 0 insertions, 351 deletions

diff --git a/client/src/app/shared/rest/component-pagination.model.ts b/client/src/app/shared/rest/component-pagination.model.ts
deleted file mode 100644
index bcb73ed0f..000000000
--- a/client/src/app/shared/rest/component-pagination.model.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export interface ComponentPagination {
-  currentPage: number
-  itemsPerPage: number
-  totalItems: number
-}
-
-export type ComponentPaginationLight = Omit<ComponentPagination, 'totalItems'>
-
-export function hasMoreItems (componentPagination: ComponentPagination) {
-  // No results
-  if (componentPagination.totalItems === 0) return false
-
-  // Not loaded yet
-  if (!componentPagination.totalItems) return true
-
-  const maxPage = componentPagination.totalItems / componentPagination.itemsPerPage
-  return maxPage > componentPagination.currentPage
-}
diff --git a/client/src/app/shared/rest/index.ts b/client/src/app/shared/rest/index.ts
deleted file mode 100644
index f00cda2b8..000000000
--- a/client/src/app/shared/rest/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './rest-extractor.service'
-export * from './rest-pagination'
-export * from './rest.service'
-export * from './rest-table'
diff --git a/client/src/app/shared/rest/rest-extractor.service.ts b/client/src/app/shared/rest/rest-extractor.service.ts
deleted file mode 100644
index e6518dd1d..000000000
--- a/client/src/app/shared/rest/rest-extractor.service.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { throwError as observableThrowError } from 'rxjs'
-import { Injectable } from '@angular/core'
-import { dateToHuman } from '@app/shared/misc/utils'
-import { ResultList } from '../../../../../shared'
-import { Router } from '@angular/router'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-
-@Injectable()
-export class RestExtractor {
-
-  constructor (
-    private router: Router,
-    private i18n: I18n
-  ) { }
-
-  extractDataBool () {
-    return true
-  }
-
-  applyToResultListData <T> (result: ResultList<T>, fun: Function, additionalArgs?: any[]): ResultList<T> {
-    const data: T[] = result.data
-    const newData: T[] = []
-
-    data.forEach(d => newData.push(fun.apply(this, [ d ].concat(additionalArgs))))
-
-    return {
-      total: result.total,
-      data: newData
-    }
-  }
-
-  convertResultListDateToHuman <T> (result: ResultList<T>, fieldsToConvert: string[] = [ 'createdAt' ]): ResultList<T> {
-    return this.applyToResultListData(result, this.convertDateToHuman, [ fieldsToConvert ])
-  }
-
-  convertDateToHuman (target: { [ id: string ]: string }, fieldsToConvert: string[]) {
-    fieldsToConvert.forEach(field => target[field] = dateToHuman(target[field]))
-
-    return target
-  }
-
-  handleError (err: any) {
-    let errorMessage
-
-    if (err.error instanceof Error) {
-      // A client-side or network error occurred. Handle it accordingly.
-      errorMessage = err.error.message
-      console.error('An error occurred:', errorMessage)
-    } else if (typeof err.error === 'string') {
-      errorMessage = err.error
-    } else if (err.status !== undefined) {
-      // A server-side error occurred.
-      if (err.error && err.error.errors) {
-        const errors = err.error.errors
-        const errorsArray: string[] = []
-
-        Object.keys(errors).forEach(key => {
-          errorsArray.push(errors[key].msg)
-        })
-
-        errorMessage = errorsArray.join('. ')
-      } else if (err.error && err.error.error) {
-        errorMessage = err.error.error
-      } else if (err.status === 413) {
-        errorMessage = this.i18n(
-          'Request is too large for the server. Please contact you administrator if you want to increase the limit size.'
-        )
-      } else if (err.status === 429) {
-        const secondsLeft = err.headers.get('retry-after')
-        if (secondsLeft) {
-          const minutesLeft = Math.floor(parseInt(secondsLeft, 10) / 60)
-          errorMessage = this.i18n('Too many attempts, please try again after {{minutesLeft}} minutes.', { minutesLeft })
-        } else {
-          errorMessage = this.i18n('Too many attempts, please try again later.')
-        }
-      } else if (err.status === 500) {
-        errorMessage = this.i18n('Server error. Please retry later.')
-      }
-
-      errorMessage = errorMessage ? errorMessage : 'Unknown error.'
-      console.error(`Backend returned code ${err.status}, errorMessage is: ${errorMessage}`)
-    } else {
-      console.error(err)
-      errorMessage = err
-    }
-
-    const errorObj: { message: string, status: string, body: string } = {
-      message: errorMessage,
-      status: undefined,
-      body: undefined
-    }
-
-    if (err.status) {
-      errorObj.status = err.status
-      errorObj.body = err.error
-    }
-
-    return observableThrowError(errorObj)
-  }
-
-  redirectTo404IfNotFound (obj: { status: number }, status = [ 404 ]) {
-    if (obj && obj.status && status.indexOf(obj.status) !== -1) {
-      // Do not use redirectService to avoid circular dependencies
-      this.router.navigate([ '/404' ], { skipLocationChange: true })
-    }
-
-    return observableThrowError(obj)
-  }
-}
diff --git a/client/src/app/shared/rest/rest-pagination.ts b/client/src/app/shared/rest/rest-pagination.ts
deleted file mode 100644
index 0faa59303..000000000
--- a/client/src/app/shared/rest/rest-pagination.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface RestPagination {
-  start: number
-  count: number
-}
diff --git a/client/src/app/shared/rest/rest-table.ts b/client/src/app/shared/rest/rest-table.ts
deleted file mode 100644
index d4e6cf5f2..000000000
--- a/client/src/app/shared/rest/rest-table.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
-import { LazyLoadEvent, SortMeta } from 'primeng/api'
-import { RestPagination } from './rest-pagination'
-import { Subject } from 'rxjs'
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
-
-export abstract class RestTable {
-
-  abstract totalRecords: number
-  abstract sort: SortMeta
-  abstract pagination: RestPagination
-
-  search: string
-  rowsPerPageOptions = [ 10, 20, 50, 100 ]
-  rowsPerPage = this.rowsPerPageOptions[0]
-  expandedRows = {}
-
-  private searchStream: Subject<string>
-
-  abstract getIdentifier (): string
-
-  initialize () {
-    this.loadSort()
-    this.initSearch()
-  }
-
-  loadSort () {
-    const result = peertubeLocalStorage.getItem(this.getSortLocalStorageKey())
-
-    if (result) {
-      try {
-        this.sort = JSON.parse(result)
-      } catch (err) {
-        console.error('Cannot load sort of local storage key ' + this.getSortLocalStorageKey(), err)
-      }
-    }
-  }
-
-  loadLazy (event: LazyLoadEvent) {
-    this.sort = {
-      order: event.sortOrder,
-      field: event.sortField
-    }
-
-    this.pagination = {
-      start: event.first,
-      count: this.rowsPerPage
-    }
-
-    this.loadData()
-    this.saveSort()
-  }
-
-  saveSort () {
-    peertubeLocalStorage.setItem(this.getSortLocalStorageKey(), JSON.stringify(this.sort))
-  }
-
-  initSearch () {
-    this.searchStream = new Subject()
-
-    this.searchStream
-      .pipe(
-        debounceTime(400),
-        distinctUntilChanged()
-      )
-      .subscribe(search => {
-        this.search = search
-        this.loadData()
-      })
-  }
-
-  onSearch (event: Event) {
-    const target = event.target as HTMLInputElement
-    this.searchStream.next(target.value)
-  }
-
-  onPage (event: { first: number, rows: number }) {
-    if (this.rowsPerPage !== event.rows) {
-      this.rowsPerPage = event.rows
-      this.pagination = {
-        start: event.first,
-        count: this.rowsPerPage
-      }
-      this.loadData()
-    }
-    this.expandedRows = {}
-  }
-
-  setTableFilter (filter: string) {
-    // FIXME: cannot use ViewChild, so create a component for the filter input
-    const filterInput = document.getElementById('table-filter') as HTMLInputElement
-    if (filterInput) filterInput.value = filter
-  }
-
-  resetSearch () {
-    this.searchStream.next('')
-    this.setTableFilter('')
-  }
-
-  protected abstract loadData (): void
-
-  private getSortLocalStorageKey () {
-    return 'rest-table-sort-' + this.getIdentifier()
-  }
-}
diff --git a/client/src/app/shared/rest/rest.service.ts b/client/src/app/shared/rest/rest.service.ts
deleted file mode 100644
index 78558851a..000000000
--- a/client/src/app/shared/rest/rest.service.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { SortMeta } from 'primeng/api'
-import { HttpParams } from '@angular/common/http'
-import { Injectable } from '@angular/core'
-import { ComponentPaginationLight } from './component-pagination.model'
-import { RestPagination } from './rest-pagination'
-
-interface QueryStringFilterPrefixes {
-  [key: string]: {
-    prefix: string
-    handler?: (v: string) => string | number
-    multiple?: boolean
-  }
-}
-
-type ParseQueryStringFilterResult = {
-  [key: string]: string | number | (string | number)[]
-}
-
-@Injectable()
-export class RestService {
-
-  addRestGetParams (params: HttpParams, pagination?: RestPagination, sort?: SortMeta | string) {
-    let newParams = params
-
-    if (pagination !== undefined) {
-      newParams = newParams.set('start', pagination.start.toString())
-                           .set('count', pagination.count.toString())
-    }
-
-    if (sort !== undefined) {
-      let sortString = ''
-
-      if (typeof sort === 'string') {
-        sortString = sort
-      } else {
-        const sortPrefix = sort.order === 1 ? '' : '-'
-        sortString = sortPrefix + sort.field
-      }
-
-      newParams = newParams.set('sort', sortString)
-    }
-
-    return newParams
-  }
-
-  addObjectParams (params: HttpParams, object: { [ name: string ]: any }) {
-    for (const name of Object.keys(object)) {
-      const value = object[name]
-      if (value === undefined || value === null) continue
-
-      if (Array.isArray(value) && value.length !== 0) {
-        for (const v of value) params = params.append(name, v)
-      } else {
-        params = params.append(name, value)
-      }
-    }
-
-    return params
-  }
-
-  componentPaginationToRestPagination (componentPagination: ComponentPaginationLight): RestPagination {
-    const start: number = (componentPagination.currentPage - 1) * componentPagination.itemsPerPage
-    const count: number = componentPagination.itemsPerPage
-
-    return { start, count }
-  }
-
-  parseQueryStringFilter (q: string, prefixes: QueryStringFilterPrefixes): ParseQueryStringFilterResult {
-    if (!q) return {}
-
-    // Tokenize the strings using spaces
-    const tokens = q.split(' ').filter(token => !!token)
-
-    // Build prefix array
-    const prefixeStrings = Object.values(prefixes)
-                           .map(p => p.prefix)
-
-    // Search is the querystring minus defined filters
-    const searchTokens = tokens.filter(t => {
-      return prefixeStrings.every(prefixString => t.startsWith(prefixString) === false)
-    })
-
-    const additionalFilters: ParseQueryStringFilterResult = {}
-
-    for (const prefixKey of Object.keys(prefixes)) {
-      const prefixObj = prefixes[prefixKey]
-      const prefix = prefixObj.prefix
-
-      const matchedTokens = tokens.filter(t => t.startsWith(prefix))
-                                  .map(t => t.slice(prefix.length)) // Keep the value filter
-                                  .map(t => {
-                                    if (prefixObj.handler) return prefixObj.handler(t)
-
-                                    return t
-                                  })
-                                  .filter(t => !!t || t === 0)
-
-      if (matchedTokens.length === 0) continue
-
-      additionalFilters[prefixKey] = prefixObj.multiple === true
-        ? matchedTokens
-        : matchedTokens[0]
-    }
-
-    return {
-      search: searchTokens.join(' ') || undefined,
-
-      ...additionalFilters
-    }
-  }
-}