code cleanup

packages/web/src/appobj/AppObjectCore.js

@@ -5,9 +5,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { FontIcon } from '../icons';
 import { useShowMenu } from '../modals/showMenu';
-// import { showMenu } from '../modals/DropDownMenu';
 import useTheme from '../theme/useTheme';
-// import { useSetOpenedTabs, useAppObjectParams } from '../utility/globalState';
 
 const AppObjectDiv = styled.div`
   padding: 5px;
@@ -19,11 +17,6 @@ const AppObjectDiv = styled.div`
   font-weight: ${(props) => (props.isBold ? 'bold' : 'normal')};
 `;
 
-// const AppObjectSpan = styled.span`
-//   white-space: nowrap;
-//   font-weight: ${(props) => (props.isBold ? 'bold' : 'normal')};
-// `;
-
 const IconWrap = styled.span`
   margin-right: 5px;
 `;
@@ -42,13 +35,11 @@ export function AppObjectCore({
   title,
   icon,
   data,
-  // makeAppObj,
   onClick = undefined,
   onClick2 = undefined,
   onClick3 = undefined,
   isBold = undefined,
   isBusy = undefined,
-  // component = 'div',
   prefix = undefined,
   statusIcon = undefined,
   extInfo = undefined,
@@ -56,7 +47,6 @@ export function AppObjectCore({
   Menu = undefined,
   ...other
 }) {
-  // const appObjectParams = useAppObjectParams();
   const theme = useTheme();
   const showMenu = useShowMenu();
 
@@ -65,15 +55,8 @@ export function AppObjectCore({
 
     event.preventDefault();
     showMenu(event.pageX, event.pageY, <Menu data={data} />);
-    // showMenu(event.pageX, event.pageY, <Menu data={data} makeAppObj={makeAppObj} {...appObjectParams} />);
   };
 
-  // const Component = component == 'div' ? AppObjectDiv : AppObjectSpan;
-
-  // let bold = false;
-  // if (_.isFunction(isBold)) bold = isBold(appObjectParams);
-  // else bold = !!isBold;
-
   return (
     <AppObjectDiv
       onContextMenu={handleContextMenu}
@@ -98,9 +81,3 @@ export function AppObjectCore({
     </AppObjectDiv>
   );
 }
-
-// export function AppObjectControl({ data, makeAppObj, component = 'div' }) {
-//   const appObjectParams = useAppObjectParams();
-//   const appobj = makeAppObj(data, appObjectParams);
-//   return <AppObjectCore {...appobj} data={data} makeAppObj={makeAppObj} component={component} />;
-// }

packages/web/src/appobj/AppObjectList.js

@@ -44,14 +44,10 @@ function AppObjectListItem({
 
   React.useEffect(() => {
     if (!expandable) {
-      // if (data._id == '6pOY2iFY8Gsq7mk6') console.log('COLLAPSE1');
       setIsExpanded(false);
     }
   }, [expandable]);
 
-  // const { matcher } = appobj;
-  // if (matcher && !matcher(filter)) return null;
-
   let commonProps = {
     prefix: SubItems ? (
       <ExpandIconHolder2>
@@ -128,7 +124,6 @@ export function AppObjectList({
   if (groupFunc) {
     const listGrouped = _.compact(
       (list || []).map((data) => {
-        // const appobj = makeAppObj(data, appObjectParams);
         const matcher = AppObjectComponent.createMatcher && AppObjectComponent.createMatcher(data);
         if (matcher && !matcher(filter)) return null;
         const component = createComponent(data);

packages/web/src/appobj/ConnectionAppObject.js

@@ -69,9 +69,6 @@ function ConnectionAppObject({ data, commonProps }) {
   const setOpenedConnections = useSetOpenedConnections();
   const currentDatabase = useCurrentDatabase();
 
-  // const key = _id;
-  // const isExpandable = openedConnections.includes(_id);
-  // const matcher = (filter) => filterName(filter, displayName, server);
   const isBold = _.get(currentDatabase, 'connection._id') == _id;
   const onClick = () => setOpenedConnections((c) => [...c, _id]);
 
@@ -102,20 +99,6 @@ function ConnectionAppObject({ data, commonProps }) {
       Menu={Menu}
     />
   );
-
-  // return {
-  //   title,
-  //   key,
-  //   icon,
-  //   Menu,
-  //   matcher,
-  //   isBold,
-  //   isExpandable,
-  //   onClick,
-  //   statusIcon,
-  //   statusTitle,
-  //   extInfo,
-  // };
 }
 
 ConnectionAppObject.extractKey = (data) => data._id;

packages/web/src/appobj/DatabaseObjectAppObject.js

@@ -174,7 +174,6 @@ function Menu({ data }) {
 function DatabaseObjectAppObject({ data, commonProps }) {
   const { conid, database, pureName, schemaName, objectTypeField } = data;
   const setOpenedTabs = useSetOpenedTabs();
-  // const Icon = (props) => getIconImage(icons[objectTypeField], props);
   const onClick = ({ schemaName, pureName }) => {
     openDatabaseObjectDetail(
       setOpenedTabs,
@@ -189,8 +188,6 @@ function DatabaseObjectAppObject({ data, commonProps }) {
       }
     );
   };
-  // const matcher = (filter) => filterName(filter, pureName);
-  // const groupTitle = _.startCase(objectTypeField);
 
   return (
     <AppObjectCore
@@ -202,7 +199,6 @@ function DatabaseObjectAppObject({ data, commonProps }) {
       Menu={Menu}
     />
   );
-  // return { title, key, icon, Menu, onClick, matcher, groupTitle };
 }
 
 DatabaseObjectAppObject.extractKey = ({ schemaName, pureName }) =>
@@ -210,6 +206,4 @@ DatabaseObjectAppObject.extractKey = ({ schemaName, pureName }) =>
 
 DatabaseObjectAppObject.createMatcher = ({ pureName }) => (filter) => filterName(filter, pureName);
 
-// DatabaseObjectAppObject.groupTitle = ({ pureName }) => (filter) => filterName(filter, pureName);
-
 export default DatabaseObjectAppObject;