src/Coscine.Api.Resources/index.ts

@@ -4,7 +4,7 @@
  * Coscine.Api.Resources
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.10.0
+ * The version of the OpenAPI document: 3.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/Coscine.Api.Search/api.ts

@@ -24,38 +24,492 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 /**
  * 
  * @export
- * @interface SearchResult
+ * @interface DisciplineObject
  */
-export interface SearchResult {
+export interface DisciplineObject {
     /**
      * 
      * @type {string}
-     * @memberof SearchResult
+     * @memberof DisciplineObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof DisciplineObject
+     */
+    url?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof DisciplineObject
+     */
+    displayNameDe?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof DisciplineObject
+     */
+    displayNameEn?: string | null;
+}
+/**
+ * File Search Result Object
+ * @export
+ * @interface FileSearchResult
+ */
+export interface FileSearchResult {
+    /**
+     * Graph Name
+     * @type {string}
+     * @memberof FileSearchResult
      */
     graphName?: string | null;
+    /**
+     * ID of Project containing the file
+     * @type {string}
+     * @memberof FileSearchResult
+     */
+    projectId?: string | null;
+    /**
+     * ID of Resource containing the file
+     * @type {string}
+     * @memberof FileSearchResult
+     */
+    resourceId?: string | null;
+    /**
+     * Search result fields
+     * @type {any}
+     * @memberof FileSearchResult
+     */
+    source?: any | null;
+}
+/**
+ * 
+ * @export
+ * @interface LicenseObject
+ */
+export interface LicenseObject {
     /**
      * 
      * @type {string}
-     * @memberof SearchResult
+     * @memberof LicenseObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof LicenseObject
+     */
+    displayName?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface OrganizationObject
+ */
+export interface OrganizationObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof OrganizationObject
+     */
+    url?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof OrganizationObject
+     */
+    displayName?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface ProjectObject
+ */
+export interface ProjectObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    displayName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    startDate?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    endDate?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    keywords?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    projectName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    principleInvestigators?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    grantId?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    slug?: string | null;
+    /**
+     * 
+     * @type {Array<DisciplineObject>}
+     * @memberof ProjectObject
+     */
+    disciplines?: Array<DisciplineObject> | null;
+    /**
+     * 
+     * @type {Array<OrganizationObject>}
+     * @memberof ProjectObject
+     */
+    organizations?: Array<OrganizationObject> | null;
+    /**
+     * 
+     * @type {VisibilityObject}
+     * @memberof ProjectObject
+     */
+    visibility?: VisibilityObject | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ProjectObject
+     */
+    parentId?: string;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceObject
+ */
+export interface ResourceObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    pid?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    displayName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    resourceName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    keywords?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
      */
-    project?: string | null;
+    usageRights?: string | null;
+    /**
+     * 
+     * @type {ResourceTypeObject}
+     * @memberof ResourceObject
+     */
+    type?: ResourceTypeObject | null;
+    /**
+     * 
+     * @type {Array<DisciplineObject>}
+     * @memberof ResourceObject
+     */
+    disciplines?: Array<DisciplineObject> | null;
+    /**
+     * 
+     * @type {VisibilityObject}
+     * @memberof ResourceObject
+     */
+    visibility?: VisibilityObject | null;
+    /**
+     * 
+     * @type {LicenseObject}
+     * @memberof ResourceObject
+     */
+    license?: LicenseObject | null;
     /**
      * 
      * @type {any}
+     * @memberof ResourceObject
+     */
+    resourceTypeOption?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    applicationProfile?: string | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof ResourceObject
+     */
+    fixedValues?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceObject
+     */
+    creator?: string | null;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResourceObject
+     */
+    archived?: boolean;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceSearchResult
+ */
+export interface ResourceSearchResult {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    pid?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    displayName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    resourceName?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    description?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    keywords?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    usageRights?: string | null;
+    /**
+     * 
+     * @type {ResourceTypeObject}
+     * @memberof ResourceSearchResult
+     */
+    type?: ResourceTypeObject | null;
+    /**
+     * 
+     * @type {Array<DisciplineObject>}
+     * @memberof ResourceSearchResult
+     */
+    disciplines?: Array<DisciplineObject> | null;
+    /**
+     * 
+     * @type {VisibilityObject}
+     * @memberof ResourceSearchResult
+     */
+    visibility?: VisibilityObject | null;
+    /**
+     * 
+     * @type {LicenseObject}
+     * @memberof ResourceSearchResult
+     */
+    license?: LicenseObject | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof ResourceSearchResult
+     */
+    resourceTypeOption?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    applicationProfile?: string | null;
+    /**
+     * 
+     * @type {any}
+     * @memberof ResourceSearchResult
+     */
+    fixedValues?: any | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    creator?: string | null;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ResourceSearchResult
+     */
+    archived?: boolean;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResult
+     */
+    projectId?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceSearchResultAllOf
+ */
+export interface ResourceSearchResultAllOf {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceSearchResultAllOf
+     */
+    projectId?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface ResourceTypeObject
+ */
+export interface ResourceTypeObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceTypeObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ResourceTypeObject
+     */
+    displayName?: string | null;
+}
+/**
+ * Search result return object
+ * @export
+ * @interface SearchResult
+ */
+export interface SearchResult {
+    /**
+     * Search result projects
+     * @type {Array<ProjectObject>}
      * @memberof SearchResult
      */
-    source?: any | null;
+    projects?: Array<ProjectObject> | null;
+    /**
+     * Search result resources
+     * @type {Array<ResourceSearchResult>}
+     * @memberof SearchResult
+     */
+    resources?: Array<ResourceSearchResult> | null;
+    /**
+     * Search result files
+     * @type {Array<FileSearchResult>}
+     * @memberof SearchResult
+     */
+    files?: Array<FileSearchResult> | null;
+}
+/**
+ * 
+ * @export
+ * @interface VisibilityObject
+ */
+export interface VisibilityObject {
+    /**
+     * 
+     * @type {string}
+     * @memberof VisibilityObject
+     */
+    id?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof VisibilityObject
+     */
+    displayName?: string | null;
 }
 
 /**
- * SemanticSearchApi - axios parameter creator
+ * SearchApi - axios parameter creator
  * @export
  */
-export const SemanticSearchApiAxiosParamCreator = function (configuration?: Configuration) {
+export const SearchApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
          * 
-         * @summary Search with SemanticSearch;
+         * @summary Search
          * @param {string} [query] Elasticsearch query
          * @param {boolean} [user] Specify user or only public metadata records could be found
          * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
@@ -63,8 +517,8 @@ export const SemanticSearchApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        semanticSearchSearch: async (query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options: any = {}): Promise<RequestArgs> => {
-            const localVarPath = `/SemanticSearch`;
+        searchSearch: async (query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/Search`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -110,15 +564,15 @@ export const SemanticSearchApiAxiosParamCreator = function (configuration?: Conf
 };
 
 /**
- * SemanticSearchApi - functional programming interface
+ * SearchApi - functional programming interface
  * @export
  */
-export const SemanticSearchApiFp = function(configuration?: Configuration) {
-    const localVarAxiosParamCreator = SemanticSearchApiAxiosParamCreator(configuration)
+export const SearchApiFp = function(configuration?: Configuration) {
+    const localVarAxiosParamCreator = SearchApiAxiosParamCreator(configuration)
     return {
         /**
          * 
-         * @summary Search with SemanticSearch;
+         * @summary Search
          * @param {string} [query] Elasticsearch query
          * @param {boolean} [user] Specify user or only public metadata records could be found
          * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
@@ -126,23 +580,23 @@ export const SemanticSearchApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async semanticSearchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<SearchResult>>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.semanticSearchSearch(query, user, adv, languages, options);
+        async searchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<SearchResult>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.searchSearch(query, user, adv, languages, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
     }
 };
 
 /**
- * SemanticSearchApi - factory interface
+ * SearchApi - factory interface
  * @export
  */
-export const SemanticSearchApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
-    const localVarFp = SemanticSearchApiFp(configuration)
+export const SearchApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    const localVarFp = SearchApiFp(configuration)
     return {
         /**
          * 
-         * @summary Search with SemanticSearch;
+         * @summary Search
          * @param {string} [query] Elasticsearch query
          * @param {boolean} [user] Specify user or only public metadata records could be found
          * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
@@ -150,32 +604,32 @@ export const SemanticSearchApiFactory = function (configuration?: Configuration,
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        semanticSearchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): AxiosPromise<Array<SearchResult>> {
-            return localVarFp.semanticSearchSearch(query, user, adv, languages, options).then((request) => request(axios, basePath));
+        searchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any): AxiosPromise<SearchResult> {
+            return localVarFp.searchSearch(query, user, adv, languages, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * SemanticSearchApi - object-oriented interface
+ * SearchApi - object-oriented interface
  * @export
- * @class SemanticSearchApi
+ * @class SearchApi
  * @extends {BaseAPI}
  */
-export class SemanticSearchApi extends BaseAPI {
+export class SearchApi extends BaseAPI {
     /**
      * 
-     * @summary Search with SemanticSearch;
+     * @summary Search
      * @param {string} [query] Elasticsearch query
      * @param {boolean} [user] Specify user or only public metadata records could be found
      * @param {boolean} [adv] Set true for advanced Elasticsearch search syntax
      * @param {Array<string>} [languages] Set the used languages
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof SemanticSearchApi
+     * @memberof SearchApi
      */
-    public semanticSearchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any) {
-        return SemanticSearchApiFp(this.configuration).semanticSearchSearch(query, user, adv, languages, options).then((request) => request(this.axios, this.basePath));
+    public searchSearch(query?: string, user?: boolean, adv?: boolean, languages?: Array<string>, options?: any) {
+        return SearchApiFp(this.configuration).searchSearch(query, user, adv, languages, options).then((request) => request(this.axios, this.basePath));
     }
 }
 

src/Coscine.Api.Tree/api.ts

@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/Coscine.Api.Tree/base.ts

@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/Coscine.Api.Tree/common.ts

@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/Coscine.Api.Tree/configuration.ts

@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/Coscine.Api.Tree/index.ts

@@ -4,7 +4,7 @@
  * Coscine.Api.Tree
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: 2.8.2
+ * The version of the OpenAPI document: 2.8.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

src/apis.ts

@@ -12,13 +12,12 @@ import { ProjectApiFactory } from './Coscine.Api.Project/api';
 import { ProjectQuotaApiFactory } from './Coscine.Api.Project/api';
 import { ProjectRoleApiFactory } from './Coscine.Api.Project/api';
 import { RoleApiFactory } from './Coscine.Api.Project/api';
-import { SearchApiFactory } from './Coscine.Api.Project/api';
 import { SubProjectApiFactory } from './Coscine.Api.Project/api';
 import { VisibilityApiFactory } from './Coscine.Api.Project/api';
 import { ResourceApiFactory } from './Coscine.Api.Resources/api';
 import { ResourceQuotaApiFactory } from './Coscine.Api.Resources/api';
 import { ResourceTypeApiFactory } from './Coscine.Api.Resources/api';
-import { SemanticSearchApiFactory } from './Coscine.Api.Search/api';
+import { SearchApiFactory } from './Coscine.Api.Search/api';
 import { TokenApiFactory } from './Coscine.Api.Token/api';
 import { TreeApiFactory } from './Coscine.Api.Tree/api';
 import { ContactChangeApiFactory } from './Coscine.Api.User/api';
@@ -68,8 +67,7 @@ function implementations(axios?: AxiosInstance) {
     ResourceQuotaApi: ResourceQuotaApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Resources', axios),
     ResourceTypeApi: ResourceTypeApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Resources', axios),
     RoleApi: RoleApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Project', axios),
-    SearchApi: SearchApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Project', axios),
-    SemanticSearchApi: SemanticSearchApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Search', axios),
+    SearchApi: SearchApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Search', axios),
     SubProjectApi: SubProjectApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Project', axios),
     TitleApi: TitleApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.User', axios),
     TokenApi: TokenApiFactory(new Configuration({ 'accessToken': accessToken }), 'https://' + getHostName() + '/coscine/api/Coscine.Api.Token', axios),

src/index.ts

@@ -20,7 +20,6 @@ export const ResourceQuotaApi = apis.ResourceQuotaApi;
 export const ResourceTypeApi = apis.ResourceTypeApi;
 export const RoleApi = apis.RoleApi;
 export const SearchApi = apis.SearchApi;
-export const SemanticSearchApi = apis.SemanticSearchApi;
 export const SubProjectApi = apis.SubProjectApi;
 export const TitleApi = apis.TitleApi;
 export const TokenApi = apis.TokenApi;