Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Branding #18717

Merged
merged 32 commits into from
Dec 9, 2022
Merged

feat: Branding #18717

merged 32 commits into from
Dec 9, 2022

Conversation

jsartisan
Copy link
Contributor

@jsartisan jsartisan commented Dec 6, 2022

Allow super admin to set favicon, logo, and primary color according to their brand for their instance.
image

Fixes #16217
Fixes #16216
Fixes #16215
Fixes #16214
Fixes #16213

Type of change

  • New feature

How Has This Been Tested?

  • Manually
  • With Cypress

Checklist:

Dev activity

  • 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
  • PR is being merged under a feature flag

QA activity:

  • Test plan has been approved by relevant developers
  • Test plan has been peer reviewed by QA
  • Cypress test cases have been added and approved by either SDET or manual QA
  • Organized project review call with relevant stakeholders after Round 1/2 of QA
  • Added Test Plan Approved label after reveiwing all Cypress test

@vercel
Copy link

vercel bot commented Dec 6, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Updated
appsmith ⬜️ Ignored (Inspect) Dec 9, 2022 at 11:54AM (UTC)

@github-actions github-actions bot added the Enhancement New feature or request label Dec 6, 2022
@github-actions
Copy link

github-actions bot commented Dec 6, 2022

Unable to find test scripts. Please add necessary tests to the PR.

sharat87 and others added 2 commits December 7, 2022 18:12
type: ReduxActionTypes.RESTART_SERVER_POLL,
});

if (needsRestart) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the variable name here isn't correct. If I'm not wrong, branding changes after saving don't need a server restart, correct? While other settings need.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oopps. My bad. Let me fix it. I goofed while copying code from EE repo.

@@ -26,6 +26,7 @@ import { extractColorsFromString } from "utils/helpers";
import { TAILWIND_COLORS } from "constants/ThemeConstants";
import useDSEvent from "utils/hooks/useDSEvent";
import { DSEventTypes } from "utils/AppsmithUtils";
import { getTenantConfig } from "ce/selectors/tenantSelectors";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update the import to use @appsmith

border: red;
z-index: 1;
display: flex;
border: 1px solid #e0dede;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can use CSS variables for color here.

@@ -26,36 +25,23 @@ import MobileSideBar from "./MobileSidebar";
import { Indices } from "constants/Layers";
import { Icon, IconSize } from "design-system";
import { getTemplateNotificationSeenAction } from "actions/templateActions";
import { getTenantConfig } from "ce/selectors/tenantSelectors";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use @appsmith here as well in the import

const image = new Image();
image.src = window.URL.createObjectURL(file);

image.onload = function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file name is .tsx in EE PR. Just giving heads up you will face merge-conflict later in EE.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's okay. I'll use .ts only. .tsx was wrong before

version "1.0.34"
resolved "https://registry.yarnpkg.com/@appsmithorg/design-system/-/design-system-1.0.34.tgz#ebf63414bec56fecb5c1d5c3464aee91363a151b"
integrity sha512-4epvp8Q2X3mH2UV/yvEzdCCrDPiayV2WKR6t6zS5N6O46DIqQfAVbKqANNqEFlMcZMMmzvr6MEBV6PS0arK1yw==
"design-system@npm:@appsmithorg/[email protected]":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in package.json the version is 37-alpha.7 which doesn't match the version in this file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll be using a stable version once i get a sign off from review and qa.

Copy link
Contributor

@ankitakinger ankitakinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Since you have changed the path for favicon-orange.ico, please update the path in manifest.json file as well. Also, if it is used in any other files, then those too.
  2. Should we add messages to img alt all over in the new pages you created?

Everything else looks good to me.

@@ -3,7 +3,7 @@
"name": "Appsmith Client Web UI",
"icons": [
{
"src": "favicon-orange.ico",
"src": "/static/img/favicon-orange.ico",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure but I think the first / is not required. Have you checked this out locally?

ankitakinger
ankitakinger previously approved these changes Dec 8, 2022
Copy link
Contributor

@ankitakinger ankitakinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Aishwarya-U-R
Copy link
Contributor

/ok-to-test sha=70c3a3a

@github-actions
Copy link

github-actions bot commented Dec 9, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3654910427.
Workflow: Appsmith External Integration Test Workflow.
Commit: 70c3a3a.
PR: 18717.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=18717&runId=3654910427_1

@jsartisan
Copy link
Contributor Author

/ok-to-test sha=0f715a4

@github-actions
Copy link

github-actions bot commented Dec 9, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3655808055.
Workflow: Appsmith External Integration Test Workflow.
Commit: 0f715a4.
PR: 18717.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=18717&runId=3655808055_1

@github-actions github-actions bot added Widgets Product This label groups issues related to widgets Branding Product All issues under branding and whitelabelling appsmith ecosystem potential-duplicate This label marks issues that are potential duplicates of already open issues labels Dec 9, 2022
@jsartisan
Copy link
Contributor Author

/ok-to-test sha=fe06121

@github-actions
Copy link

github-actions bot commented Dec 9, 2022

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3657169089.
Workflow: Appsmith External Integration Test Workflow.
Commit: fe06121.
PR: 18717.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=18717&runId=3657169089_1

@jsartisan jsartisan merged commit d7e2c49 into release Dec 9, 2022
@jsartisan jsartisan deleted the feat/branding branch December 9, 2022 14:43
@Nikhil-Nandagopal Nikhil-Nandagopal added Platform Administration Pod Issues related to platform administration & management and removed Widgets Product This label groups issues related to widgets labels Aug 6, 2024
Copy link
Contributor

coderabbitai bot commented Aug 6, 2024

Important

Review skipped

More than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review.

24 files out of 81 files are above the max files limit of 50. Please upgrade to Pro plan to get higher limits.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Branding Product All issues under branding and whitelabelling appsmith ecosystem Enhancement New feature or request Platform Administration Pod Issues related to platform administration & management potential-duplicate This label marks issues that are potential duplicates of already open issues
Projects
None yet
5 participants