Merge pull request #1 from Zextras/licensing-fix

Licensing fix, CODEOWNERS, fix of chatbar naming
zextras · Jan 11, 2022 · 43c51df · 43c51df
2 parents bc3a0fd + e074e4d
commit 43c51df
Show file tree

Hide file tree

Showing 6 changed files with 247 additions and 11 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @Zextras/the-dexters
diff --git a/COPYING b/COPYING
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -44,7 +44,7 @@ export const FOLDERS = {
 export const SHELL_APP_ID = 'carbonio-shell-ui';
 export const SETTINGS_APP_ID = 'settings';
 export const SEARCH_APP_ID = 'search';
-export const TEAM_APP_ID = 'carbonio-chats-ui';
+export const CHATS_APP_ID = 'carbonio-chats-ui';
 export const ACTION_TYPES = {
 	CONVERSATION: 'conversation',
 	CONVERSATION_lIST: 'conversation_list',

diff --git a/src/shell/shell-view.jsx b/src/shell/shell-view.jsx
@@ -22,7 +22,7 @@ import { useAppStore } from '../store/app/store';
 import AppContextProvider from '../boot/app/app-context-provider';
 import { useUserAccount, useUserSettings } from '../store/account/hooks';
 import { useAccountStore } from '../store/account/store';
-import { TEAM_APP_ID } from '../constants';
+import { CHATS_APP_ID } from '../constants';
 
 const Background = styled.div`
 	background: ${({ theme }) => theme.palette.gray6.regular};
@@ -58,7 +58,7 @@ export function Shell() {
 	const [chatPanelMode, setChatPanelMode] = useState('closed'); // values: 'closed', 'overlap', 'open'
 	const [navOpen, setNavOpen] = useState(true);
 	const [mobileNavOpen, setMobileNavOpen] = useState(false);
-	const TeamViews = useAppStore((state) => state.apps[TEAM_APP_ID]?.views?.teambar);
+	const ChatsViews = useAppStore((state) => state.apps[CHATS_APP_ID]?.views?.chatbar);
 
 	useEffect(() => {
 		setNavOpen((n) => !(n && chatPanelMode === 'open'));
@@ -71,7 +71,7 @@ export function Shell() {
 				mobileNavIsOpen={mobileNavOpen}
 				onMobileMenuClick={() => setMobileNavOpen(!mobileNavOpen)}
 			>
-				{TeamViews && <TeamViews.icon mode={chatPanelMode} setMode={setChatPanelMode} />}
+				{ChatsViews && <ChatsViews.icon mode={chatPanelMode} setMode={setChatPanelMode} />}
 			</ShellHeader>
 			<Row crossAlignment="unset" style={{ position: 'relative', flexGrow: '1' }}>
 				<ShellNavigationBar
@@ -80,10 +80,10 @@ export function Shell() {
 					onCollapserClick={() => setNavOpen(!navOpen)}
 				/>
 				<AppViewContainer />
-				{TeamViews && (
-					<AppContextProvider pkg={TEAM_APP_ID}>
+				{ChatsViews && (
+					<AppContextProvider pkg={CHATS_APP_ID}>
 						<ShellMenuPanel mode={chatPanelMode} setMode={setChatPanelMode}>
-							<TeamViews.sidebar mode={chatPanelMode} setMode={setChatPanelMode} />
+							<ChatsViews.sidebar mode={chatPanelMode} setMode={setChatPanelMode} />
 						</ShellMenuPanel>
 					</AppContextProvider>
 				)}

diff --git a/types/apps/index.d.ts b/types/apps/index.d.ts
@@ -20,7 +20,7 @@ export type RuntimeAppData = Partial<{
 		settings?: Component | FunctionComponent;
 		search?: Component | FunctionComponent;
 		sidebar?: Component | FunctionComponent;
-		teambar?: {
+		chatbar?: {
 			icon: Component | FunctionComponent;
 			sidebar: Component | FunctionComponent;
 		};