Issue 098 - Hide Create New button on Download page (#101)

Remove create links from download page optionally, fixes #98
epoupon · Feb 5, 2024 · 069fbc5 · 069fbc5
1 parent a5a88ab
commit 069fbc5
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/conf/fileshelter.conf b/conf/fileshelter.conf
@@ -60,6 +60,9 @@ tos-org = "**[ORG]**";
 tos-url = "**[DEPLOY URL]**/tos";
 tos-support-email = "**[SUPPORT EMAIL ADDRESS]**";
 
+# Set to false if you want to hide links to other Create application pages on the download page
+show-create-links-on-download = true;
+
 # Location for deployment
 deploy-path = "/";
 

diff --git a/src/fileshelter/ui/FileShelterApplication.cpp b/src/fileshelter/ui/FileShelterApplication.cpp
@@ -82,7 +82,10 @@ handlePathChange(Wt::WStackedWidget* stack)
 	{
 		if (wApp->internalPathMatches(index.first))
 		{
+			FsApp->updateMenuVisibility();
+
 			stack->setCurrentIndex(index.second);
+
 			return;
 		}
 	}
@@ -139,19 +142,20 @@ FileShelterApplication::initialize()
 	Wt::WTemplate* main {root()->addNew<Wt::WTemplate>(Wt::WString::tr("template-main"))};
 
 	Wt::WNavigationBar* navbar {main->bindNew<Wt::WNavigationBar>("navbar-top")};
-	navbar->setTitle("<i class=\"fa fa-external-link\"></i> " + Wt::WString::tr("msg-app-name"), Wt::WLink {Wt::LinkType::InternalPath, defaultPath});
+
+	navbar->setTitle(Wt::WString::tr("msg-app-name"));
 
 	Wt::WMenu* menu {navbar->addMenu(std::make_unique<Wt::WMenu>())};
 	{
-		auto menuItem = menu->addItem(Wt::WString::tr("msg-share-create"));
-		menuItem->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/share-create"});
-		menuItem->setSelectable(true);
+		_menuItemShareCreate = menu->addItem(Wt::WString::tr("msg-share-create"));
+		_menuItemShareCreate->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/share-create"});
+		_menuItemShareCreate->setSelectable(true);
 	}
 	{
-		auto menuItem = menu->addItem(Wt::WString::tr("msg-tos"));
-		menuItem->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/tos"});
-		menuItem->setSelectable(true);
-	}
+		Wt::WMenuItem* menuItemTos = menu->addItem(Wt::WString::tr("msg-tos"));
+		menuItemTos->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/tos"});
+		menuItemTos->setSelectable(true);
+	} 
 	Wt::WContainerWidget* container {main->bindNew<Wt::WContainerWidget>("contents")};
 
 	// Same order as Idx enum
@@ -170,6 +174,22 @@ FileShelterApplication::initialize()
 	handlePathChange(mainStack);
 }
 
+void 
+FileShelterApplication::updateMenuVisibility()
+{
+	if (!Service<IConfig>::get()->getBool("show-create-links-on-download", true))
+	{
+		if (wApp->internalPathMatches("/share-download"))
+		{
+			_menuItemShareCreate->hide();
+		}
+		else
+		{
+			_menuItemShareCreate->show();
+		}
+	}
+}
+
 void
 FileShelterApplication::displayError(std::string_view error)
 {

diff --git a/src/fileshelter/ui/FileShelterApplication.hpp b/src/fileshelter/ui/FileShelterApplication.hpp
@@ -36,7 +36,7 @@ namespace UserInterface
 	{
 		public:
 			FileShelterApplication(const Wt::WEnvironment& env);
-
+			void updateMenuVisibility();
 			static std::filesystem::path	prepareUploadDirectory();
 			static FileShelterApplication*	instance();
 			const std::filesystem::path&	getWorkingDirectory() const { return _workingDirectory; }
@@ -47,6 +47,8 @@ namespace UserInterface
 
 			void displayError(std::string_view error);
 
+			Wt::WMenuItem* _menuItemShareCreate;
+
 			static inline std::filesystem::path _workingDirectory;
 	};
 

diff --git a/src/fileshelter/ui/ShareCreated.cpp b/src/fileshelter/ui/ShareCreated.cpp
@@ -29,7 +29,6 @@
 
 #include "ShareUtils.hpp"
 
-
 namespace UserInterface {
 
 ShareCreated::ShareCreated()