Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'appdefinition-architecture-revamp' of github.com:ToolJet/ToolJet into appdefinition-architecture-revamp

Browse source
This commit is contained in:
arpitnath 2023-10-27 14:53:10 +05:30
commit fcedeaf6cb
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
2.22.1 2.23.0

2
frontend/.version
View file

@ -1 +1 @@
2.22.1 2.23.0

2
server/.version
View file

@ -1 +1 @@
2.22.1 2.23.0

14
server/src/helpers/utils.helper.ts
View file

@ -152,7 +152,7 @@ export async function getServiceAndRpcNames(protoDefinition) {
export class MigrationProgress { export class MigrationProgress {
private progress = 0; private progress = 0;
constructor(private fileName: string, private totalCount: number) {} constructor(private fileName: string, private totalCount: number) { }
show() { show() {
this.progress++; this.progress++;
@ -205,17 +205,15 @@ export const generateInviteURL = (
const host = process.env.TOOLJET_HOST; const host = process.env.TOOLJET_HOST;
const subpath = process.env.SUB_PATH; const subpath = process.env.SUB_PATH;
return `${host}${subpath ? subpath : '/'}invitations/${invitationToken}${ return `${host}${subpath ? subpath : '/'}invitations/${invitationToken}${organizationToken ? `/workspaces/${organizationToken}${organizationId ? `?oid=${organizationId}` : ''}` : ''
organizationToken ? `/workspaces/${organizationToken}${organizationId ? `?oid=${organizationId}` : ''}` : '' }${source ? `${organizationId ? '&' : '?'}source=${source}` : ''}`;
}${source ? `${organizationId ? '&' : '?'}source=${source}` : ''}`;
}; };
export const generateOrgInviteURL = (organizationToken: string, organizationId?: string) => { export const generateOrgInviteURL = (organizationToken: string, organizationId?: string) => {
const host = process.env.TOOLJET_HOST; const host = process.env.TOOLJET_HOST;
const subpath = process.env.SUB_PATH; const subpath = process.env.SUB_PATH;
return `${host}${subpath ? subpath : '/'}organization-invitations/${organizationToken}${ return `${host}${subpath ? subpath : '/'}organization-invitations/${organizationToken}${organizationId ? `?oid=${organizationId}` : ''
organizationId ? `?oid=${organizationId}` : '' }`;
}`;
}; };
export function extractMajorVersion(version) { export function extractMajorVersion(version) {
@ -233,5 +231,5 @@ export function extractMajorVersion(version) {
* @returns {boolean} - True if the version is compatible, false otherwise. * @returns {boolean} - True if the version is compatible, false otherwise.
*/ */
export function isTooljetVersionWithNormalizedAppDefinitionSchem(version) { export function isTooljetVersionWithNormalizedAppDefinitionSchem(version) {
return semver.satisfies(semver.coerce(version), '>= 2.22.1'); return semver.satisfies(semver.coerce(version), '>= 2.23.0');
} }