Merge branch 'main' of github.com:bakaphp/kanvas-core-js into AP-309

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.75",
+  "version": "0.0.77",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

src/modules/companies/index.ts

@@ -17,22 +17,31 @@ import {
   CompanyInput,
   CompanyInterface,
   CompanySettings,
-  WhereCondition
+  WhereCondition,
+  OrderBy,
+  CreatedCompanies
 } from '../../types';
 
 export class Companies {
   constructor(protected client: ClientType) {}
 
   public async getCompanies(
-    where: WhereCondition,
-    first?: number,
-    page?: number
-  ): Promise<CompanyInterface> {
+    options: {
+      first?: number;
+      page?: number;
+      where?: WhereCondition;
+      orderBy?: OrderBy[];
+    } = {}
+  ): Promise<CreatedCompanies> {
+    const { first, page, where, orderBy } = options;
+
     const response = await this.client.query({
       query: COMPANIES_QUERY,
-      variables: { where, first, page },
+      variables: { where, first, page, orderBy },
+      fetchPolicy: 'network-only',
+      partialRefetch: true,
     });
-    return response.data as CompanyInterface;
+    return response.data;
   }
 
   public async getCompanyUsers(

src/modules/settings/index.tsx

@@ -1,21 +1,33 @@
 import {
+  APP_SETTINGS_QUERY,
   AppSettingsQuery,
   CompanySettingsQuery,
   ConfigInput,
   USERS_SETTINGS_QUERY,
 } from '../../queries';
 import {
+  AppSettingsQueryResponse,
   AppSettingsResponse,
   ClientType,
   CompanySettingsResponse,
   SettingsResponse,
-  userSettingsResponse,
+  UserSettingsResponse,
 } from '../../index';
 import { SET_USER_SETTINGS_MUTATION } from '../../mutations';
 
 export default class Settings {
   constructor(protected client: ClientType, protected key: string) {}
 
+  async fetchAppSettings(): Promise<AppSettingsQueryResponse | undefined> {
+    try {
+      const { data } = await this.client.query({
+        query: APP_SETTINGS_QUERY,
+      });
+      return data;
+    } catch {
+      return undefined;
+    }
+  }
   async getAppSettings(): Promise<SettingsResponse | undefined> {
     try {
       const {
@@ -47,7 +59,7 @@ export default class Settings {
 
   async getUserSettings(
     entity_uuid: string
-  ): Promise<userSettingsResponse | undefined> {
+  ): Promise<UserSettingsResponse | undefined> {
     try {
       const { data } = await this.client.query({
         query: USERS_SETTINGS_QUERY,

src/queries/companies.query.ts

@@ -4,8 +4,8 @@ export const COMPANIES_QUERY = gql`
   query companies(
     $where: QueryCompaniesWhereWhereConditions
     $orderBy: [QueryCompaniesOrderByOrderByClause!]
-    $first: Int!
-    $page: Int!
+    $first: Int
+    $page: Int
   ) {
     companies(where: $where, orderBy: $orderBy, first: $first, page: $page) {
       data {
@@ -39,7 +39,6 @@ export const COMPANIES_QUERY = gql`
         }
         groups {
           id
-          uuid
           name
         }
         branches {

src/queries/settings.query.ts

@@ -32,3 +32,12 @@ export const USERS_SETTINGS_QUERY = gql`
     }
   }
 `;
+
+export const APP_SETTINGS_QUERY = gql`
+  query {
+    appSettings {
+      key
+      value
+    }
+  }
+`;

src/types/companies.ts

@@ -1,4 +1,5 @@
 import { UserInterface } from 'index';
+import { PaginatorInfo } from './paginator';
 
 export interface CompanyInterface {
   id: string;
@@ -57,3 +58,10 @@ export interface CompanySettings {
   name: string;
   settings: any;
 }
+
+export interface CreatedCompanies {
+  companies: {
+    data: CompanyInterface[];
+    paginatorInfo?: PaginatorInfo;
+  };
+}

src/types/settings.ts

@@ -11,6 +11,10 @@ export interface CompanySettingsResponse<T = any> {
   companySettings: SettingsResponse<T>;
 }
 
-export interface userSettingsResponse {
+export interface UserSettingsResponse {
   userSettings: Array<{ key: string; value: any }>;
 }
+
+export interface AppSettingsQueryResponse {
+  appSettings: Array<{ key: string; value: any }>;
+}