Simplify code

Author: cezudas

packages/blocks/openops-tables/src/actions/delete-record-action.ts

@@ -5,7 +5,6 @@ import {
   getPrimaryKeyFieldFromFields,
   getRowByPrimaryKeyValue,
   getTableIdByTableName,
-  getTablesServerContext,
   OpenOpsField,
   openopsTablesDropdownProperty,
   resolveTokenProvider,
@@ -30,16 +29,15 @@ export const deleteRecordAction = createAction({
   },
   async run(context) {
     const tableName = context.propsValue.tableName as unknown as string;
-    const tablesServerContext = getTablesServerContext(context.server);
 
     const tableCacheKey = `${context.run.id}-table-${tableName}`;
     const tableId = await cacheWrapper.getOrAdd(
       tableCacheKey,
       getTableIdByTableName,
-      [tableName, tablesServerContext],
+      [tableName, context.server],
     );
 
-    const tokenOrContext = await resolveTokenProvider(tablesServerContext);
+    const tokenOrContext = await resolveTokenProvider(context.server);
 
     const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
     const fields = await cacheWrapper.getOrAdd<

packages/blocks/openops-tables/src/actions/get-records-action.ts

@@ -5,7 +5,6 @@ import {
   getRows,
   getTableFields,
   getTableIdByTableName,
-  getTablesServerContext,
   isSingleValueFilter,
   openopsTablesDropdownProperty,
   resolveTokenProvider,
@@ -117,13 +116,11 @@ export const getRecordsAction = createAction({
   async run(context) {
     const tableName = context.propsValue.tableName as unknown as string;
 
-    const tablesServerContext = getTablesServerContext(context.server);
-
     const tableCacheKey = `${context.run.id}-table-${tableName}`;
     const tableId = await cacheWrapper.getOrAdd(
       tableCacheKey,
       getTableIdByTableName,
-      [tableName, tablesServerContext],
+      [tableName, context.server],
     );
 
     const filtersProps = context.propsValue.filters['filters'] as unknown as {
@@ -145,7 +142,7 @@ export const getRecordsAction = createAction({
     });
     const filterType = context.propsValue.filterType as FilterType;
 
-    const tokenOrContext = await resolveTokenProvider(tablesServerContext);
+    const tokenOrContext = await resolveTokenProvider(context.server);
 
     const rows = await getRows({
       tableId: tableId,

packages/blocks/openops-tables/src/actions/update-record-action.ts

@@ -5,7 +5,6 @@ import {
   getPropertyFromField,
   getTableFields,
   getTableIdByTableName,
-  getTablesServerContext,
   OpenOpsField,
   openopsTablesDropdownProperty,
   resolveTokenProvider,
@@ -137,11 +136,9 @@ export const updateRecordAction = createAction({
       [tableName, context.server],
     );
 
-    const tablesServerContext = getTablesServerContext(context.server);
-
     const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
 
-    const tokenOrContext = await resolveTokenProvider(tablesServerContext);
+    const tokenOrContext = await resolveTokenProvider(context.server);
 
     const tableFields = await cacheWrapper.getOrAdd<
       OpenOpsField[],

packages/blocks/openops-tables/test/actions/delete-record-action.test.ts

@@ -18,10 +18,6 @@ const openopsCommonMock = {
     type: 'DROPDOWN',
   }),
   deleteRow: jest.fn(),
-  getTablesServerContext: jest.fn((server) => ({
-    tablesDatabaseId: server?.tablesDatabaseId,
-    tablesDatabaseToken: server?.tablesDatabaseToken,
-  })),
   resolveTokenProvider: jest.fn(async (serverContext) => {
     return {
       getToken: () => serverContext.tablesDatabaseToken,

packages/blocks/openops-tables/test/actions/get-records-action.test.ts

@@ -24,10 +24,6 @@ const openopsCommonMock = {
       type: 'text',
     },
   ]),
-  getTablesServerContext: jest.fn((server) => ({
-    tablesDatabaseId: server?.tablesDatabaseId,
-    tablesDatabaseToken: server?.tablesDatabaseToken,
-  })),
   resolveTokenProvider: jest.fn(async (serverContext) => {
     return {
       getToken: () => serverContext.tablesDatabaseToken,

packages/blocks/openops-tables/test/actions/get-table-url-action.test.ts

@@ -15,10 +15,6 @@ jest.mock('@openops/server-shared', () => ({
 const openopsCommonMock = {
   ...jest.requireActual('@openops/common'),
   getTableIdByTableName: jest.fn().mockReturnValue(1),
-  getTablesServerContext: jest.fn((server) => ({
-    tablesDatabaseId: server?.tablesDatabaseId,
-    tablesDatabaseToken: server?.tablesDatabaseToken,
-  })),
   openopsTablesDropdownProperty: jest.fn().mockReturnValue({
     required: true,
     defaultValue: false,

packages/blocks/openops-tables/test/actions/update-record-action.test.ts

@@ -14,10 +14,6 @@ const openopsCommonMock = {
   authenticateDefaultUserInOpenOpsTables: jest.fn(),
   getPrimaryKeyFieldFromFields: jest.fn(),
   getTableFields: jest.fn().mockResolvedValue([{}]),
-  getTablesServerContext: jest.fn((server) => ({
-    tablesDatabaseId: server?.tablesDatabaseId,
-    tablesDatabaseToken: server?.tablesDatabaseToken,
-  })),
   resolveTokenProvider: jest.fn(async (serverContext) => {
     return {
       getToken: () => serverContext.tablesDatabaseToken,

packages/openops/src/lib/openops-tables/context-helpers.ts

@@ -12,15 +12,6 @@ export type TablesServerContext = Pick<
   'tablesDatabaseId' | 'tablesDatabaseToken'
 >;
 
-export function getTablesServerContext(
-  serverContext: ServerContext,
-): TablesServerContext {
-  return {
-    tablesDatabaseId: serverContext.tablesDatabaseId,
-    tablesDatabaseToken: serverContext.tablesDatabaseToken,
-  };
-}
-
 export async function resolveTokenProvider(
   serverContext: TablesServerContext,
 ): Promise<TokenOrContext> {

packages/openops/src/lib/openops-tables/create-axios-headers.ts

@@ -22,7 +22,7 @@ function getAuthPrefix(
 }
 
 export const createAxiosHeaders = (
-  contextOrToken: TokenOrContext | string,
+  contextOrToken: TokenOrContext,
 ): AxiosHeaders => {
   const useJwtOverride = typeof contextOrToken === 'string';
   const token = getToken(contextOrToken);