Skip to content

Commit b82681f

Browse files
Move change handlers into their own environments (#770)
* Get rid of operations * Put change handlers in their execution environment * Properly bind "this" * Remove InjectModel that got missed * Update actions/checkout and actions/setup-node * Combine some files to avoid circular dependencies
1 parent 11591d4 commit b82681f

File tree

74 files changed

+2346
-3147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2346
-3147
lines changed

.github/workflows/cypress_debug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Check out
10-
uses: actions/checkout@v4
10+
uses: actions/checkout@v6
1111

1212
- name: Use Node.js 24.x
13-
uses: actions/setup-node@v4
13+
uses: actions/setup-node@v6
1414
with:
1515
node-version: 24
1616
cache: yarn

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Check out
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
- name: Use Node.js 24.x
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v6
2525
with:
2626
node-version: 24
2727
cache: yarn
@@ -58,7 +58,7 @@ jobs:
5858
needs: [build]
5959
steps:
6060
- name: Check out
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v6
6262
- name: Download built plugin files
6363
uses: actions/download-artifact@v4
6464
with:

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515
- name: Use Node.js 24.x
16-
uses: actions/setup-node@v4
16+
uses: actions/setup-node@v6
1717
with:
1818
node-version: 24
1919
cache: yarn

.github/workflows/push.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
- name: Use Node.js 24.x
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v6
1919
with:
2020
node-version: 24
2121
cache: yarn
@@ -32,9 +32,9 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Check out
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636
- name: Use Node.js 24.x
37-
uses: actions/setup-node@v4
37+
uses: actions/setup-node@v6
3838
with:
3939
node-version: 24
4040
cache: yarn

.github/workflows/reload_demo_data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
environment: ${{ inputs.environment }}
2222
steps:
2323
- name: Check out
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525
- name: Configure AWS credentials
2626
uses: aws-actions/configure-aws-credentials@v4
2727
with:

.github/workflows/website.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
- name: Use Node.js 24.x
15-
uses: actions/setup-node@v4
15+
uses: actions/setup-node@v6
1616
with:
1717
node-version: 24
1818
cache: yarn

packages/apollo-collaboration-server/src/app.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { FilesModule } from './files/files.module.js'
2121
import { HealthModule } from './health/health.module.js'
2222
import { JBrowseModule } from './jbrowse/jbrowse.module.js'
2323
import { MessagesModule } from './messages/messages.module.js'
24-
import { OperationsModule } from './operations/operations.module.js'
2524
import { PluginsModule } from './plugins/plugins.module.js'
2625
import { RefSeqChunksModule } from './refSeqChunks/refSeqChunks.module.js'
2726
import { RefSeqsModule } from './refSeqs/refSeqs.module.js'
@@ -165,7 +164,6 @@ async function mongoDBURIFactory(
165164
useFactory: mongoDBURIFactory,
166165
inject: [ConfigService],
167166
}),
168-
OperationsModule,
169167
PluginsModule.registerAsync(),
170168
RefSeqChunksModule,
171169
RefSeqsModule,

packages/apollo-collaboration-server/src/assemblies/assemblies.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { MongooseModule } from '@nestjs/mongoose'
44

55
import { ChecksModule } from '../checks/checks.module.js'
66
import { FeaturesModule } from '../features/features.module.js'
7-
import { OperationsModule } from '../operations/operations.module.js'
87
import { RefSeqsModule } from '../refSeqs/refSeqs.module.js'
98

109
import { AssembliesController } from './assemblies.controller.js'
@@ -19,7 +18,6 @@ import { AssembliesService } from './assemblies.service.js'
1918
]),
2019
ChecksModule,
2120
FeaturesModule,
22-
OperationsModule,
2321
RefSeqsModule,
2422
],
2523
exports: [MongooseModule, AssembliesService],

packages/apollo-collaboration-server/src/assemblies/assemblies.service.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
import {
2-
Assembly,
3-
type AssemblyDocument,
4-
Check,
5-
type CheckDocument,
6-
} from '@apollo-annotation/schemas'
7-
import { GetAssembliesOperation } from '@apollo-annotation/shared'
1+
import { Assembly, type AssemblyDocument } from '@apollo-annotation/schemas'
82
import {
93
Injectable,
104
Logger,
@@ -16,7 +10,6 @@ import { Model } from 'mongoose'
1610

1711
import { ChecksService } from '../checks/checks.service.js'
1812
import { FeaturesService } from '../features/features.service.js'
19-
import { OperationsService } from '../operations/operations.service.js'
2013
import { RefSeqsService } from '../refSeqs/refSeqs.service.js'
2114

2215
import { CreateAssemblyDto } from './dto/create-assembly.dto.js'
@@ -27,9 +20,6 @@ export class AssembliesService {
2720
constructor(
2821
@InjectModel(Assembly.name)
2922
private readonly assemblyModel: Model<AssemblyDocument>,
30-
@InjectModel(Check.name)
31-
private readonly checkModel: Model<CheckDocument>,
32-
private readonly operationsService: OperationsService,
3323
private readonly checksService: ChecksService,
3424
private readonly featuresService: FeaturesService,
3525
private readonly refSeqsService: RefSeqsService,
@@ -65,7 +55,7 @@ export class AssembliesService {
6555
const refSeqs = await this.refSeqsService.findAll({ assembly: _id })
6656
for (const refSeq of refSeqs) {
6757
const features = await this.featuresService.findByRange({
68-
refSeq: refSeq._id as string,
58+
refSeq: refSeq._id.toString(),
6959
start: 0,
7060
end: refSeq.length,
7161
})
@@ -78,9 +68,7 @@ export class AssembliesService {
7868
}
7969

8070
findAll() {
81-
return this.operationsService.executeOperation<GetAssembliesOperation>({
82-
typeName: 'GetAssembliesOperation',
83-
})
71+
return this.assemblyModel.find({ status: 0 }).exec()
8472
}
8573

8674
async findOne(id: string) {

0 commit comments

Comments
 (0)