@oanda/labs-instruments-table-widget 1.0.41 → 1.0.43

package/src/gql/types/graphql.ts

@@ -50,6 +50,25 @@ export enum BookType {
   Position = 'POSITION',
 }
 
+export type Candle = {
+  __typename?: 'Candle';
+  close: Scalars['Float']['output'];
+  high: Scalars['Float']['output'];
+  low: Scalars['Float']['output'];
+  open: Scalars['Float']['output'];
+  /** UTC Timestamp */
+  point: Scalars['String']['output'];
+};
+
+export type CandlesData = {
+  __typename?: 'CandlesData';
+  candle: Array<Maybe<Candle>>;
+  granularity: Granularity;
+  instrument: Instrument;
+  pipsLocation: Scalars['Int']['output'];
+  timeSpan: TimeSpan;
+};
+
 export type CorrelationHeatmap = {
   __typename?: 'CorrelationHeatmap';
   baseInstrument: Instrument;
@@ -117,8 +136,9 @@ export type CurrencyStrength = {
 };
 
 export enum DataSource {
-  Ny4 = 'NY4',
-  Ty3 = 'TY3',
+  All = 'ALL',
+  Mt5 = 'MT5',
+  V20 = 'V20',
 }
 
 export enum Division {
@@ -135,11 +155,20 @@ export enum Division {
 
 export type ExtendedInstrument = {
   __typename?: 'ExtendedInstrument';
+  dataSource: DataSource;
   displayName: Scalars['String']['output'];
   name: Scalars['String']['output'];
   tradeMode: TradeMode;
 };
 
+export enum Granularity {
+  D1 = 'D1',
+  H1 = 'H1',
+  H4 = 'H4',
+  M1 = 'M1',
+  M15 = 'M15',
+}
+
 export type Heatmap = {
   __typename?: 'Heatmap';
   instrument: Instrument;
@@ -158,11 +187,6 @@ export type InstrumentCorrelation = {
   value?: Maybe<Scalars['Float']['output']>;
 };
 
-export enum InstrumentDataSource {
-  Mt5 = 'MT5',
-  V20 = 'V20',
-}
-
 export type InstrumentTableResult = {
   __typename?: 'InstrumentTableResult';
   instruments: Array<ExtendedInstrument>;
@@ -170,12 +194,24 @@ export type InstrumentTableResult = {
   updatedAt: Scalars['String']['output'];
 };
 
+export type MarginRate = {
+  __typename?: 'MarginRate';
+  instrument: Instrument;
+  rate: Scalars['Float']['output'];
+};
+
 export type Matrix = {
   __typename?: 'Matrix';
   instrument: Instrument;
   instrumentCorrelation: Array<InstrumentCorrelation>;
 };
 
+export enum OrderBookDataSource {
+  Ny4 = 'NY4',
+  Ny4Mt5 = 'NY4_MT5',
+  Ty3 = 'TY3',
+}
+
 export type OrderPositionBucket = {
   __typename?: 'OrderPositionBucket';
   longCountPercent: Scalars['Float']['output'];
@@ -204,7 +240,9 @@ export type Query = {
   currencyStrength?: Maybe<Array<CurrencyStrength>>;
   isAllowedPartner?: Maybe<Scalars['Boolean']['output']>;
   mapInstrumentNames?: Maybe<Array<Maybe<Instrument>>>;
+  marginRates?: Maybe<Array<MarginRate>>;
   orderPositionBooks: Array<Maybe<OrderPositionData>>;
+  priceCandles: CandlesData;
   resolveInstrumentsByDivision?: Maybe<Array<Instrument>>;
   resolveInstrumentsWithFilters?: Maybe<InstrumentTableResult>;
   sentiment?: Maybe<Array<SentimentInstrument>>;
@@ -246,14 +284,29 @@ export type QueryMapInstrumentNamesArgs = {
   instruments: Array<InputMaybe<Scalars['String']['input']>>;
 };
 
+export type QueryMarginRatesArgs = {
+  dataSource: DataSource;
+  division: Division;
+  instruments?: InputMaybe<Array<Scalars['String']['input']>>;
+  tradingGroup: Scalars['Int']['input'];
+};
+
 export type QueryOrderPositionBooksArgs = {
   bookType: BookType;
-  dataSource?: InputMaybe<DataSource>;
+  dataSource?: InputMaybe<OrderBookDataSource>;
   instrument: Scalars['String']['input'];
   recentHours?: InputMaybe<Scalars['Int']['input']>;
   region?: InputMaybe<Region>;
 };
 
+export type QueryPriceCandlesArgs = {
+  dataSource: DataSource;
+  division: Division;
+  granularity: Granularity;
+  instrument: Scalars['String']['input'];
+  timeSpan: TimeSpan;
+};
+
 export type QueryResolveInstrumentsByDivisionArgs = {
   division: Division;
   instruments: Array<InputMaybe<Scalars['String']['input']>>;
@@ -262,7 +315,7 @@ export type QueryResolveInstrumentsByDivisionArgs = {
 export type QueryResolveInstrumentsWithFiltersArgs = {
   assetClass?: InputMaybe<Array<InputMaybe<AssetClassName>>>;
   count?: InputMaybe<Scalars['Int']['input']>;
-  dataSource?: InputMaybe<InstrumentDataSource>;
+  dataSource: DataSource;
   division: Division;
   instruments?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
   offset?: InputMaybe<Scalars['Int']['input']>;
@@ -358,6 +411,21 @@ export type TimeCorrelation = {
   value?: Maybe<Scalars['Float']['output']>;
 };
 
+export enum TimeSpan {
+  Day_1 = 'DAY_1',
+  Day_2 = 'DAY_2',
+  Hour_1 = 'HOUR_1',
+  Hour_12 = 'HOUR_12',
+  Month_1 = 'MONTH_1',
+  Month_3 = 'MONTH_3',
+  Month_6 = 'MONTH_6',
+  Week_1 = 'WEEK_1',
+  Week_2 = 'WEEK_2',
+  Week_3 = 'WEEK_3',
+  Year_1 = 'YEAR_1',
+  Year_5 = 'YEAR_5',
+}
+
 export type TopicalInstrument = {
   __typename?: 'TopicalInstrument';
   assetClass?: Maybe<AssetClassName>;
@@ -460,7 +528,7 @@ export type ResolveInstrumentsWithFiltersQueryVariables = Exact<{
   assetClass?: InputMaybe<
     Array<InputMaybe<AssetClassName>> | InputMaybe<AssetClassName>
   >;
-  dataSource?: InputMaybe<InstrumentDataSource>;
+  dataSource: DataSource;
   instruments?: InputMaybe<
     | Array<InputMaybe<Scalars['String']['input']>>
     | InputMaybe<Scalars['String']['input']>
@@ -530,8 +598,11 @@ export const ResolveInstrumentsWithFiltersDocument = {
             name: { kind: 'Name', value: 'dataSource' },
           },
           type: {
-            kind: 'NamedType',
-            name: { kind: 'Name', value: 'InstrumentDataSource' },
+            kind: 'NonNullType',
+            type: {
+              kind: 'NamedType',
+              name: { kind: 'Name', value: 'DataSource' },
+            },
           },
         },
         {

package/test/Main.test.tsx

@@ -10,11 +10,7 @@ import {
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 
-import {
-  AssetClassName,
-  Division,
-  InstrumentDataSource,
-} from '../src/gql/types/graphql';
+import { AssetClassName, DataSource, Division } from '../src/gql/types/graphql';
 import { Main } from '../src/InstrumentsTableWidget/Main';
 import {
   mockErrorQuery,
@@ -30,7 +26,7 @@ describe('Main component', () => {
         <LiveRatesProvider url="oanda.com">
           <MockLayoutProvider>
             <Main
-              dataSource={InstrumentDataSource.V20}
+              dataSource={DataSource.V20}
               division={Division.Oc}
               instruments={['EUR_USD', 'GBP_USD']}
               recordsPerPage={10}
@@ -55,7 +51,7 @@ describe('Main component', () => {
               isAssetClassFilterEnabled
               isInstrumentSearchEnabled
               assetClasses={[AssetClassName.Etfs, AssetClassName.Currency]}
-              dataSource={InstrumentDataSource.V20}
+              dataSource={DataSource.V20}
               division={Division.Oc}
               instruments={['EUR_USD', 'GBP_USD']}
             />
@@ -75,7 +71,7 @@ describe('Main component', () => {
             <Main
               isAssetClassFilterEnabled
               assetClasses={[AssetClassName.Etfs, AssetClassName.Currency]}
-              dataSource={InstrumentDataSource.V20}
+              dataSource={DataSource.V20}
               division={Division.Oc}
               instruments={['EUR_USD', 'GBP_USD']}
             />
@@ -93,7 +89,7 @@ describe('Main component', () => {
         <LiveRatesProvider url="oanda.com">
           <MockLayoutProvider>
             <Main
-              dataSource={InstrumentDataSource.V20}
+              dataSource={DataSource.V20}
               division={Division.Oc}
               instruments={['EUR_USD', 'GBP_USD']}
             />
@@ -110,7 +106,7 @@ describe('Main component', () => {
         <LiveRatesProvider url="oanda.com">
           <MockLayoutProvider>
             <Main
-              dataSource={InstrumentDataSource.V20}
+              dataSource={DataSource.V20}
               division={Division.Oc}
               instruments={['EUR_USD', 'GBP_USD']}
             />
@@ -128,7 +124,7 @@ describe('Main component', () => {
         <LiveRatesProvider url="oanda.com">
           <MockLayoutProvider>
             <Main
-              dataSource={InstrumentDataSource.V20}
+              dataSource={DataSource.V20}
               division={Division.Oc}
               instruments={['EUR_USD', 'GBP_USD']}
             />
@@ -165,7 +161,7 @@ describe('Main component', () => {
             <Main
               assetClasses={[AssetClassName.Etfs]}
               columns={[DataRecordType.TRADE_MODE, DataRecordType.SYMBOL]}
-              dataSource={InstrumentDataSource.Mt5}
+              dataSource={DataSource.Mt5}
               division={Division.Oel}
             />
           </MockLayoutProvider>

package/test/utils.test.ts

@@ -1,21 +1,21 @@
 import { PriceType } from '../src';
-import { Division, InstrumentDataSource } from '../src/gql/types/graphql';
+import { DataSource, Division } from '../src/gql/types/graphql';
 import { getLiveRatesDivisionCode } from '../src/InstrumentsTableWidget/utils';
 
 describe('getLiveRatesDivisionCode', () => {
   it('should return Division.Oc for PriceType.Raw and InstrumentDataSource.Mt5', () => {
     const division = Division.Oc;
     const priceType = PriceType.Raw;
-    const dataSource = InstrumentDataSource.Mt5;
+    const dataSource = DataSource.Mt5;
     expect(getLiveRatesDivisionCode(division, priceType, dataSource)).toBe(
       Division.Oc
     );
   });
 
-  it('should return "MKTD" for PriceType.Raw and InstrumentDataSource.V20', () => {
+  it('should return "MKTD" for PriceType.Raw and DataSource.V20', () => {
     const division = Division.Oc;
     const priceType = PriceType.Raw;
-    const dataSource = InstrumentDataSource.V20;
+    const dataSource = DataSource.V20;
     expect(getLiveRatesDivisionCode(division, priceType, dataSource)).toBe(
       'MKTD'
     );
@@ -24,7 +24,7 @@ describe('getLiveRatesDivisionCode', () => {
   it('should return the division for PriceType.Division', () => {
     const division = Division.Oc;
     const priceType = PriceType.Division;
-    const dataSource = InstrumentDataSource.Mt5;
+    const dataSource = DataSource.Mt5;
     expect(getLiveRatesDivisionCode(division, priceType, dataSource)).toBe(
       Division.Oc
     );