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

Switch to common building of monorepo packages in deploy.yml #636

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a532efe
Implemented workflow to deploy preview of pr changes
devanshkansagra Sep 3, 2024
2645832
Temporarily removed docs and layout_editor from preview deployment
devanshkansagra Sep 4, 2024
f9df020
Fixed: deploy previews on multi-package updates
devanshkansagra Sep 4, 2024
1b507d9
Fixed a minor script issue in the previous commit
devanshkansagra Sep 9, 2024
9ae42b7
Merge branch 'RocketChat:develop' into feat/deploy-pr-previews
devanshkansagra Sep 14, 2024
89cd72a
Removed the cd-pr.yml file and added new action to deploy pr-previews
devanshkansagra Sep 14, 2024
d67df2c
Merge branch 'develop' into feat/deploy-pr-previews
devanshkansagra Sep 26, 2024
b19cdee
Merge branch 'RocketChat:develop' into feat/deploy-pr-previews
devanshkansagra Sep 26, 2024
43b1ca1
Merge branch 'develop' into feat/deploy-pr-previews
devanshkansagra Sep 28, 2024
8514fed
Added layout_editor and docs for pr-deployment
devanshkansagra Sep 30, 2024
a70f026
Added necessary permissions
devanshkansagra Sep 30, 2024
05c0f2d
Merge pull request #620 from devanshkansagra/feat/deploy-pr-previews
Spiral-Memory Sep 30, 2024
2a8f52d
Revert "Implemented workflow to deploy preview of pr changes"
Spiral-Memory Sep 30, 2024
df7f1b4
Merge pull request #631 from RocketChat/revert-620-feat/deploy-pr-pre…
Spiral-Memory Sep 30, 2024
0aafed8
Adjusted the sidebar width to cover the entire width for small screen…
abirc8010 Sep 30, 2024
0e50f20
Switched from seprated building of packages to common building of pac…
devanshkansagra Oct 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,10 @@ jobs:
node-version: "16.19.0"

- name: Install Dependencies
run: yarn

- name: Build Storybook
run: yarn build:storybook
working-directory: packages/react

- name: Build UI-Elements
run: yarn build:storybook
working-directory: packages/ui-elements
run: yarn install

- name: Build Layout Editor
run: npm run build
working-directory: packages/layout_editor
- name: Build Packages
run: yarn build && yarn build:storybook

- name: Setup Node.js for Docs
uses: actions/setup-node@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,18 @@ export const MessageAggregator = ({

const noMessages = messageList?.length === 0 || !messageRendered;
const ViewComponent = viewType === 'Popup' ? Popup : Sidebar;

return (
<ViewComponent
title={title}
iconName={iconName}
searchProps={searchProps}
onClose={() => setExclusiveState(null)}
style={{ padding: 0 }}
style={{
backgroundColor: theme.colors.background,
position: 'absolute',
right: 0,
zIndex: 1001,
}}
{...(viewType === 'Popup'
? {
isPopupHeader: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ const getMessageAggregatorStyles = () => {
flex-direction: column;
justify-content: initial;
align-items: initial;
max-width: 100%;
width: 300px;
@media (max-width: 780px) {
width: 100vw;
}
`,

noMessageStyles: css`
Expand Down
11 changes: 11 additions & 0 deletions packages/react/src/views/RoomInformation/RoomInformation.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
Sidebar,
Popup,
useComponentOverrides,
useTheme,
} from '@embeddedchat/ui-elements';
import RCContext from '../../context/RCInstance';
import { useChannelStore } from '../../store';
Expand All @@ -23,13 +24,20 @@ const Roominfo = () => {
return `${host}/avatar/${channelname}`;
};

const { theme } = useTheme();
const ViewComponent = viewType === 'Popup' ? Popup : Sidebar;

return (
<ViewComponent
title="Room Information"
iconName="info"
onClose={() => setExclusiveState(null)}
style={{
backgroundColor: theme.colors.background,
position: 'absolute',
right: 0,
zIndex: 1001,
}}
{...(viewType === 'Popup'
? {
isPopupHeader: true,
Expand All @@ -41,6 +49,9 @@ const Roominfo = () => {
padding: 0 1rem 1rem;
margin: 0 auto;
overflow: auto;
@media (max-width: 780px) {
width: 100vw;
}
`}
>
<Avatar size="100%" url={getChannelAvatarURL(channelInfo.name)} />
Expand Down
10 changes: 7 additions & 3 deletions packages/react/src/views/RoomMembers/RoomMember.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,13 @@ const RoomMembers = ({ members }) => {
const { host } = ECOptions;
const { theme } = useTheme();
const styles = getRoomMemberStyles(theme);

const toggleInviteView = useInviteStore((state) => state.toggleInviteView);
const showInvite = useInviteStore((state) => state.showInvite);
const [isLoading, setIsLoading] = useState(true);
const { variantOverrides } = useComponentOverrides('RoomMember');
const viewType = variantOverrides.viewType || 'Sidebar';

const [userInfo, setUserInfo] = useState(null);
const setExclusiveState = useSetExclusiveState();

useEffect(() => {
const getUserInfo = async () => {
try {
Expand All @@ -50,11 +47,18 @@ const RoomMembers = ({ members }) => {
const roles = userInfo && userInfo.roles ? userInfo.roles : [];
const isAdmin = roles.includes('admin');
const ViewComponent = viewType === 'Popup' ? Popup : Sidebar;

return (
<ViewComponent
title="Members"
iconName="members"
onClose={() => setExclusiveState(null)}
style={{
backgroundColor: theme.colors.background,
position: 'absolute',
right: 0,
zIndex: 1001,
}}
{...(viewType === 'Popup'
? {
isPopupHeader: true,
Expand Down
7 changes: 5 additions & 2 deletions packages/react/src/views/RoomMembers/RoomMembers.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ export const getRoomMemberStyles = () => {
display: flex;
flex-direction: column;
overflow: auto;
width: 100%;
justify-content: center;
padding: 0 1rem 1rem;
padding: 0 2rem 1rem;
width: 300px;
@media (max-width: 780px) {
width: 100vw;
}
`,
};

Expand Down
Loading