fixes failing spec (ToolJet#2425)

dgo2dance · Mar 3, 2022 · e81c7cd · e81c7cd
1 parent 0ea41d9
commit e81c7cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/server/src/controllers/apps.controller.ts b/server/src/controllers/apps.controller.ts
@@ -92,12 +92,12 @@ export class AppsController {
     const app = await this.appsService.findBySlug(params.slug);
     const versionToLoad = app.currentVersionId
       ? await this.appsService.findVersion(app.currentVersionId)
-      : await this.appsService.findVersion(app.editingVersion.id);
+      : await this.appsService.findVersion(app.editingVersion?.id);
 
     // serialize
     return {
       current_version_id: app['currentVersionId'],
-      data_queries: versionToLoad.dataQueries,
+      data_queries: versionToLoad?.dataQueries,
       definition: versionToLoad?.definition,
       is_public: app.isPublic,
       name: app.name,

diff --git a/server/test/controllers/apps.e2e-spec.ts b/server/test/controllers/apps.e2e-spec.ts
@@ -1193,6 +1193,7 @@ describe('apps controller', () => {
         user: adminUserData.user,
         slug: 'foo',
       });
+      await createApplicationVersion(app, application);
       // setup app permissions for developer
       const developerUserGroup = await getRepository(GroupPermission).findOne({
         where: {
@@ -1234,12 +1235,13 @@ describe('apps controller', () => {
         email: 'another@tooljet.io',
         groups: ['all_users', 'admin'],
       });
-      await createApplication(app, {
+      const application = await createApplication(app, {
         name: 'name',
         user: adminUserData.user,
         slug: 'foo',
       });
 
+      await createApplicationVersion(app, application);
       const response = await request(app.getHttpServer())
         .get('/api/apps/slugs/foo')
         .set('Authorization', authHeaderForUser(anotherOrgAdminUserData.user));