@oanda/labs-instruments-table-widget 1.0.27 → 1.0.29

package/src/gql/types/graphql.ts

@@ -133,6 +133,13 @@ export enum Division {
   Otms = 'OTMS',
 }
 
+export type ExtendedInstrument = {
+  __typename?: 'ExtendedInstrument';
+  displayName: Scalars['String']['output'];
+  name: Scalars['String']['output'];
+  tradeMode: TradeMode;
+};
+
 export type Heatmap = {
   __typename?: 'Heatmap';
   instrument: Instrument;
@@ -158,8 +165,9 @@ export enum InstrumentDataSource {
 
 export type InstrumentTableResult = {
   __typename?: 'InstrumentTableResult';
-  instruments: Array<Instrument>;
+  instruments: Array<ExtendedInstrument>;
   totalCount: Scalars['Int']['output'];
+  updatedAt: Scalars['String']['output'];
 };
 
 export type Matrix = {
@@ -259,6 +267,7 @@ export type QueryResolveInstrumentsWithFiltersArgs = {
   instruments?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
   offset?: InputMaybe<Scalars['Int']['input']>;
   searchPattern?: InputMaybe<Scalars['String']['input']>;
+  tradeModes?: InputMaybe<Array<InputMaybe<TradeMode>>>;
 };
 
 export type QuerySentimentArgs = {
@@ -372,6 +381,15 @@ export enum TopicalSort {
   Volatile = 'VOLATILE',
 }
 
+export enum TradeMode {
+  TradeCloseonly = 'TRADE_CLOSEONLY',
+  TradeDisabled = 'TRADE_DISABLED',
+  TradeFull = 'TRADE_FULL',
+  TradeLongonly = 'TRADE_LONGONLY',
+  TradeShortonly = 'TRADE_SHORTONLY',
+  TradeUndefined = 'TRADE_UNDEFINED',
+}
+
 export enum ValueAtRiskBars {
   C100 = 'C100',
   C200 = 'C200',
@@ -448,8 +466,10 @@ export type ResolveInstrumentsWithFiltersQueryVariables = Exact<{
     | InputMaybe<Scalars['String']['input']>
   >;
   searchPattern?: InputMaybe<Scalars['String']['input']>;
+  tradeModes?: InputMaybe<Array<InputMaybe<TradeMode>> | InputMaybe<TradeMode>>;
   count?: InputMaybe<Scalars['Int']['input']>;
   offset?: InputMaybe<Scalars['Int']['input']>;
+  withTradingModes: Scalars['Boolean']['input'];
 }>;
 
 export type ResolveInstrumentsWithFiltersQuery = {
@@ -457,10 +477,12 @@ export type ResolveInstrumentsWithFiltersQuery = {
   resolveInstrumentsWithFilters?: {
     __typename?: 'InstrumentTableResult';
     totalCount: number;
+    updatedAt?: string;
     instruments: Array<{
-      __typename?: 'Instrument';
+      __typename?: 'ExtendedInstrument';
       name: string;
       displayName: string;
+      tradeMode?: TradeMode;
     }>;
   } | null;
 };
@@ -534,6 +556,20 @@ export const ResolveInstrumentsWithFiltersDocument = {
           },
           type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } },
         },
+        {
+          kind: 'VariableDefinition',
+          variable: {
+            kind: 'Variable',
+            name: { kind: 'Name', value: 'tradeModes' },
+          },
+          type: {
+            kind: 'ListType',
+            type: {
+              kind: 'NamedType',
+              name: { kind: 'Name', value: 'TradeMode' },
+            },
+          },
+        },
         {
           kind: 'VariableDefinition',
           variable: {
@@ -550,6 +586,20 @@ export const ResolveInstrumentsWithFiltersDocument = {
           },
           type: { kind: 'NamedType', name: { kind: 'Name', value: 'Int' } },
         },
+        {
+          kind: 'VariableDefinition',
+          variable: {
+            kind: 'Variable',
+            name: { kind: 'Name', value: 'withTradingModes' },
+          },
+          type: {
+            kind: 'NonNullType',
+            type: {
+              kind: 'NamedType',
+              name: { kind: 'Name', value: 'Boolean' },
+            },
+          },
+        },
       ],
       selectionSet: {
         kind: 'SelectionSet',
@@ -614,6 +664,14 @@ export const ResolveInstrumentsWithFiltersDocument = {
                   name: { kind: 'Name', value: 'offset' },
                 },
               },
+              {
+                kind: 'Argument',
+                name: { kind: 'Name', value: 'tradeModes' },
+                value: {
+                  kind: 'Variable',
+                  name: { kind: 'Name', value: 'tradeModes' },
+                },
+              },
             ],
             selectionSet: {
               kind: 'SelectionSet',
@@ -629,10 +687,53 @@ export const ResolveInstrumentsWithFiltersDocument = {
                         kind: 'Field',
                         name: { kind: 'Name', value: 'displayName' },
                       },
+                      {
+                        kind: 'Field',
+                        name: { kind: 'Name', value: 'tradeMode' },
+                        directives: [
+                          {
+                            kind: 'Directive',
+                            name: { kind: 'Name', value: 'include' },
+                            arguments: [
+                              {
+                                kind: 'Argument',
+                                name: { kind: 'Name', value: 'if' },
+                                value: {
+                                  kind: 'Variable',
+                                  name: {
+                                    kind: 'Name',
+                                    value: 'withTradingModes',
+                                  },
+                                },
+                              },
+                            ],
+                          },
+                        ],
+                      },
                     ],
                   },
                 },
                 { kind: 'Field', name: { kind: 'Name', value: 'totalCount' } },
+                {
+                  kind: 'Field',
+                  name: { kind: 'Name', value: 'updatedAt' },
+                  directives: [
+                    {
+                      kind: 'Directive',
+                      name: { kind: 'Name', value: 'include' },
+                      arguments: [
+                        {
+                          kind: 'Argument',
+                          name: { kind: 'Name', value: 'if' },
+                          value: {
+                            kind: 'Variable',
+                            name: { kind: 'Name', value: 'withTradingModes' },
+                          },
+                        },
+                      ],
+                    },
+                  ],
+                },
               ],
             },
           },

package/src/translations/sources/en.json

@@ -3,7 +3,7 @@
   "asset_class": "Asset class",
   "bond": "Bond",
   "buy": "Buy",
-  "close_only": "Close Only",
+  "close_only": "Close only",
   "commodity": "Commodity",
   "crypto": "Crypto",
   "currency": "Currency",
@@ -13,16 +13,17 @@
   "index": "Index",
   "instrument": "Instrument",
   "instrument_name": "Instrument name",
-  "long_only": "Long Only",
+  "long_only": "Long only",
   "no_matching_results": "No matching results",
   "pagination_entries_range": "{{firstItemOnPage}}-{{lastItemOnPage}} of {{itemCount}} entries",
   "search": "Search",
   "sell": "Sell",
   "share_cfds": "Share CFDs",
-  "short_only": "Short Only",
+  "short_only": "Short only",
   "spread": "Spread",
   "symbol": "Symbol",
-  "today_high": "Today High",
-  "today_low": "Today Low",
-  "trade_mode": "Trade Mode"
+  "today_high": "Today high",
+  "today_low": "Today low",
+  "trade_mode": "Trade mode",
+  "last_updated": "Last updated"
 }

package/test/Main.test.tsx

@@ -3,6 +3,7 @@
  */
 import { MockedProvider } from '@apollo/client/testing';
 import {
+  DataRecordType,
   LiveRatesProvider,
   MockLayoutProvider,
 } from '@oanda/labs-widget-common';
@@ -18,6 +19,7 @@ import { Main } from '../src/InstrumentsTableWidget/Main';
 import {
   mockErrorQuery,
   mockInitialQuery,
+  mockTradingModeQuery,
   mockWithAssetClasses,
 } from './mocks';
 
@@ -154,4 +156,24 @@ describe('Main component', () => {
       expect(table).toBeInTheDocument();
     });
   });
+
+  it('should show last updated label for trading mode', async () => {
+    const { findByTestId } = render(
+      <MockedProvider mocks={[mockTradingModeQuery]}>
+        <LiveRatesProvider url="oanda.com">
+          <MockLayoutProvider>
+            <Main
+              assetClasses={[AssetClassName.Etfs]}
+              columns={[DataRecordType.TRADE_MODE, DataRecordType.SYMBOL]}
+              dataSource={InstrumentDataSource.Mt5}
+              division={Division.Oel}
+            />
+          </MockLayoutProvider>
+        </LiveRatesProvider>
+      </MockedProvider>
+    );
+
+    const label = await findByTestId('last-updated');
+    expect(label).toBeInTheDocument();
+  });
 });

package/test/mocks.ts

@@ -20,6 +20,8 @@ const baseQueryVariables = {
   searchPattern: '',
   count: 10,
   offset: 0,
+  withTradingModes: false,
+  tradeModes: undefined,
 };
 
 const mockErrorQuery = {
@@ -33,6 +35,51 @@ const mockErrorQuery = {
   error: new Error('An error occurred'),
 };
 
+const mockTradingModeQuery = {
+  request: {
+    query: resolveInstrumentsWithFilters,
+    variables: {
+      ...baseQueryVariables,
+      count: undefined,
+      instruments: [],
+      division: 'OEL',
+      assetClass: ['ETFS'],
+      dataSource: 'MT5',
+      tradeModes: ['TRADE_LONGONLY', 'TRADE_SHORTONLY', 'TRADE_CLOSEONLY'],
+      withTradingModes: true,
+    },
+  },
+  result: {
+    data: {
+      resolveInstrumentsWithFilters: {
+        instruments: [
+          {
+            name: 'VXXB_CFD.ETF',
+            displayName: 'IPATH SERIES B S&P 500 VIX',
+            tradeMode: 'TRADE_LONGONLY',
+            __typename: 'ExtendedInstrument',
+          },
+          {
+            name: 'SSO_CFD.ETF',
+            displayName: 'PROSHARES ULTRA S&P500',
+            tradeMode: 'TRADE_LONGONLY',
+            __typename: 'ExtendedInstrument',
+          },
+          {
+            name: 'TBT_CFD.ETF',
+            displayName: 'PROSHARES ULTRASHORT 20+Y TR',
+            tradeMode: 'TRADE_LONGONLY',
+            __typename: 'ExtendedInstrument',
+          },
+        ],
+        totalCount: 3,
+        updatedAt: '2025-07-24T08:28:03.546282088Z',
+        __typename: 'InstrumentTableResult',
+      },
+    },
+  },
+};
+
 const mockInitialQuery = {
   request: {
     query: resolveInstrumentsWithFilters,
@@ -71,4 +118,9 @@ const mockWithAssetClasses = {
   },
 };
 
-export { mockErrorQuery, mockInitialQuery, mockWithAssetClasses };
+export {
+  mockErrorQuery,
+  mockInitialQuery,
+  mockTradingModeQuery,
+  mockWithAssetClasses,
+};