Merge pull request #18 from IQSS/revert-17-feature/create_new_functions_to_allow_version_types

Revert "Create new functions to allow version types"

Author: tainguyenbui

README.md

@@ -32,18 +32,10 @@ const response = await client.getDataverseInformation('myDataverseAlias')
 
 `public async getFileMetadata(fileId: string, draftVersion: boolean = false): Promise<AxiosResponse> {`
 
-`public async getLatestPublishedDatasetInformation(datasetId: string): Promise<AxiosResponse> {`
-
 `public async getLatestDatasetInformation(datasetId: string): Promise<AxiosResponse> {`
 
-`public async getDraftDatasetInformation(datasetId: string): Promise<AxiosResponse> {`
-
-`public async getLatestPublishedDatasetInformationFromDOI(doi: string): Promise<AxiosResponse> {`
-
 `public async getLatestDatasetInformationFromDOI(doi: string): Promise<AxiosResponse> {`
 
-`public async getDraftDatasetInformationFromDOI(doi: string): Promise<AxiosResponse> {`
-
 `public async getDatasetVersions(datasetId: string): Promise<AxiosResponse> {`
 
 ```
@@ -53,8 +45,6 @@ Note: Version must be published, e.g.:
 http://demo.dataverse.org/api/datasets/389608/versions/1
 ```
 
-`public async getDatasetVersionFromDOI(doi: string, version: string): Promise<AxiosResponse> {`
-
 `public async listDataverseRoleAssignments(dataverseAlias: string): Promise<AxiosResponse> {`
 
 `public async getMetric(datasetId: string, metricType: DataverseMetricType, yearMonth?: string): Promise<AxiosResponse> {`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-dataverse",
-  "version": "1.0.30",
+  "version": "1.0.29",
   "description": "A Dataverse module for JavaScript/TypeScript",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/@types/datasetVersionType.ts

@@ -7,7 +7,6 @@ import { BasicDatasetInformation } from './@types/basicDataset'
 import { DatasetUtil } from './utils/datasetUtil'
 import request from 'request-promise'
 import { DatasetVersionUpgradeType } from './@types/datasetVersionUpgradeType'
-import { DatasetVersionType } from './@types/datasetVersionType'
 
 export class DataverseClient {
   private readonly host: string
@@ -64,28 +63,14 @@ export class DataverseClient {
     return this.getRequest(url)
   }
 
-  public async getLatestPublishedDatasetInformation(datasetId: string): Promise<AxiosResponse> {
-    return this.getDatasetVersion(datasetId, DatasetVersionType.LATEST_PUBLISHED)
-  }
-
   public async getLatestDatasetInformation(datasetId: string): Promise<AxiosResponse> {
-    return this.getDatasetVersion(datasetId, DatasetVersionType.LATEST)
-  }
-
-  public async getDraftDatasetInformation(datasetId: string): Promise<AxiosResponse> {
-    return this.getDatasetVersion(datasetId, DatasetVersionType.DRAFT)
-  }
-
-  public async getLatestPublishedDatasetInformationFromDOI(doi: string): Promise<AxiosResponse> {
-    return this.getDatasetVersionFromDOI(doi, DatasetVersionType.LATEST_PUBLISHED)
+    const url = `${this.host}/api/datasets/${datasetId}`
+    return this.getRequest(url)
   }
 
   public async getLatestDatasetInformationFromDOI(doi: string): Promise<AxiosResponse> {
-    return this.getDatasetVersionFromDOI(doi, DatasetVersionType.LATEST)
-  }
-
-  public async getDraftDatasetInformationFromDOI(doi: string): Promise<AxiosResponse> {
-    return this.getDatasetVersionFromDOI(doi, DatasetVersionType.DRAFT)
+    const url = `${this.host}/api/datasets/:persistentId?persistentId=doi:${doi}`
+    return this.getRequest(url)
   }
 
   public async getDatasetVersions(datasetId: string): Promise<AxiosResponse> {
@@ -98,11 +83,6 @@ export class DataverseClient {
     return this.getRequest(url)
   }
 
-  public async getDatasetVersionFromDOI(doi: string, version: string): Promise<AxiosResponse> {
-    const url = `${this.host}/api/datasets/:persistentId/versions/${version}?persistentId=doi:${doi}`
-    return this.getRequest(url)
-  }
-
   public async getDatasetThumbnail(datasetId: string): Promise<AxiosResponse> {
     const url = `${this.host}/api/datasets/${datasetId}/thumbnail`
     return this.getRequest(url, {