Skip to content

Commit c15c4fe

Browse files
cezudascezudas
committed
Rename leftovers from previous refactor
1 parent 46441ba commit c15c4fe

10 files changed

Lines changed: 39 additions & 37 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ export const deleteRecordAction = createAction({
3737
[tableName, context.server],
3838
);
3939

40-
const tokenOrContext = await resolveTokenProvider(context.server);
40+
const tokenOrResolver = await resolveTokenProvider(context.server);
4141

4242
const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
4343
const fields = await cacheWrapper.getOrAdd<
4444
OpenOpsField[],
4545
[number, TokenOrResolver]
46-
>(fieldsCacheKey, getFields, [tableId, tokenOrContext]);
46+
>(fieldsCacheKey, getFields, [tableId, tokenOrResolver]);
4747

4848
const primaryKeyField = getPrimaryKeyFieldFromFields(fields);
4949
const rowPrimaryKey = getPrimaryKey(context.propsValue.rowPrimaryKey);
5050

5151
const rowToDelete = await getRowByPrimaryKeyValue(
52-
tokenOrContext,
52+
tokenOrResolver,
5353
tableId,
5454
rowPrimaryKey,
5555
primaryKeyField.name,
@@ -62,7 +62,7 @@ export const deleteRecordAction = createAction({
6262
return await deleteRow({
6363
tableId: tableId,
6464
rowId: rowToDelete.id,
65-
tokenOrContext,
65+
tokenOrResolver,
6666
});
6767
},
6868
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ export const getRecordsAction = createAction({
142142
});
143143
const filterType = context.propsValue.filterType as FilterType;
144144

145-
const tokenOrContext = await resolveTokenProvider(context.server);
145+
const tokenOrResolver = await resolveTokenProvider(context.server);
146146

147147
const rows = await getRows({
148148
tableId: tableId,
149-
tokenOrContext,
149+
tokenOrResolver,
150150
filters,
151151
filterType: filterType,
152152
});

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ export const updateRecordAction = createAction({
138138

139139
const fieldsCacheKey = `${context.run.id}-${tableId}-fields`;
140140

141-
const tokenOrContext = await resolveTokenProvider(context.server);
141+
const tokenOrResolver = await resolveTokenProvider(context.server);
142142

143143
const tableFields = await cacheWrapper.getOrAdd<
144144
OpenOpsField[],
145145
[number, TokenOrResolver]
146-
>(fieldsCacheKey, getFields, [tableId, tokenOrContext]);
146+
>(fieldsCacheKey, getFields, [tableId, tokenOrResolver]);
147147

148148
const fieldsToUpdate = mapFieldsToObject(
149149
tableName,
@@ -159,7 +159,7 @@ export const updateRecordAction = createAction({
159159
return await upsertRow({
160160
tableId: tableId,
161161
fields: fieldsToUpdate,
162-
tokenOrContext,
162+
tokenOrResolver,
163163
});
164164
},
165165
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ describe('deleteRecordAction', () => {
227227
expect(openopsCommonMock.deleteRow).toHaveBeenCalledTimes(1);
228228
expect(openopsCommonMock.deleteRow).toHaveBeenCalledWith({
229229
tableId: 1,
230-
tokenOrContext: expect.objectContaining({
230+
tokenOrResolver: expect.objectContaining({
231231
getToken: expect.any(Function),
232232
}),
233233
rowId: 1,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ describe('getRecordsAction test', () => {
153153
expect(openopsCommonMock.getRows).toHaveBeenCalledTimes(1);
154154
expect(openopsCommonMock.getRows).toHaveBeenCalledWith({
155155
tableId: 123,
156-
tokenOrContext: expect.objectContaining({
156+
tokenOrResolver: expect.objectContaining({
157157
getToken: expect.any(Function),
158158
}),
159159
filters: [
@@ -289,7 +289,7 @@ describe('getRecordsAction test', () => {
289289
expect(openopsCommonMock.getRows).toHaveBeenCalledTimes(1);
290290
expect(openopsCommonMock.getRows).toHaveBeenCalledWith({
291291
tableId: 123,
292-
tokenOrContext: expect.objectContaining({
292+
tokenOrResolver: expect.objectContaining({
293293
getToken: expect.any(Function),
294294
}),
295295
filters: [

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('updateRowAction', () => {
3737
beforeEach(() => {
3838
jest.clearAllMocks();
3939
openopsCommonMock.authenticateDefaultUserInOpenOpsTables.mockResolvedValue({
40-
tokenOrContext: expect.objectContaining({
40+
tokenOrResolver: expect.objectContaining({
4141
getToken: expect.any(Function),
4242
}),
4343
});
@@ -159,7 +159,7 @@ describe('updateRowAction', () => {
159159
expect(openopsCommonMock.upsertRow).toHaveBeenCalledTimes(1);
160160
expect(openopsCommonMock.upsertRow).toHaveBeenCalledWith({
161161
tableId: 1,
162-
tokenOrContext: expect.objectContaining({
162+
tokenOrResolver: expect.objectContaining({
163163
getToken: expect.any(Function),
164164
}),
165165
fields: {

‎packages/openops/src/lib/openops-tables/openops-tables-common-properties.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export async function getTableFields(
3737
serverContext: TablesServerContext,
3838
): Promise<OpenOpsField[]> {
3939
const tableId = await getTableIdByTableName(tableName, serverContext);
40-
const tokenOrContext = await resolveTokenProvider(serverContext);
41-
return await getFields(tableId, tokenOrContext, false);
40+
const tokenOrResolver = await resolveTokenProvider(serverContext);
41+
return await getFields(tableId, tokenOrResolver, false);
4242
}
4343

4444
// https://api.baserow.io/api/redoc/#tag/Database-table-fields/operation/get_database_table_field

‎packages/openops/src/lib/openops-tables/rows.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ export interface RowParams {
2626
}
2727

2828
type RowParamsWithTokenOrContext = Omit<RowParams, 'token'> & {
29-
tokenOrContext: TokenOrResolver;
29+
tokenOrResolver: TokenOrResolver;
3030
};
3131

3232
export interface GetRowsParams extends RowParamsWithTokenOrContext {
3333
filters?: { fieldName: string; value: any; type: ViewFilterTypesEnum }[];
3434
filterType?: FilterType;
35-
tokenOrContext: TokenOrResolver;
35+
tokenOrResolver: TokenOrResolver;
3636
}
3737

3838
export interface AddRowParams extends RowParamsWithTokenOrContext {
@@ -107,7 +107,9 @@ export async function getRows(getRowsParams: GetRowsParams) {
107107
const paramsString = params.toString();
108108
const baseUrl = `api/database/rows/table/${getRowsParams.tableId}/`;
109109
const url = paramsString ? baseUrl + `?${paramsString}` : baseUrl;
110-
const authenticationHeader = createAxiosHeaders(getRowsParams.tokenOrContext);
110+
const authenticationHeader = createAxiosHeaders(
111+
getRowsParams.tokenOrResolver,
112+
);
111113

112114
return executeWithConcurrencyLimit(
113115
async () => {
@@ -135,7 +137,7 @@ export async function updateRow(updateRowParams: UpdateRowParams) {
135137
return executeWithConcurrencyLimit(
136138
async () => {
137139
const authenticationHeader = createAxiosHeaders(
138-
updateRowParams.tokenOrContext,
140+
updateRowParams.tokenOrResolver,
139141
);
140142
return await makeOpenOpsTablesPatch(
141143
url,
@@ -159,7 +161,7 @@ export async function upsertRow(upsertRowParams: UpsertRowParams) {
159161
return executeWithConcurrencyLimit(
160162
async () => {
161163
const authenticationHeader = createAxiosHeaders(
162-
upsertRowParams.tokenOrContext,
164+
upsertRowParams.tokenOrResolver,
163165
);
164166
return await makeOpenOpsTablesPut(
165167
url,
@@ -183,7 +185,7 @@ export async function addRow(addRowParams: AddRowParams) {
183185
return executeWithConcurrencyLimit(
184186
async () => {
185187
const authenticationHeader = createAxiosHeaders(
186-
addRowParams.tokenOrContext,
188+
addRowParams.tokenOrResolver,
187189
);
188190
return await makeOpenOpsTablesPost(
189191
url,
@@ -207,7 +209,7 @@ export async function deleteRow(deleteRowParams: DeleteRowParams) {
207209
return executeWithConcurrencyLimit(
208210
async () => {
209211
const authenticationHeader = createAxiosHeaders(
210-
deleteRowParams.tokenOrContext,
212+
deleteRowParams.tokenOrResolver,
211213
);
212214
return await makeOpenOpsTablesDelete(url, authenticationHeader);
213215
},
@@ -221,7 +223,7 @@ export async function deleteRow(deleteRowParams: DeleteRowParams) {
221223
}
222224

223225
export async function getRowByPrimaryKeyValue(
224-
tokenOrContext: TokenOrResolver,
226+
tokenOrResolver: TokenOrResolver,
225227
tableId: number,
226228
primaryKeyFieldValue: string,
227229
primaryKeyFieldName: any,
@@ -236,7 +238,7 @@ export async function getRowByPrimaryKeyValue(
236238
type: getEqualityFilterType(primaryKeyFieldType),
237239
},
238240
],
239-
tokenOrContext,
241+
tokenOrResolver,
240242
});
241243

242244
if (rows.length > 1) {

‎packages/openops/src/lib/openops-tables/tables.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ export async function getTableNames(
5656
async function getAvailableTablesInOpenopsTables(
5757
serverContext: TablesServerContext,
5858
): Promise<OpenOpsTable[]> {
59-
const tokenOrContext = await resolveTokenProvider(serverContext);
59+
const tokenOrResolver = await resolveTokenProvider(serverContext);
6060

61-
const authenticationHeader = createAxiosHeaders(tokenOrContext);
61+
const authenticationHeader = createAxiosHeaders(tokenOrResolver);
6262

6363
const tables = await getTables(
6464
serverContext.tablesDatabaseId,

‎packages/openops/test/openops-tables/rows.test.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('getRows', () => {
7777

7878
const result = await getRows({
7979
tableId: 1,
80-
tokenOrContext: 'token',
80+
tokenOrResolver: 'token',
8181
});
8282

8383
expect(result).toStrictEqual([{ id: 1, order: 1234 }]);
@@ -94,7 +94,7 @@ describe('getRows', () => {
9494

9595
const result = (await getRows({
9696
tableId: 1,
97-
tokenOrContext: 'token',
97+
tokenOrResolver: 'token',
9898
})) as unknown as OpenOpsRow[];
9999

100100
expect(result[0].id).toBe(1);
@@ -116,7 +116,7 @@ describe('getRows', () => {
116116

117117
const result = (await getRows({
118118
tableId: 1,
119-
tokenOrContext: 'token',
119+
tokenOrResolver: 'token',
120120
filters: [
121121
{
122122
fieldName: 'name1',
@@ -155,7 +155,7 @@ describe('getRows', () => {
155155

156156
const result = (await getRows({
157157
tableId: 1,
158-
tokenOrContext: 'token',
158+
tokenOrResolver: 'token',
159159
})) as unknown as OpenOpsRow[];
160160

161161
expect(result).toStrictEqual([
@@ -184,7 +184,7 @@ describe('update row', () => {
184184

185185
const result = await updateRow({
186186
tableId: 1,
187-
tokenOrContext: 'token',
187+
tokenOrResolver: 'token',
188188
rowId: 2,
189189
fields: {
190190
'some field name one': 'value field1',
@@ -204,7 +204,7 @@ describe('update row', () => {
204204

205205
const result = (await updateRow({
206206
tableId: 1,
207-
tokenOrContext: 'token',
207+
tokenOrResolver: 'token',
208208
rowId: 2,
209209
fields: {
210210
'some field name one': 'value field1',
@@ -236,7 +236,7 @@ describe('add row', () => {
236236

237237
const result = await addRow({
238238
tableId: 1,
239-
tokenOrContext: 'token',
239+
tokenOrResolver: 'token',
240240
fields: {
241241
'some field name one': 'value field1',
242242
'some field name two': 2,
@@ -255,7 +255,7 @@ describe('add row', () => {
255255

256256
const result = (await addRow({
257257
tableId: 1,
258-
tokenOrContext: 'token',
258+
tokenOrResolver: 'token',
259259
fields: {
260260
'some field name one': 'value field1',
261261
'some field name two': 2,
@@ -286,7 +286,7 @@ describe('delete row', () => {
286286

287287
const result = await deleteRow({
288288
tableId: 1,
289-
tokenOrContext: 'token',
289+
tokenOrResolver: 'token',
290290
rowId: 2,
291291
});
292292

@@ -302,7 +302,7 @@ describe('delete row', () => {
302302

303303
const result = (await deleteRow({
304304
tableId: 1,
305-
tokenOrContext: 'token',
305+
tokenOrResolver: 'token',
306306
rowId: 2,
307307
})) as any;
308308

0 commit comments

Comments
 (0)