@@ -31,12 +31,7 @@ export async function getTableById(
3131 tableId : number ,
3232 tablesServerContext : TablesServerContext ,
3333) : Promise < OpenOpsTable | undefined > {
34- const tokenOrResolver = await resolveTokenProvider ( tablesServerContext ) ;
35- const authenticationHeader = createAxiosHeaders ( tokenOrResolver ) ;
36- const tables = await getTables (
37- tablesServerContext . tablesDatabaseId ,
38- authenticationHeader ,
39- ) ;
34+ const tables = await fetchAllTables ( tablesServerContext ) ;
4035 return tables . find ( ( t ) => t . id === tableId ) ;
4136}
4237
@@ -45,33 +40,29 @@ export async function getTableByName(
4540 tablesServerContext : TablesServerContext ,
4641) : Promise < OpenOpsTable | undefined > {
4742 const tables = await getAvailableTablesInOpenopsTables ( tablesServerContext ) ;
48-
49- const table = tables . find ( ( t ) => t . name === tableName ) ;
50-
51- return table ;
43+ return tables . find ( ( t ) => t . name === tableName ) ;
5244}
5345
5446export async function getTableNames (
5547 tablesServerContext : TablesServerContext ,
5648) : Promise < string [ ] > {
5749 const tables = await getAvailableTablesInOpenopsTables ( tablesServerContext ) ;
58-
5950 return tables . map ( ( t ) => t . name ) ;
6051}
6152
6253async function getAvailableTablesInOpenopsTables (
6354 serverContext : TablesServerContext ,
6455) : Promise < OpenOpsTable [ ] > {
65- const tokenOrResolver = await resolveTokenProvider ( serverContext ) ;
56+ const tables = await fetchAllTables ( serverContext ) ;
57+ return getDistinctTableNames ( tables ) ;
58+ }
6659
60+ async function fetchAllTables (
61+ serverContext : TablesServerContext ,
62+ ) : Promise < OpenOpsTable [ ] > {
63+ const tokenOrResolver = await resolveTokenProvider ( serverContext ) ;
6764 const authenticationHeader = createAxiosHeaders ( tokenOrResolver ) ;
68-
69- const tables = await getTables (
70- serverContext . tablesDatabaseId ,
71- authenticationHeader ,
72- ) ;
73-
74- return getDistinctTableNames ( tables ) ;
65+ return getTables ( serverContext . tablesDatabaseId , authenticationHeader ) ;
7566}
7667
7768// Tables allows you to have tables with the same name in the same database.
0 commit comments