fix: Display community edition along with version (#16341)

## Description

This PR adds the string `Community` along with the Appsmith version. This will help users identify the type of instance that they are running.

## Type of change

- New feature (non-breaking change which adds functionality)

## How Has This Been Tested?

Manually

## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
This commit is contained in:
Arpit Mohan 2022-08-27 11:40:03 +02:00 committed by GitHub
parent f73ecaa4b5
commit 037efacbf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 66 additions and 9 deletions

View File

@ -111,6 +111,7 @@ jobs:
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \ SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \ REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \
REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \ REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \
REACT_APP_VERSION_EDITION="Community" \
yarn build yarn build
# Upload the build artifact so that it can be used by the test & deploy job in the workflow # Upload the build artifact so that it can be used by the test & deploy job in the workflow

View File

@ -85,6 +85,7 @@ jobs:
REACT_APP_SEGMENT_CE_KEY: "${{ secrets.APPSMITH_SEGMENT_CE_KEY }}" REACT_APP_SEGMENT_CE_KEY: "${{ secrets.APPSMITH_SEGMENT_CE_KEY }}"
REACT_APP_VERSION_ID: "${{ needs.prelude.outputs.tag }}" REACT_APP_VERSION_ID: "${{ needs.prelude.outputs.tag }}"
REACT_APP_INTERCOM_APP_ID: "${{ secrets.APPSMITH_INTERCOM_ID }}" REACT_APP_INTERCOM_APP_ID: "${{ secrets.APPSMITH_INTERCOM_ID }}"
REACT_APP_VERSION_EDITION: "Community"
run: | run: |
REACT_APP_VERSION_RELEASE_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" \ REACT_APP_VERSION_RELEASE_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')" \
yarn build yarn build

View File

@ -250,6 +250,7 @@ jobs:
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \ SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \ REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \
REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \ REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \
REACT_APP_VERSION_EDITION="Community" \
yarn build yarn build
# Restore the previous built bundle if present. If not push the newly built into the cache # Restore the previous built bundle if present. If not push the newly built into the cache
@ -444,7 +445,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
job: [0, 1,] job: [0, 1]
# Service containers to run with this job. Required for running tests # Service containers to run with this job. Required for running tests
services: services:
@ -804,7 +805,33 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
job: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] job:
[
0,
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
]
# Service containers to run with this job. Required for running tests # Service containers to run with this job. Required for running tests
services: services:
@ -1559,4 +1586,3 @@ jobs:
# Set status = success # Set status = success
- run: echo "::set-output name=run_result::success" > ~/run_result - run: echo "::set-output name=run_result::success" > ~/run_result

View File

@ -146,6 +146,7 @@ jobs:
SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \ SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} \
REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \ REACT_APP_VERSION_ID=${{ steps.vars.outputs.version }} \
REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \ REACT_APP_VERSION_RELEASE_DATE=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \
REACT_APP_VERSION_EDITION="Community" \
REACT_APP_INTERCOM_APP_ID=${{ secrets.APPSMITH_INTERCOM_ID }} \ REACT_APP_INTERCOM_APP_ID=${{ secrets.APPSMITH_INTERCOM_ID }} \
yarn build yarn build
ls -l build ls -l build
@ -423,7 +424,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
job: [0, 1,] job: [0, 1]
# Service containers to run with this job. Required for running tests # Service containers to run with this job. Required for running tests
services: services:
@ -1437,4 +1438,3 @@ jobs:
docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly . docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly .
docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA}
docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly

View File

@ -40,6 +40,7 @@ export interface INJECTED_CONFIGS {
appVersion: { appVersion: {
id: string; id: string;
releaseDate: string; releaseDate: string;
edition: string;
}; };
intercomAppID: string; intercomAppID: string;
mailEnabled: boolean; mailEnabled: boolean;
@ -116,6 +117,7 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
appVersion: { appVersion: {
id: process.env.REACT_APP_VERSION_ID || "", id: process.env.REACT_APP_VERSION_ID || "",
releaseDate: process.env.REACT_APP_VERSION_RELEASE_DATE || "", releaseDate: process.env.REACT_APP_VERSION_RELEASE_DATE || "",
edition: process.env.REACT_APP_VERSION_EDITION || "",
}, },
intercomAppID: process.env.REACT_APP_INTERCOM_APP_ID || "", intercomAppID: process.env.REACT_APP_INTERCOM_APP_ID || "",
mailEnabled: process.env.REACT_APP_MAIL_ENABLED mailEnabled: process.env.REACT_APP_MAIL_ENABLED

View File

@ -56,6 +56,7 @@ export interface AppsmithUIConfigs {
appVersion: { appVersion: {
id: string; id: string;
releaseDate: string; releaseDate: string;
edition: string;
}; };
intercomAppID: string; intercomAppID: string;
mailEnabled: boolean; mailEnabled: boolean;

View File

@ -5,6 +5,8 @@ export function createMessage(
return format(...args); return format(...args);
} }
export const APPSMITH_DISPLAY_VERSION = (edition: string, version: string) =>
`Appsmith ${edition} ${version}`;
export const YES = () => `Yes`; export const YES = () => `Yes`;
export const ARE_YOU_SURE = () => `Are you sure?`; export const ARE_YOU_SURE = () => `Are you sure?`;
export const ERROR_ADD_API_INVALID_URL = () => export const ERROR_ADD_API_INVALID_URL = () =>

View File

@ -25,6 +25,10 @@ import moment from "moment";
import { getCurrentUser } from "selectors/usersSelectors"; import { getCurrentUser } from "selectors/usersSelectors";
import { User } from "constants/userConstants"; import { User } from "constants/userConstants";
import { Colors } from "constants/Colors"; import { Colors } from "constants/Colors";
import {
createMessage,
APPSMITH_DISPLAY_VERSION,
} from "@appsmith/constants/messages";
const { algolia, appVersion, intercomAppID } = getAppsmithConfigs(); const { algolia, appVersion, intercomAppID } = getAppsmithConfigs();
const searchClient = algoliasearch(algolia.apiId, algolia.apiKey); const searchClient = algoliasearch(algolia.apiId, algolia.apiKey);
@ -417,7 +421,13 @@ class DocumentationSearch extends React.Component<Props, State> {
</HelpBody> </HelpBody>
{appVersion.id && ( {appVersion.id && (
<HelpFooter> <HelpFooter>
<span>Appsmith {appVersion.id}</span> <span>
{createMessage(
APPSMITH_DISPLAY_VERSION,
appVersion.edition,
appVersion.id,
)}
</span>
<span>Released {moment(appVersion.releaseDate).fromNow()}</span> <span>Released {moment(appVersion.releaseDate).fromNow()}</span>
</HelpFooter> </HelpFooter>
)} )}

View File

@ -7,6 +7,7 @@ import {
createMessage, createMessage,
DOCUMENTATION, DOCUMENTATION,
WELCOME_TOUR, WELCOME_TOUR,
APPSMITH_DISPLAY_VERSION,
} from "@appsmith/constants/messages"; } from "@appsmith/constants/messages";
import { getIsFetchingApplications } from "selectors/applicationSelectors"; import { getIsFetchingApplications } from "selectors/applicationSelectors";
import { getOnboardingWorkspaces } from "selectors/onboardingSelectors"; import { getOnboardingWorkspaces } from "selectors/onboardingSelectors";
@ -89,7 +90,13 @@ function LeftPaneBottomSection() {
)} )}
<ProductUpdatesModal /> <ProductUpdatesModal />
<LeftPaneVersionData> <LeftPaneVersionData>
<span>Appsmith {appVersion.id}</span> <span>
{createMessage(
APPSMITH_DISPLAY_VERSION,
appVersion.edition,
appVersion.id,
)}
</span>
{howMuchTimeBefore !== "" && ( {howMuchTimeBefore !== "" && (
<span>Released {howMuchTimeBefore} ago</span> <span>Released {howMuchTimeBefore} ago</span>
)} )}

View File

@ -15,6 +15,7 @@ import {
createMessage, createMessage,
ADMIN_SETTINGS, ADMIN_SETTINGS,
DOCUMENTATION, DOCUMENTATION,
APPSMITH_DISPLAY_VERSION,
} from "@appsmith/constants/messages"; } from "@appsmith/constants/messages";
import { getAppsmithConfigs } from "@appsmith/configs"; import { getAppsmithConfigs } from "@appsmith/configs";
import { howMuchTimeBeforeText } from "utils/helpers"; import { howMuchTimeBeforeText } from "utils/helpers";
@ -155,7 +156,13 @@ export default function MobileSideBar(props: MobileSideBarProps) {
/> />
</Section> </Section>
<LeftPaneVersionData> <LeftPaneVersionData>
<span>Appsmith {appVersion.id}</span> <span>
{createMessage(
APPSMITH_DISPLAY_VERSION,
appVersion.edition,
appVersion.id,
)}
</span>
{howMuchTimeBefore !== "" && ( {howMuchTimeBefore !== "" && (
<span>Released {howMuchTimeBefore} ago</span> <span>Released {howMuchTimeBefore} ago</span>
)} )}