Skip to content

Persistent repo selection #8

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

Merged
craigomatic merged 1 commit into from
Mar 17, 2023
Merged

Persistent repo selection #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions samples/apps/github-qna-webapp-react/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ const App: FC = () => {
const [keyConfig, setKeyConfig] = useState<IKeyConfig>();
const [appState, setAppState] = useState<AppState>(AppState.ProbeForFunction);
const [selectedTabValue, setSelectedTabValue] = useState<string>('completion');
const [project, setProject] = useState<string>();
const [branch, setBranch] = useState<string>();
const [project, setProject] = useState<string>('');
const [branch, setBranch] = useState<string>('');

useEffect(() => {
changeAppState(appState);
Expand Down Expand Up @@ -187,6 +187,8 @@ const App: FC = () => {
<GitHubProjectSelection
keyConfig={keyConfig!}
uri={process.env.REACT_APP_FUNCTION_URI as string}
prevProject={project}
prevBranch={branch}
onLoadProject={(project, branch) => {
setProject(project);
setBranch(branch);
Expand Down
34 changes: 26 additions & 8 deletions samples/apps/github-qna-webapp-react/src/components/GitHubRepoSelection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,31 @@

import { Body1, Button, Input, Label, Spinner, Title3 } from '@fluentui/react-components';
import { ArrowDownload16Regular, CheckmarkCircle20Filled } from '@fluentui/react-icons';
import { FC, useState } from 'react';
import React, { FC, useState } from 'react';
import { useSemanticKernel } from '../hooks/useSemanticKernel';
import { IKeyConfig } from '../model/KeyConfig';

interface IData {
uri: string;
keyConfig: IKeyConfig;
prevProject: string;
prevBranch: string;
onBack: () => void;
onLoadProject: (project: string, branch: string) => void;
}

const GitHubProjectSelection: FC<IData> = ({ uri, keyConfig, onLoadProject, onBack }) => {
const [project, setProject] = useState<string>();
const [branch, setBranch] = useState<string>();
const GitHubProjectSelection: FC<IData> = ({ uri, keyConfig, prevProject, prevBranch, onLoadProject, onBack }) => {
const [project, setProject] = useState<string>(prevProject);
const [branch, setBranch] = useState<string>(prevBranch);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [isLoaded, setIsLoaded] = useState<boolean>(false);
const [isLoaded, setIsLoaded] = useState<boolean>(project !== '' && branch !== '');
const [isLoadError, setIsLoadError] = useState<boolean>(false);
const sk = useSemanticKernel(uri);

const isSameProjectAndBranch = () => {
return project === prevProject && branch === prevBranch && project !== '' && branch !== '';
}

const download = async () => {
try {
setIsLoading(true);
Expand Down Expand Up @@ -48,6 +54,14 @@ const GitHubProjectSelection: FC<IData> = ({ uri, keyConfig, onLoadProject, onBa
}
};

React.useEffect(() => {
setIsLoaded(isSameProjectAndBranch())
}, [project]);

React.useEffect(() => {
setIsLoaded(isSameProjectAndBranch())
}, [branch]);

return (
<div style={{ paddingTop: 20, gap: 20, display: 'flex', flexDirection: 'column', alignItems: 'left' }}>
<Title3 style={{ alignItems: 'left' }}>Enter in the GitHub Project URL</Title3>
Expand All @@ -64,7 +78,9 @@ const GitHubProjectSelection: FC<IData> = ({ uri, keyConfig, onLoadProject, onBa
style={{ width: '100%' }}
type="text"
value={project}
onChange={(e) => setProject(e.target.value)}
onChange={(e) => {
setProject(e.target.value);
}}
placeholder="https://github.com/microsoft/semantic-kernel"
/>
</div>
Expand All @@ -76,11 +92,13 @@ const GitHubProjectSelection: FC<IData> = ({ uri, keyConfig, onLoadProject, onBa
style={{ width: '100%' }}
type="text"
value={branch}
onChange={(e) => setBranch(e.target.value)}
onChange={(e) => {
setBranch(e.target.value);
}}
placeholder="main"
/>
<Button
disabled={project === undefined || branch === undefined || isLoading}
disabled={isLoading || isLoaded || project === '' || branch === '' }
appearance="transparent"
icon={<ArrowDownload16Regular />}
onClick={() => download()}
Expand Down