Browse Source

fix type errors

Signed-off-by: ryjiang <jiangruiyi@gmail.com>
ryjiang 1 year ago
parent
commit
4cf0ab1d23

+ 7 - 8
client/src/http/Collection.ts

@@ -28,7 +28,6 @@ export class CollectionHttp extends BaseModel implements CollectionView {
   private id!: string;
   private id!: string;
   private loadedPercentage!: string;
   private loadedPercentage!: string;
   private createdTime!: string;
   private createdTime!: string;
-  private sampleFile!: string;
   private schema!: {
   private schema!: {
     fields: Field[];
     fields: Field[];
     autoID: boolean;
     autoID: boolean;
@@ -105,7 +104,9 @@ export class CollectionHttp extends BaseModel implements CollectionView {
     return super.search({
     return super.search({
       path: `${this.COLLECTIONS_URL}/${collectionName}/psegments`,
       path: `${this.COLLECTIONS_URL}/${collectionName}/psegments`,
       params: {},
       params: {},
-    });
+    }) as Promise<{
+      infos: any;
+    }>;
   }
   }
 
 
   static count(collectionName: string) {
   static count(collectionName: string) {
@@ -119,7 +120,9 @@ export class CollectionHttp extends BaseModel implements CollectionView {
     return super.search({
     return super.search({
       path: `${this.COLLECTIONS_URL}/${collectionName}/qsegments`,
       path: `${this.COLLECTIONS_URL}/${collectionName}/qsegments`,
       params: {},
       params: {},
-    });
+    }) as Promise<{
+      infos: any;
+    }>;
   }
   }
 
 
   static insertData(collectionName: string, param: InsertDataParam) {
   static insertData(collectionName: string, param: InsertDataParam) {
@@ -133,7 +136,7 @@ export class CollectionHttp extends BaseModel implements CollectionView {
     return super.create({
     return super.create({
       path: `${this.COLLECTIONS_URL}/${collectionName}/importSample`,
       path: `${this.COLLECTIONS_URL}/${collectionName}/importSample`,
       data: param,
       data: param,
-    });
+    }) as Promise<{ sampleFile: string }>;
   }
   }
 
 
   static deleteEntities(collectionName: string, param: DeleteEntitiesReq) {
   static deleteEntities(collectionName: string, param: DeleteEntitiesReq) {
@@ -252,8 +255,4 @@ export class CollectionHttp extends BaseModel implements CollectionView {
   get _schema() {
   get _schema() {
     return this.schema;
     return this.schema;
   }
   }
-
-  get _sampleFile() {
-    return this.sampleFile;
-  }
 }
 }

+ 3 - 1
client/src/http/Database.ts

@@ -15,7 +15,9 @@ export class DatabaseHttp extends BaseModel {
   static DATABASE_URL = `/databases`;
   static DATABASE_URL = `/databases`;
 
 
   static getDatabases() {
   static getDatabases() {
-    return super.search({ path: this.DATABASE_URL, params: {} });
+    return super.search({ path: this.DATABASE_URL, params: {} }) as Promise<{
+      db_names: string[];
+    }>;
   }
   }
 
 
   static createDatabase(data: CreateDatabaseParams) {
   static createDatabase(data: CreateDatabaseParams) {

+ 1 - 1
client/src/http/Field.ts

@@ -11,7 +11,7 @@ export class FieldHttp extends BaseModel implements FieldData {
   name!: string;
   name!: string;
   description!: string;
   description!: string;
   autoID!: boolean;
   autoID!: boolean;
-  element_type!:  DataTypeStringEnum;
+  element_type!: DataTypeStringEnum;
 
 
   constructor(props: {}) {
   constructor(props: {}) {
     super(props);
     super(props);

+ 4 - 1
client/src/http/Milvus.ts

@@ -33,7 +33,10 @@ export class MilvusHttp extends BaseModel {
   }
   }
 
 
   static check(address: string) {
   static check(address: string) {
-    return super.search({ path: this.CHECK_URL, params: { address } });
+    return super.search({
+      path: this.CHECK_URL,
+      params: { address },
+    }) as Promise<{ connected: boolean }>;
   }
   }
 
 
   static flush(collectionName: string) {
   static flush(collectionName: string) {

+ 16 - 3
client/src/http/User.ts

@@ -22,7 +22,9 @@ export class UserHttp extends BaseModel {
 
 
   // get user data
   // get user data
   static getUsers() {
   static getUsers() {
-    return super.search({ path: this.USERS_URL, params: {} });
+    return super.search({ path: this.USERS_URL, params: {} }) as Promise<{
+      usernames: string[];
+    }>;
   }
   }
 
 
   // create user
   // create user
@@ -68,7 +70,9 @@ export class UserHttp extends BaseModel {
 
 
   // get all roles
   // get all roles
   static getRoles() {
   static getRoles() {
-    return super.search({ path: `${this.ROLES_URL}`, params: {} });
+    return super.search({ path: `${this.ROLES_URL}`, params: {} }) as Promise<{
+      results: string[];
+    }>;
   }
   }
 
 
   // update role privileges
   // update role privileges
@@ -81,7 +85,16 @@ export class UserHttp extends BaseModel {
 
 
   // get RBAC info
   // get RBAC info
   static getRBAC() {
   static getRBAC() {
-    return super.search({ path: `${this.USERS_URL}/rbac`, params: {} });
+    return super.search({
+      path: `${this.USERS_URL}/rbac`,
+      params: {},
+    }) as Promise<{
+      GlobalPrivileges: Record<string, unknown>;
+      CollectionPrivileges: Record<string, unknown>;
+      RbacObjects: Record<string, unknown>;
+      UserPrivileges: Record<string, unknown>;
+      Privileges: Record<string, unknown>;
+    }>;
   }
   }
 
 
   get _names() {
   get _names() {

+ 3 - 6
client/src/pages/dialogs/ImportSampleDialog.tsx

@@ -107,17 +107,14 @@ const ImportSampleDialog: FC<{ collection: string }> = props => {
       format: format,
       format: format,
     };
     };
     try {
     try {
-      const res = (await CollectionHttp.importSample(
-        collectionName,
-        param
-      )) as CollectionHttp;
+      const res = await CollectionHttp.importSample(collectionName, param);
       if (download) {
       if (download) {
         const fileName = format === 'csv' ? csvFileName : jsonFileName;
         const fileName = format === 'csv' ? csvFileName : jsonFileName;
         const type =
         const type =
           format === 'csv' ? 'text/csv;charset=utf-8;' : 'application/json';
           format === 'csv' ? 'text/csv;charset=utf-8;' : 'application/json';
-        const blob = new Blob([res._sampleFile], { type });
+        const blob = new Blob([res.sampleFile], { type });
         saveAs(blob, fileName);
         saveAs(blob, fileName);
-        return { result: res._sampleFile, msg: '' };
+        return { result: res.sampleFile, msg: '' };
       }
       }
       await MilvusHttp.flush(collectionName);
       await MilvusHttp.flush(collectionName);
       return { result: true, msg: '' };
       return { result: true, msg: '' };

+ 1 - 1
client/src/pages/partitions/Partitions.tsx

@@ -177,7 +177,7 @@ const Partitions: FC<{
       label: btnTrans('insert'),
       label: btnTrans('insert'),
       onClick: async () => {
       onClick: async () => {
         const collection = await fetchCollectionDetail(collectionName);
         const collection = await fetchCollectionDetail(collectionName);
-        const schema = collection.schema.fields.map(
+        const schema = collection._schema.fields.map(
           (f: Field) => new FieldHttp(f)
           (f: Field) => new FieldHttp(f)
         );
         );
 
 

+ 2 - 1
client/src/pages/preview/Preview.tsx

@@ -105,7 +105,8 @@ const Preview: FC<{
         expr: '',
         expr: '',
         vectors,
         vectors,
         output_fields: [primaryKey],
         output_fields: [primaryKey],
-        vector_type: DataTypeEnum[vectorField!._fieldType],
+        vector_type:
+          DataTypeEnum[vectorField!._fieldType as keyof typeof DataTypeEnum],
       });
       });
 
 
       // compose random id list expression
       // compose random id list expression

+ 0 - 5
client/src/pages/user/Types.ts

@@ -107,8 +107,3 @@ export type RBACOptions = {
   UserPrivileges: Record<string, unknown>;
   UserPrivileges: Record<string, unknown>;
   Privileges: Record<string, unknown>;
   Privileges: Record<string, unknown>;
 };
 };
-
-export type RoleOptions = string[];
-export type RolesType = {
-  results: any[];
-};

+ 1 - 1
client/src/pages/user/UpdateRoleDialog.tsx

@@ -50,7 +50,7 @@ const UpdateRoleDialog: FC<CreateRoleProps> = ({
   });
   });
 
 
   const fetchRBAC = async () => {
   const fetchRBAC = async () => {
-    const rbacOptions = (await UserHttp.getRBAC()) as RBACOptions;
+    const rbacOptions = await UserHttp.getRBAC();
 
 
     setRbacOptions(rbacOptions);
     setRbacOptions(rbacOptions);
   };
   };

+ 1 - 0
client/src/pages/user/User.tsx

@@ -41,6 +41,7 @@ const Users = () => {
   const fetchUsers = async () => {
   const fetchUsers = async () => {
     const res = await UserHttp.getUsers();
     const res = await UserHttp.getUsers();
     const roles = await UserHttp.getRoles();
     const roles = await UserHttp.getRoles();
+
     setUsers(
     setUsers(
       res.usernames.map((v: string) => {
       res.usernames.map((v: string) => {
         const name = v;
         const name = v;

+ 1 - 2
client/src/types/SearchTypes.ts

@@ -1,6 +1,5 @@
 import { Option } from '@/components/customSelector/Types';
 import { Option } from '@/components/customSelector/Types';
-import { searchKeywordsType } from '@/consts';
-import { DataTypeEnum, DataTypeStringEnum } from '@/pages/collections/Types';
+import { searchKeywordsType, DataTypeEnum, DataTypeStringEnum } from '@/consts';
 import { IndexView } from '@/pages/schema/Types';
 import { IndexView } from '@/pages/schema/Types';
 
 
 export interface SearchParamsProps {
 export interface SearchParamsProps {