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.

Sign up for GitHub

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

frontend changes #1231

Merged
merged 2 commits into from
Sep 14, 2023
Merged

frontend changes #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ecb90
frontend changes
jedan2506 Sep 12, 2023
541544e
frontend changes
jedan2506 Sep 13, 2023
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
2 changes: 1 addition & 1 deletion gui/pages/Content/APM/ApmDashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ export default function ApmDashboard() {
<td className="table_data text_align_right w_12 br_left_grey">{formatNumber(run.total_tokens)}</td>
<td className="table_data text_align_right w_6 br_left_grey">{run.runs_completed}</td>
<td className="table_data text_align_right w_12 br_left_grey">
{run.runs_completed ? (run.total_tokens / run.runs_completed).toFixed(1) : '-'}
{run.runs_completed ? formatNumber((run.total_tokens / run.runs_completed).toFixed(1)) : '-'}
</td>
<td className="table_data text_align_right br_left_grey" style={{width: '20%'}}>
{run.tools_used && run.tools_used.slice(0, 3).map((tool, index) => (
Expand Down
107 changes: 60 additions & 47 deletions gui/pages/Content/Marketplace/Market.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,6 @@ export default function Market({env, getModels, sendModelData}) {
}
}

const handleOpenTemplateDetails = ({item, contentType}) => {
setLocalStorageValue('market_detail_type', contentType, setDetailType);
setLocalStorageArray('market_item', item, setTemplateData);
setLocalStorageValue('market_item_clicked', true, setItemClicked);
};

const handleBackClick = () => {
setLocalStorageValue('market_item_clicked', false, setItemClicked);
}

EventBus.on('openTemplateDetails', handleOpenTemplateDetails);
EventBus.on('goToMarketplace', handleBackClick);

Expand All @@ -60,44 +50,67 @@ export default function Market({env, getModels, sendModelData}) {
localStorage.setItem('marketplace_tab', tab);
};

const tabData = [
{ id: 'market_tools', label: 'Tools', image: '/images/tools_light.svg' },
{ id: 'market_knowledge', label: 'Knowledge', image: '/images/knowledge.svg' },
{ id: 'market_agents', label: 'Agent Templates', image: '/images/agents_light.svg' },
{ id: 'market_models', label: 'Models', image: '/images/models.svg' },
];

const renderTab = (tab) => {
return (
<button
key={tab.id}
onClick={() => switchTab(tab.id)}
className={activeTab === tab.id ? 'tab_button_selected' : 'tab_button'}
>
<Image width={14} height={14} src={tab.image} alt={`${tab.label}-icon`} />
<span>{tab.label}</span>
</button>
);
};

const handleOpenTemplateDetails = ({ item, contentType }) => {
localStorage.setItem('market_detail_type', contentType);
setDetailType(contentType);
localStorage.setItem('market_item', JSON.stringify(item));
setTemplateData(item);
localStorage.setItem('market_item_clicked', true);
setItemClicked(true);
};

const handleBackClick = () => {
localStorage.setItem('market_item_clicked', false);
setItemClicked(false);
};

return (
<div>
{!itemClicked ? <div className={styles.empty_state}>
<div style={{width: '100%', display: 'flex', flexDirection: 'column'}}>
<div className={styles.detail_top}>
<div style={{display: 'flex', overflowX: 'scroll', marginLeft: '8px'}}>
<button onClick={() => switchTab('market_tools')} className={activeTab === 'market_tools' ? 'tab_button_selected' : 'tab_button'}>
<Image width={14} height={14} src="/images/tools_light.svg" alt="tools-icon"/>
<span>Tools</span>
</button>
<button onClick={() => switchTab('market_knowledge')} className={activeTab === 'market_knowledge' ? 'tab_button_selected' : 'tab_button'}>
<Image width={14} height={14} src="/images/knowledge.svg" alt="knowledge-icon"/>
<span>Knowledge</span>
</button>
<button onClick={() => switchTab('market_agents')} className={activeTab === 'market_agents' ? 'tab_button_selected' : 'tab_button'}>
<Image width={14} height={14} src="/images/agents_light.svg" alt="agent-template-icon"/>
<span>Agent Templates</span>
</button>
<button onClick={() => switchTab('market_models')} className={activeTab === 'market_models' ? 'tab_button_selected' : 'tab_button'}>
<Image width={14} height={14} src="/images/models.svg" alt="model-template-icon"/>
<span>Models</span>
</button>
<div>
{!itemClicked ? (
<div className={styles.empty_state}>
<div style={{ width: '100%', display: 'flex', flexDirection: 'column' }}>
<div className={styles.detail_top}>
<div style={{ display: 'flex', overflowX: 'scroll', marginLeft: '8px' }}>
{tabData.map(renderTab)}
</div>
</div>
<div>
{activeTab === 'market_tools' && <MarketTools />}
{activeTab === 'market_knowledge' && <MarketKnowledge />}
{activeTab === 'market_agents' && <MarketAgent />}
{activeTab === 'market_models' && <MarketModels />}
</div>
</div>
</div>
) : (
<div style={{padding: '0 3px'}}>
{detailType === 'agent_template' && <AgentTemplate env={env} template={templateData}/>}
{detailType === 'knowledge_template' && <KnowledgeTemplate env={env} template={templateData}/>}
{detailType === 'tool_template' && <ToolkitTemplate env={env} template={templateData}/>}
{detailType === 'model_template' && <ModelTemplate env={env} template={templateData} getModels={getModels} sendModelData={sendModelData} />}
</div>
</div>
<div>
{activeTab === 'market_tools' && <MarketTools/>}
{activeTab === 'market_knowledge' && <MarketKnowledge/>}
{activeTab === 'market_agents' && <MarketAgent/>}
{activeTab === 'market_models' && <MarketModels/>}
</div>
</div>
</div> : <div style={{padding: '0 3px'}}>
{detailType === 'agent_template' && <AgentTemplate env={env} template={templateData}/>}
{detailType === 'knowledge_template' && <KnowledgeTemplate env={env} template={templateData}/>}
{detailType === 'tool_template' && <ToolkitTemplate env={env} template={templateData}/>}
{detailType === 'model_template' && <ModelTemplate env={env} template={templateData} getModels={getModels} sendModelData={sendModelData} />}
</div>}
</div>
)}
</div>
);
};
}

2 changes: 1 addition & 1 deletion gui/pages/Dashboard/SideBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function SideBar({onSelectEvent, env}) {
<div className={styles.button_icon}>
<Image width={17} height={17} src={section.icon} alt={`${section.name}-icon`}/>
</div>
<div>{section.name.charAt(0).toUpperCase() + section.name.slice(1)}</div>
{section.name === 'apm' ? <div>APM</div> : <div>{section.name.charAt(0).toUpperCase() + section.name.slice(1)}</div>}
</div>
</div>
))}
Expand Down