@oanda/labs-instruments-table-widget 1.0.26 → 1.0.28

package/dist/module/translations/sources/en.json

@@ -3,6 +3,7 @@
   "asset_class": "Asset class",
   "bond": "Bond",
   "buy": "Buy",
+  "close_only": "Close only",
   "commodity": "Commodity",
   "crypto": "Crypto",
   "currency": "Currency",
@@ -12,12 +13,17 @@
   "index": "Index",
   "instrument": "Instrument",
   "instrument_name": "Instrument name",
+  "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",
   "spread": "Spread",
-  "today_high": "Today High",
-  "today_low": "Today Low"
+  "symbol": "Symbol",
+  "today_high": "Today high",
+  "today_low": "Today low",
+  "trade_mode": "Trade mode",
+  "last_updated": "Last updated"
 }

package/dist/types/InstrumentsTableWidget/Main.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { MainProps } from './types';
-declare const Main: ({ instruments, division, assetClasses, columns, isAssetClassFilterEnabled, isInstrumentSearchEnabled, recordsPerPage, dataSource, }: MainProps) => React.JSX.Element;
+declare const Main: ({ instruments, division, assetClasses, columns, isAssetClassFilterEnabled, isInstrumentSearchEnabled, recordsPerPage, dataSource, isLiveRatesDisabled, }: MainProps) => React.JSX.Element;
 export { Main };

package/dist/types/InstrumentsTableWidget/config.d.ts

@@ -1,11 +1,11 @@
-import type { HeaderColumns } from '@oanda/labs-widget-common';
-import { DataRecordType } from '@oanda/labs-widget-common';
+import type { HeaderConfigType } from '@oanda/labs-widget-common';
+import { TradeMode } from '../gql/types/graphql';
 import type { AssetClassLabels } from './components/Filters/types';
-type HeaderRecordType = DataRecordType.INSTRUMENT | DataRecordType.SELL | DataRecordType.BUY | DataRecordType.DAILY_CHANGE | DataRecordType.SPREAD | DataRecordType.HIGH | DataRecordType.LOW;
-declare const headerConfig: Record<HeaderRecordType, {
-    displayName: string;
-    additionalStyles: string;
-}>;
+declare const tradeModeLabels: Record<TradeMode.TradeLongonly | TradeMode.TradeShortonly | TradeMode.TradeCloseonly, string>;
+declare const headerConfigs: {
+    normal: HeaderConfigType;
+    longInstruments: HeaderConfigType;
+    mobile: HeaderConfigType;
+};
 declare const assetClassLabels: Record<AssetClassLabels, string>;
-declare const getHeaderConfig: (activeColumns: DataRecordType[]) => HeaderColumns[];
-export { assetClassLabels, getHeaderConfig, headerConfig };
+export { assetClassLabels, headerConfigs, tradeModeLabels };

package/dist/types/InstrumentsTableWidget/types.d.ts

@@ -25,4 +25,5 @@ export interface MainProps {
     isInstrumentSearchEnabled?: boolean;
     recordsPerPage?: number;
     dataSource: InstrumentDataSource;
+    isLiveRatesDisabled?: boolean;
 }

package/dist/types/gql/types/gql.d.ts

@@ -11,14 +11,16 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
  * Therefore it is highly recommended to use the babel or swc plugin for production.
  */
 declare const documents: {
-    '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $count: Int\n    $offset: Int\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n    ) {\n      instruments {\n        name\n        displayName\n      }\n      totalCount\n    }\n  }\n': DocumentNode<types.ResolveInstrumentsWithFiltersQuery, types.Exact<{
+    '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $tradeModes: [TradeMode]\n    $count: Int\n    $offset: Int\n    $withTradingModes: Boolean!\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n      tradeModes: $tradeModes\n    ) {\n      instruments {\n        name\n        displayName\n        tradeMode @include(if: $withTradingModes)\n      }\n      totalCount\n      updatedAt @include(if: $withTradingModes)\n    }\n  }\n': DocumentNode<types.ResolveInstrumentsWithFiltersQuery, types.Exact<{
         division: types.Division;
         assetClass?: types.InputMaybe<Array<types.InputMaybe<types.AssetClassName>> | types.InputMaybe<types.AssetClassName>>;
         dataSource?: types.InputMaybe<types.InstrumentDataSource>;
         instruments?: types.InputMaybe<Array<types.InputMaybe<types.Scalars["String"]["input"]>> | types.InputMaybe<types.Scalars["String"]["input"]>>;
         searchPattern?: types.InputMaybe<types.Scalars["String"]["input"]>;
+        tradeModes?: types.InputMaybe<Array<types.InputMaybe<types.TradeMode>> | types.InputMaybe<types.TradeMode>>;
         count?: types.InputMaybe<types.Scalars["Int"]["input"]>;
         offset?: types.InputMaybe<types.Scalars["Int"]["input"]>;
+        withTradingModes: types.Scalars["Boolean"]["input"];
     }>>;
 };
 /**
@@ -37,6 +39,6 @@ export declare function graphql(source: string): unknown;
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export declare function graphql(source: '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $count: Int\n    $offset: Int\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n    ) {\n      instruments {\n        name\n        displayName\n      }\n      totalCount\n    }\n  }\n'): (typeof documents)['\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $count: Int\n    $offset: Int\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n    ) {\n      instruments {\n        name\n        displayName\n      }\n      totalCount\n    }\n  }\n'];
+export declare function graphql(source: '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $tradeModes: [TradeMode]\n    $count: Int\n    $offset: Int\n    $withTradingModes: Boolean!\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n      tradeModes: $tradeModes\n    ) {\n      instruments {\n        name\n        displayName\n        tradeMode @include(if: $withTradingModes)\n      }\n      totalCount\n      updatedAt @include(if: $withTradingModes)\n    }\n  }\n'): (typeof documents)['\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $tradeModes: [TradeMode]\n    $count: Int\n    $offset: Int\n    $withTradingModes: Boolean!\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n      tradeModes: $tradeModes\n    ) {\n      instruments {\n        name\n        displayName\n        tradeMode @include(if: $withTradingModes)\n      }\n      totalCount\n      updatedAt @include(if: $withTradingModes)\n    }\n  }\n'];
 export type DocumentType<TDocumentNode extends DocumentNode<any, any>> = TDocumentNode extends DocumentNode<infer TType, any> ? TType : never;
 export {};

package/dist/types/gql/types/graphql.d.ts

@@ -134,6 +134,12 @@ export declare enum Division {
     Opt = "OPT",
     Otms = "OTMS"
 }
+export type ExtendedInstrument = {
+    __typename?: 'ExtendedInstrument';
+    displayName: Scalars['String']['output'];
+    name: Scalars['String']['output'];
+    tradeMode: TradeMode;
+};
 export type Heatmap = {
     __typename?: 'Heatmap';
     instrument: Instrument;
@@ -155,8 +161,9 @@ export declare enum InstrumentDataSource {
 }
 export type InstrumentTableResult = {
     __typename?: 'InstrumentTableResult';
-    instruments: Array<Instrument>;
+    instruments: Array<ExtendedInstrument>;
     totalCount: Scalars['Int']['output'];
+    updatedAt: Scalars['String']['output'];
 };
 export type Matrix = {
     __typename?: 'Matrix';
@@ -243,6 +250,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 = {
     division?: InputMaybe<Division>;
@@ -337,6 +345,14 @@ export declare enum TopicalSort {
     Popular = "POPULAR",
     Volatile = "VOLATILE"
 }
+export declare enum TradeMode {
+    TradeCloseonly = "TRADE_CLOSEONLY",
+    TradeDisabled = "TRADE_DISABLED",
+    TradeFull = "TRADE_FULL",
+    TradeLongonly = "TRADE_LONGONLY",
+    TradeShortonly = "TRADE_SHORTONLY",
+    TradeUndefined = "TRADE_UNDEFINED"
+}
 export declare enum ValueAtRiskBars {
     C100 = "C100",
     C200 = "C200",
@@ -400,18 +416,22 @@ export type ResolveInstrumentsWithFiltersQueryVariables = Exact<{
     dataSource?: InputMaybe<InstrumentDataSource>;
     instruments?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>> | 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 = {
     __typename?: 'Query';
     resolveInstrumentsWithFilters?: {
         __typename?: 'InstrumentTableResult';
         totalCount: number;
+        updatedAt?: string;
         instruments: Array<{
-            __typename?: 'Instrument';
+            __typename?: 'ExtendedInstrument';
             name: string;
             displayName: string;
+            tradeMode?: TradeMode;
         }>;
     } | null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oanda/labs-instruments-table-widget",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "Labs Instruments Table Widget",
   "main": "dist/main/index.js",
   "module": "dist/module/index.js",
@@ -12,7 +12,7 @@
   "author": "OANDA",
   "license": "UNLICENSED",
   "dependencies": {
-    "@oanda/labs-widget-common": "^1.0.206",
+    "@oanda/labs-widget-common": "^1.0.208",
     "@oanda/mono-i18n": "10.0.1",
     "graphql": "16.8.1"
   },
@@ -20,5 +20,5 @@
     "@graphql-codegen/cli": "5.0.0",
     "@graphql-codegen/client-preset": "4.1.0"
   },
-  "gitHead": "8e9089b3a4cc94275dd2223e7fed7aae070fe454"
+  "gitHead": "5ac438aecc3ec1cc9e02e6c68e7cf3bf1e6eadd4"
 }

package/src/InstrumentsTableWidget/InstrumentsTableWidget.tsx

@@ -1,5 +1,9 @@
 import { ApolloClient, InMemoryCache } from '@apollo/client';
-import { WidgetProvider, WidgetWrapper } from '@oanda/labs-widget-common';
+import {
+  DataRecordType,
+  WidgetProvider,
+  WidgetWrapper,
+} from '@oanda/labs-widget-common';
 import React from 'react';
 
 import { translations } from '../translations';
@@ -35,13 +39,27 @@ const InstrumentsTableWidget = ({
     dataSource
   );
 
+  const liveRates =
+    !columns ||
+    columns?.some(
+      (column) =>
+        column === DataRecordType.BUY ||
+        column === DataRecordType.SELL ||
+        column === DataRecordType.DAILY_CHANGE ||
+        column === DataRecordType.SPREAD ||
+        column === DataRecordType.HIGH ||
+        column === DataRecordType.LOW
+    )
+      ? {
+          url: liveRatesUrl,
+          options: { divisionCode, dataSource },
+        }
+      : undefined;
+
   return (
     <WidgetProvider
       client={client}
-      liveRates={{
-        url: liveRatesUrl,
-        options: { divisionCode, dataSource },
-      }}
+      liveRates={liveRates}
       locale={locale}
       theme={theme}
       translations={translations}
@@ -59,6 +77,7 @@ const InstrumentsTableWidget = ({
           instruments={instruments}
           isAssetClassFilterEnabled={isAssetClassFilterEnabled}
           isInstrumentSearchEnabled={isInstrumentSearchEnabled}
+          isLiveRatesDisabled={liveRates === undefined}
           recordsPerPage={recordsPerPage}
         />
       </WidgetWrapper>

package/src/InstrumentsTableWidget/Main.tsx

@@ -1,8 +1,13 @@
 import { useQuery } from '@apollo/client';
 import type { DataRecord } from '@oanda/labs-widget-common';
 import {
+  DataRecordType,
+  getHeaderConfig,
+  LastUpdated,
   Pagination,
+  Size,
   TableWidget,
+  useLayoutProvider,
   useLiveRatesQuery,
 } from '@oanda/labs-widget-common';
 import { useLocale } from '@oanda/mono-i18n';
@@ -14,9 +19,10 @@ import type { AssetClassName } from '../gql/types/graphql';
 import {
   type ResolveInstrumentsWithFiltersQuery,
   type ResolveInstrumentsWithFiltersQueryVariables,
+  TradeMode,
 } from '../gql/types/graphql';
 import { Filters } from './components';
-import { assetClassLabels, getHeaderConfig } from './config';
+import { assetClassLabels, headerConfigs, tradeModeLabels } from './config';
 import { DEFAULT_COLUMNS, INSTRUMENT_TOOLTIP_ID } from './constant';
 import type { MainProps } from './types';
 
@@ -27,15 +33,23 @@ const Main = ({
   columns = DEFAULT_COLUMNS,
   isAssetClassFilterEnabled,
   isInstrumentSearchEnabled,
-  recordsPerPage = 10,
+  recordsPerPage,
   dataSource,
+  isLiveRatesDisabled,
 }: MainProps) => {
   const documentRef = useRef<Document>(document);
+  const { size } = useLayoutProvider();
+  const isDesktop = size === Size.DESKTOP;
+  const isTradingMode =
+    columns.includes(DataRecordType.TRADE_MODE) &&
+    columns.includes(DataRecordType.SYMBOL);
+
   const { lang } = useLocale();
-  const { target, setQuery, closeQuery } = useLiveRatesQuery();
+  const { target, setQuery, closeQuery } =
+    useLiveRatesQuery(isLiveRatesDisabled);
 
   const [records, setRecords] = useState<DataRecord[]>(
-    new Array(recordsPerPage).fill({})
+    new Array(recordsPerPage || 10).fill({})
   );
 
   const [totalRecords, setTotalRecords] = useState<number>(0);
@@ -49,10 +63,18 @@ const Main = ({
       assetClass: assetClasses || [],
       instruments,
       dataSource,
+      withTradingModes: isTradingMode,
+      tradeModes: isTradingMode
+        ? [
+            TradeMode.TradeLongonly,
+            TradeMode.TradeShortonly,
+            TradeMode.TradeCloseonly,
+          ]
+        : undefined,
     });
 
   const pageNumber = queryVariables.offset
-    ? Math.floor(queryVariables.offset / recordsPerPage)
+    ? Math.floor(queryVariables.offset / (recordsPerPage || 1))
     : 0;
 
   const { data, error, loading } = useQuery<
@@ -73,6 +95,11 @@ const Main = ({
         (record) => ({
           instrument: record?.name || '',
           displayName: record?.displayName || '',
+          tradeMode: lang(
+            tradeModeLabels[
+              (record?.tradeMode as keyof typeof tradeModeLabels) || ''
+            ]
+          ),
         })
       );
       setRecords(newRecords);
@@ -105,11 +132,17 @@ const Main = ({
 
   useEventListener('visibilitychange', onVisibilityChange, documentRef);
 
+  const headerConfig = !isDesktop
+    ? headerConfigs.mobile
+    : columns.length < 4
+      ? headerConfigs.longInstruments
+      : headerConfigs.normal;
+
   return (
     <>
       <TableWidget
         PaginationComponent={
-          records.length > 0 ? (
+          records.length > 0 && recordsPerPage ? (
             <Pagination
               currentPage={pageNumber}
               disabled={loading}
@@ -167,7 +200,10 @@ const Main = ({
         activeColumns={columns}
         count={totalRecords}
         hasError={showError}
-        headerColumns={getHeaderConfig(columns)}
+        headerColumns={getHeaderConfig(columns, headerConfig)}
+        instrumentColumnWidth={
+          headerConfig.instrument?.additionalStyles.minWidth
+        }
         isLoading={loading}
         pageNumber={pageNumber}
         records={records}
@@ -176,6 +212,14 @@ const Main = ({
         toolTipId={INSTRUMENT_TOOLTIP_ID}
         viewType="table"
       />
+      {!loading && !showError && isTradingMode && (
+        <div className="lw-mt-2 lw-h-8">
+          <LastUpdated
+            labelCallback={lang}
+            timestamp={data?.resolveInstrumentsWithFilters?.updatedAt}
+          />
+        </div>
+      )}
     </>
   );
 };

package/src/InstrumentsTableWidget/config.ts

@@ -1,52 +1,114 @@
-import type { HeaderColumns } from '@oanda/labs-widget-common';
+import type { HeaderConfigType } from '@oanda/labs-widget-common';
 import { DataRecordType } from '@oanda/labs-widget-common';
 
-import { AssetClassName } from '../gql/types/graphql';
+import { AssetClassName, TradeMode } from '../gql/types/graphql';
 import type { AssetClassLabels } from './components/Filters/types';
 
-type HeaderRecordType =
-  | DataRecordType.INSTRUMENT
-  | DataRecordType.SELL
-  | DataRecordType.BUY
-  | DataRecordType.DAILY_CHANGE
-  | DataRecordType.SPREAD
-  | DataRecordType.HIGH
-  | DataRecordType.LOW;
-
-const headerConfig: Record<
-  HeaderRecordType,
-  { displayName: string; additionalStyles: string }
+const tradeModeLabels: Record<
+  TradeMode.TradeLongonly | TradeMode.TradeShortonly | TradeMode.TradeCloseonly,
+  string
 > = {
+  [TradeMode.TradeLongonly]: 'long_only',
+  [TradeMode.TradeShortonly]: 'short_only',
+  [TradeMode.TradeCloseonly]: 'close_only',
+};
+const normal: HeaderConfigType = {
   [DataRecordType.INSTRUMENT]: {
     displayName: 'instrument',
-    additionalStyles: 'lw-text-left lw-min-w-[130px]',
+    additionalStyles: {
+      align: 'left',
+      minWidth: '200px',
+    },
   },
   [DataRecordType.SELL]: {
     displayName: 'sell',
-    additionalStyles: 'lw-text-right lw-min-w-[75px] lw-pr-4',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '75px',
+      paddingRight: true,
+    },
   },
   [DataRecordType.BUY]: {
     displayName: 'buy',
-    additionalStyles: 'lw-text-right lw-min-w-[75px] lw-pr-4',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '75px',
+      paddingRight: true,
+    },
   },
   [DataRecordType.SPREAD]: {
     displayName: 'spread',
-    additionalStyles: 'lw-text-right lw-min-w-[50px]',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '50px',
+    },
   },
   [DataRecordType.DAILY_CHANGE]: {
     displayName: 'daily_percent_change',
-    additionalStyles: 'lw-text-right lw-min-w-[80px]',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '80px',
+    },
   },
   [DataRecordType.HIGH]: {
     displayName: 'today_high',
-    additionalStyles: 'lw-text-right lw-min-w-[80px]',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '80px',
+    },
   },
   [DataRecordType.LOW]: {
     displayName: 'today_low',
-    additionalStyles: 'lw-text-right lw-min-w-[80px]',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '80px',
+    },
+  },
+  [DataRecordType.TRADE_MODE]: {
+    displayName: 'trade_mode',
+    additionalStyles: {
+      align: 'right',
+      minWidth: '80px',
+      paddingRight: true,
+    },
+  },
+  [DataRecordType.SYMBOL]: {
+    displayName: 'symbol',
+    additionalStyles: {
+      align: 'center',
+      minWidth: '80px',
+    },
+  },
+};
+
+const longInstruments: HeaderConfigType = {
+  ...normal,
+  [DataRecordType.INSTRUMENT]: {
+    displayName: 'instrument',
+    additionalStyles: {
+      align: 'left',
+      minWidth: '250px',
+    },
   },
 };
 
+const mobile: HeaderConfigType = {
+  ...normal,
+  [DataRecordType.INSTRUMENT]: {
+    displayName: 'instrument',
+    additionalStyles: {
+      align: 'left',
+      minWidth: '150px',
+    },
+  },
+};
+
+const headerConfigs = {
+  normal,
+  longInstruments,
+  mobile,
+};
+
 const assetClassLabels: Record<AssetClassLabels, string> = {
   ALL: 'all',
   [AssetClassName.Currency]: 'currency',
@@ -58,15 +120,4 @@ const assetClassLabels: Record<AssetClassLabels, string> = {
   [AssetClassName.Indices]: 'index',
 };
 
-const getHeaderConfig = (activeColumns: DataRecordType[]): HeaderColumns[] => {
-  const columns: HeaderRecordType[] = [
-    DataRecordType.INSTRUMENT,
-    ...activeColumns,
-  ].filter(
-    (item): item is HeaderRecordType => item !== DataRecordType.SENTIMENT
-  );
-
-  return columns.map((item) => headerConfig[item]);
-};
-
-export { assetClassLabels, getHeaderConfig, headerConfig };
+export { assetClassLabels, headerConfigs, tradeModeLabels };

package/src/InstrumentsTableWidget/types.ts

@@ -33,4 +33,5 @@ export interface MainProps {
   isInstrumentSearchEnabled?: boolean;
   recordsPerPage?: number;
   dataSource: InstrumentDataSource;
+  isLiveRatesDisabled?: boolean;
 }

package/src/gql/resolveInstrumentsWithFilters.ts

@@ -7,8 +7,10 @@ export const resolveInstrumentsWithFilters = gql`
     $dataSource: InstrumentDataSource
     $instruments: [String]
     $searchPattern: String
+    $tradeModes: [TradeMode]
     $count: Int
     $offset: Int
+    $withTradingModes: Boolean!
   ) {
     resolveInstrumentsWithFilters(
       division: $division
@@ -18,12 +20,15 @@ export const resolveInstrumentsWithFilters = gql`
       searchPattern: $searchPattern
       count: $count
       offset: $offset
+      tradeModes: $tradeModes
     ) {
       instruments {
         name
         displayName
+        tradeMode @include(if: $withTradingModes)
       }
       totalCount
+      updatedAt @include(if: $withTradingModes)
     }
   }
 `;

package/src/gql/types/gql.ts

@@ -13,7 +13,7 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
  * Therefore it is highly recommended to use the babel or swc plugin for production.
  */
 const documents = {
-  '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $count: Int\n    $offset: Int\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n    ) {\n      instruments {\n        name\n        displayName\n      }\n      totalCount\n    }\n  }\n':
+  '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $tradeModes: [TradeMode]\n    $count: Int\n    $offset: Int\n    $withTradingModes: Boolean!\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n      tradeModes: $tradeModes\n    ) {\n      instruments {\n        name\n        displayName\n        tradeMode @include(if: $withTradingModes)\n      }\n      totalCount\n      updatedAt @include(if: $withTradingModes)\n    }\n  }\n':
     types.ResolveInstrumentsWithFiltersDocument,
 };
 
@@ -35,8 +35,8 @@ export function graphql(source: string): unknown;
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(
-  source: '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $count: Int\n    $offset: Int\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n    ) {\n      instruments {\n        name\n        displayName\n      }\n      totalCount\n    }\n  }\n'
-): (typeof documents)['\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $count: Int\n    $offset: Int\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n    ) {\n      instruments {\n        name\n        displayName\n      }\n      totalCount\n    }\n  }\n'];
+  source: '\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $tradeModes: [TradeMode]\n    $count: Int\n    $offset: Int\n    $withTradingModes: Boolean!\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n      tradeModes: $tradeModes\n    ) {\n      instruments {\n        name\n        displayName\n        tradeMode @include(if: $withTradingModes)\n      }\n      totalCount\n      updatedAt @include(if: $withTradingModes)\n    }\n  }\n'
+): (typeof documents)['\n  query resolveInstrumentsWithFilters(\n    $division: Division!\n    $assetClass: [AssetClassName]\n    $dataSource: InstrumentDataSource\n    $instruments: [String]\n    $searchPattern: String\n    $tradeModes: [TradeMode]\n    $count: Int\n    $offset: Int\n    $withTradingModes: Boolean!\n  ) {\n    resolveInstrumentsWithFilters(\n      division: $division\n      assetClass: $assetClass\n      dataSource: $dataSource\n      instruments: $instruments\n      searchPattern: $searchPattern\n      count: $count\n      offset: $offset\n      tradeModes: $tradeModes\n    ) {\n      instruments {\n        name\n        displayName\n        tradeMode @include(if: $withTradingModes)\n      }\n      totalCount\n      updatedAt @include(if: $withTradingModes)\n    }\n  }\n'];
 
 export function graphql(source: string) {
   return (documents as any)[source] ?? {};