- <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, description: 'Here are some of the latest posts on '+tagName }) -%>
+ <%- include('./Partials/BlogTitleAndDescription', { title: 'Latest posts on '+tagName, smallTitle: "", description: 'Here are some of the latest posts on '+tagName }) -%>
diff --git a/App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs b/App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs
index 21f5bb8e7fc..777c1c0fcf1 100644
--- a/App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs
+++ b/App/FeatureSet/Home/Views/Blog/Partials/BlogTitleAndDescription.ejs
@@ -3,6 +3,13 @@
<%= title %>
+
+
+ <% if(smallTitle){ %>
+
+ <%= smallTitle %>
+
+ <% } %>
<%= description %>
diff --git a/App/FeatureSet/Home/Views/Blog/Post.ejs b/App/FeatureSet/Home/Views/Blog/Post.ejs
index 0140f1c06bc..30aefd2c494 100644
--- a/App/FeatureSet/Home/Views/Blog/Post.ejs
+++ b/App/FeatureSet/Home/Views/Blog/Post.ejs
@@ -73,7 +73,7 @@
- <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , description:
+ <%- include('./Partials/BlogTitleAndDescription', { title: blogPost.title , smallTitle: "", description:
blogPost.description }) -%>
diff --git a/Common/Server/Infrastructure/PostgresDatabase.ts b/Common/Server/Infrastructure/PostgresDatabase.ts
index cef6ecced98..f7a5c110fbd 100644
--- a/Common/Server/Infrastructure/PostgresDatabase.ts
+++ b/Common/Server/Infrastructure/PostgresDatabase.ts
@@ -27,7 +27,7 @@ export default class Database {
public async connect(): Promise {
let retry: number = 0;
- const dataSourceOptions = this.getDatasourceOptions();
+ const dataSourceOptions: DataSourceOptions = this.getDatasourceOptions();
try {
type ConnectToDatabaseFunction = () => Promise;
diff --git a/Common/Server/Services/TeamService.ts b/Common/Server/Services/TeamService.ts
index 26a6468660f..4bd9dcfd610 100644
--- a/Common/Server/Services/TeamService.ts
+++ b/Common/Server/Services/TeamService.ts
@@ -6,7 +6,7 @@ import LIMIT_MAX from "Common/Types/Database/LimitMax";
import BadDataException from "Common/Types/Exception/BadDataException";
import Model from "Common/Models/DatabaseModels/Team";
-export class TeamService extends DatabaseService {
+export class Service extends DatabaseService {
public constructor() {
super(Model);
}
@@ -69,4 +69,4 @@ export class TeamService extends DatabaseService {
return { deleteBy, carryForward: null };
}
}
-export default new TeamService();
+export default new Service();
diff --git a/Common/Server/Services/UserService.ts b/Common/Server/Services/UserService.ts
index 1bc842cb730..07c1a9f8af3 100755
--- a/Common/Server/Services/UserService.ts
+++ b/Common/Server/Services/UserService.ts
@@ -33,7 +33,7 @@ import UserTwoFactorAuth from "Common/Models/DatabaseModels/UserTwoFactorAuth";
import UserTwoFactorAuthService from "./UserTwoFactorAuthService";
import BadDataException from "Common/Types/Exception/BadDataException";
-export class UserService extends DatabaseService {
+export class Service extends DatabaseService {
public constructor() {
super(Model);
}
@@ -318,4 +318,4 @@ export class UserService extends DatabaseService {
}
}
-export default new UserService();
+export default new Service();
diff --git a/Common/Tests/Server/Services/TeamMemberService.test.ts b/Common/Tests/Server/Services/TeamMemberService.test.ts
index 9ab8a0cbd04..4456d0f3b5c 100644
--- a/Common/Tests/Server/Services/TeamMemberService.test.ts
+++ b/Common/Tests/Server/Services/TeamMemberService.test.ts
@@ -820,12 +820,12 @@ describe("TeamMemberService", () => {
const SUBSCRIPTION_ID: string = "subscriptionId";
it("should update subscription seats based on unique team members", async () => {
- const user1 = await UserService.create({
+ const user1: User = await UserService.create({
data: UserServiceHelper.generateRandomUser(),
props: { isRoot: true },
});
- const project = await ProjectService.create({
+ const project: Project = await ProjectService.create({
data: ProjectServiceHelper.generateRandomProject(),
props: { isRoot: true, userId: user1.id! },
});
@@ -847,14 +847,14 @@ describe("TeamMemberService", () => {
// now add users.
- const user2 = await UserService.create({
+ const user2: User = await UserService.create({
data: UserServiceHelper.generateRandomUser(),
props: { isRoot: true },
});
// add team
- const team = await TeamService.create({
+ const team: Team = await TeamService.create({
data: TeamServiceHelper.generateRandomTeam({
projectId: new ObjectID(project._id!),
}),
diff --git a/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts b/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts
index 5e9c7081360..77d79ec2132 100644
--- a/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts
+++ b/Common/Tests/Server/TestingUtils/Services/ProjectServiceHelper.ts
@@ -3,7 +3,9 @@ import Project from "Common/Models/DatabaseModels/Project";
import { PlanType } from "../../../../Types/Billing/SubscriptionPlan";
export default class ProjectTestService {
- public static generateRandomProject(data?: { seatLimit?: number } | undefined): Project {
+ public static generateRandomProject(
+ data?: { seatLimit?: number } | undefined,
+ ): Project {
const project: Project = new Project();
// required fields
@@ -12,7 +14,7 @@ export default class ProjectTestService {
project.isBlocked = false;
project.requireSsoForLogin = false;
- if(data && data.seatLimit){
+ if (data && data.seatLimit) {
project.seatLimit = data.seatLimit;
}
diff --git a/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts b/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts
index 5ccef128449..276e212f6ac 100644
--- a/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts
+++ b/Common/Tests/Server/TestingUtils/__mocks__/TestDatabase.mock.ts
@@ -1,11 +1,15 @@
import getTestDataSourceOptions from "../Postgres/TestDataSourceOptions";
-import { PostgresAppInstance } from "../../../../Server/Infrastructure/PostgresDatabase";
+import {
+ DatabaseSourceOptions,
+ PostgresAppInstance,
+} from "../../../../Server/Infrastructure/PostgresDatabase";
import Redis from "../../../../Server/Infrastructure/Redis";
import getTestRedisConnectionOptions from "../Redis/TestRedisOptions";
export class TestDatabaseMock {
public static async connectDbMock(): Promise {
- const testDataSourceOptions = getTestDataSourceOptions();
+ const testDataSourceOptions: DatabaseSourceOptions =
+ getTestDataSourceOptions();
PostgresAppInstance.getDatasourceOptions = () => {
return testDataSourceOptions;