ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: load data source when data source load failed (#3793)

Browse Source
This commit is contained in:
ChengLei Shao 2024-03-22 12:20:12 +08:00 committed by GitHub
parent 9354e25d74
commit 4e145a8868
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/data-source-manager/src/data-source-manager.ts
View File

@ -14,6 +14,7 @@ export class DataSourceManager {
}
async add(dataSource: DataSource, options: any = {}) {
console.log('add', dataSource.name, options);
await dataSource.load(options);
this.dataSources.set(dataSource.name, dataSource);
}

39
packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-sources.test.ts
View File

@ -342,9 +342,10 @@ describe('data source', async () => {
expect(app.dataSourceManager.dataSources.get('mockInstance1')).not.toBeDefined();
});
class MockCollectionManager extends CollectionManager {}
describe('data source collections', () => {
beforeEach(async () => {
class MockCollectionManager extends CollectionManager {}
class MockDataSource extends DataSource {
async load(): Promise<void> {
this.collectionManager.defineCollection({
@ -397,6 +398,7 @@ describe('data source', async () => {
const listResp = await app.agent().resource('dataSources').list({
appends: 'collections',
});
expect(listResp.status).toBe(200);
const listEnabledResp = await app.agent().resource('dataSources').listEnabled({});
@ -406,6 +408,41 @@ describe('data source', async () => {
expect(item.collections).toBeDefined();
});
it('should get data source with collections when data source load failed', async () => {
class MockDataSource2 extends DataSource {
async load(): Promise<void> {
throw new Error('load failed');
}
createCollectionManager(options?: any) {
return new MockCollectionManager();
}
}
app.dataSourceManager.factory.register('mock2', MockDataSource2);
await app.db.getRepository('dataSources').create({
values: {
key: 'mockInstance2',
type: 'mock2',
displayName: 'Mock 2',
options: {
password: '123456',
},
},
});
await waitSecond(1000);
const listResp = await app.agent().resource('dataSources').listEnabled({
appends: 'collections',
});
expect(listResp.status).toBe(200);
console.log(listResp.body.data);
});
it('should get collections from datasource', async () => {
const listResp = await app.agent().resource('dataSources').list();
expect(listResp.status).toBe(200);

7
packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts
View File

@ -159,15 +159,14 @@ export class PluginDataSourceManagerServer extends Plugin {
const dataSource = app.dataSourceManager.dataSources.get(dataSourceModel.get('key'));
const dataSourceStatus = plugin.dataSourceStatus[dataSourceModel.get('key')];
// @ts-ignore
const isDBInstance = !!dataSource.collectionManager.db;
const item: any = {
key: dataSourceModel.get('key'),
displayName: dataSourceModel.get('displayName'),
status: dataSourceStatus,
type: dataSourceModel.get('type'),
isDBInstance,
// @ts-ignore
isDBInstance: !!dataSource?.collectionManager.db,
};
if (dataSourceStatus === 'loading-failed' || dataSourceStatus === 'reloading-failed') {