bug fix where the docbase new button does not appear

DataManagementLab · Feb 17, 2024 · 440c6fe · 440c6fe
1 parent 8346330
commit 440c6fe
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 34 deletions.
diff --git a/src/components/DocBaseOverview/DocBaseOverview.tsx b/src/components/DocBaseOverview/DocBaseOverview.tsx
@@ -17,12 +17,13 @@ import Icon from '../Icon/Icon';
 
 interface Props {
 	organizationProp: Organization | undefined;
+	counter: number;
 }
 
 /**
  * A list of all DocBases of an organization.
  */
-function DocBaseOverview({ organizationProp }: Props) {
+function DocBaseOverview({ organizationProp, counter }: Props) {
 	const [docBases, setDocBases] = useState<MyDocument[]>([]);
 	const [fileCount, setFileCount] = useState<number>(0);
 	const [selectedOrgID, setSelectedOrgID] = useState<number>(-1);
@@ -38,15 +39,17 @@ function DocBaseOverview({ organizationProp }: Props) {
 	useEffect(() => {
 		APIService.getOrganizationNames().then((orgs) => {
 			let orgID = -1;
-			if (organizationProp !== undefined) {
+			if (selectedOrgID !== -1) {
+				orgID = selectedOrgID;
+			} else if (organizationProp !== undefined) {
 				orgID = organizationProp.id;
 			} else if (orgs !== undefined && orgs.length > 0) {
 				orgID = orgs[0].id;
 			}
 			loadDocBases(orgID);
 		});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, []);
+	}, [organizationProp, counter]);
 
 	const loadDocBases = (orgID: number) => {
 		if (orgID === -1) {

diff --git a/src/views/Home/Home.scss b/src/views/Home/Home.scss
@@ -6,3 +6,17 @@
 .Home {
 	margin-bottom: 100px;
 }
+
+.userStudy {
+	padding: 20px;
+	background-color: #083d60;
+	color: white;
+	width: 50%;
+	a {
+		color: white;
+	}
+	font-size: 20px;
+	border-radius: 15px;
+	border: 2px solid white;
+	box-shadow: 5px 5px 5px #0000008c;
+}
diff --git a/src/views/Home/Home.tsx b/src/views/Home/Home.tsx
@@ -21,6 +21,7 @@ function Home() {
 
 	const [username] = useState(getUserName());
 	const isLoggedIn = useLoggedIn();
+	const [counter, setCounter] = useState(0);
 
 	if (isLoggedIn()) {
 		return (
@@ -37,35 +38,36 @@ function Home() {
 						Hi {username.slice(0, -2)}
 						<span className="db">{username.slice(-2)}</span> 👋
 					</h1>
-					<h2>
-						U<span className="db">se</span>r Study
-					</h2>
-					<p>
-						<b>
-							If you are from the user study, you can download
-							some sample documents{' '}
-							<a
-								href="https://github.com/cophilot/wannadb-sample-txt/archive/refs/heads/main.zip"
-								target="_blank"
-							>
-								here
-							</a>{' '}
-							to use them for the upload.
-						</b>
-					</p>
-					<p>
-						<i>
-							If the link does not download the file, please click{' '}
-							<a
-								href="https://github.com/cophilot/wannadb-sample-txt?tab=readme-ov-file#how-to-download"
-								target="_blank"
-								rel="noreferrer"
-							>
-								here
-							</a>{' '}
-							and download the file manually.
-						</i>
-					</p>
+					<div className="userStudy">
+						<h2>User Study</h2>
+						<p>
+							<b>
+								If you are from the user study, you can download
+								some sample documents{' '}
+								<a
+									href="https://github.com/cophilot/wannadb-sample-txt/archive/refs/heads/main.zip"
+									target="_blank"
+								>
+									here
+								</a>{' '}
+								to use them for the upload.
+							</b>
+						</p>
+						<p>
+							<i>
+								If the link does not download the file, please
+								click{' '}
+								<a
+									href="https://github.com/cophilot/wannadb-sample-txt?tab=readme-ov-file#how-to-download"
+									target="_blank"
+									rel="noreferrer"
+								>
+									here
+								</a>{' '}
+								and download the file manually.
+							</i>
+						</p>
+					</div>
 					<h2>
 						T<span className="db">ip</span>
 					</h2>
@@ -75,11 +77,18 @@ function Home() {
 					<h2>
 						Document <span className="db">Up</span>load
 					</h2>
-					<FileUpload organizationProp={undefined}></FileUpload>
+					<FileUpload
+						organizationProp={undefined}
+						afterUpload={() => {
+							//window.location.reload();
+							setCounter(counter + 1);
+						}}
+					></FileUpload>
 					<h2>
 						Doc<span className="db">Ba</span>se
 					</h2>
 					<DocBaseOverview
+						counter={counter}
 						organizationProp={undefined}
 					></DocBaseOverview>
 					{import.meta.env.VITE_APP_LOG === 'true' && (

diff --git a/src/views/OrgPage/OrgPage.tsx b/src/views/OrgPage/OrgPage.tsx
@@ -25,6 +25,7 @@ function OrgPage() {
 	const [members, setMembers] = useState<string[]>([]);
 	const [documents, setDocuments] = useState<MyDocument[]>([]);
 	const [render, setRender] = useState<boolean>(false);
+	const [counter, setCounter] = useState(0);
 
 	const navigate = useNavigate();
 	const isLoggedIn = useLoggedIn();
@@ -139,11 +140,17 @@ function OrgPage() {
 							organization.id
 						).then((docs) => {
 							setDocuments(docs);
+							setCounter(counter + 1);
 						});
 					}}
 				></FileUpload>
 				<h2>Docbase</h2>
-				{render && <DocBaseOverview organizationProp={organization} />}
+				{render && (
+					<DocBaseOverview
+						organizationProp={organization}
+						counter={counter}
+					/>
+				)}
 				<button
 					className="btn"
 					style={{ marginBottom: '100px', marginTop: '50px' }}