Issue 098 - Hide Create New button on Download page

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 = "/";
 

src/fileshelter/ui/FileShelterApplication.cpp

@@ -26,6 +26,8 @@
 #include <Wt/WMenu.h>
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
+#include <Wt/WAnchor.h>
+#include <Wt/WHBoxLayout.h>
 
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
@@ -139,19 +141,19 @@ 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);
- }
- {
- auto menuItem = menu->addItem(Wt::WString::tr("msg-tos"));
- menuItem->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/tos"});
- menuItem->setSelectable(true);
- }
+
+ menuItemShareCreate = menu->addItem(Wt::WString::tr("msg-share-create"));
+ menuItemShareCreate->setLink(Wt::WLink {Wt::LinkType::InternalPath, "/share-create"});
+ menuItemShareCreate->setSelectable(true);
+
+ 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
@@ -168,6 +170,24 @@ FileShelterApplication::initialize()
  });
 
  handlePathChange(mainStack);
+
+ FS_LOG(UI, INFO) << "end init";
+}
+
+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

src/fileshelter/ui/FileShelterApplication.hpp

@@ -36,7 +36,8 @@ 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; }
@@ -46,7 +47,10 @@ namespace UserInterface
  void notify(const Wt::WEvent& event) override;
 
  void displayError(std::string_view error);
-
+
+ Wt::WMenuItem* menuItemShareCreate;
+ Wt::WMenuItem* menuItemTos;
+
  static inline std::filesystem::path _workingDirectory;
  };
 

src/fileshelter/ui/ShareCreate.cpp

@@ -29,6 +29,7 @@
 #include "ProgressBar.hpp"
 #include "ShareCreateFormView.hpp"
 #include "ShareCreatePassword.hpp"
+#include "FileShelterApplication.hpp"
 
 namespace UserInterface
 {
@@ -71,6 +72,9 @@ namespace UserInterface
 
  if (!wApp->internalPathMatches("/share-create"))
  return;
+
+ auto app = dynamic_cast<FileShelterApplication*>(Wt::WApplication::instance());
+ app->updateMenuVisibility();
 
  if (!_isPasswordVerified && PasswordUtils::isUploadPassordRequired())
  displayPassword();

src/fileshelter/ui/ShareCreated.cpp

@@ -28,7 +28,7 @@
 #include "share/Types.hpp"
 
 #include "ShareUtils.hpp"
-
+#include "FileShelterApplication.hpp"
 
 namespace UserInterface {
 
@@ -49,7 +49,10 @@ ShareCreated::handlePathChanged()
 
  if (!wApp->internalPathMatches("/share-created"))
  return;
-
+
+ auto app = dynamic_cast<FileShelterApplication*>(Wt::WApplication::instance());
+ app->updateMenuVisibility();
+
  try
  {
  const Share::ShareEditUUID shareEditUUID {wApp->internalPathNextPart("/share-created/")};

src/fileshelter/ui/ShareDownload.cpp

@@ -33,6 +33,7 @@
 #include "Exception.hpp"
 #include "ShareDownloadPassword.hpp"
 #include "ShareUtils.hpp"
+#include "FileShelterApplication.hpp"
 
 namespace UserInterface {
 
@@ -53,8 +54,11 @@ ShareDownload::handlePathChanged()
 
  if (!wApp->internalPathMatches("/share-download"))
  return;
-
- try
+
+ auto app = dynamic_cast<FileShelterApplication*>(Wt::WApplication::instance());
+ app->updateMenuVisibility();
+
+ try
  {
  const Share::ShareUUID shareUUID {wApp->internalPathNextPart("/share-download/")};
 

src/fileshelter/ui/ShareEdit.cpp

@@ -32,6 +32,7 @@
 #include "share/Types.hpp"
 
 #include "ShareUtils.hpp"
+#include "FileShelterApplication.hpp"
 
 namespace UserInterface
 {
@@ -53,6 +54,9 @@ namespace UserInterface
 
  if (!wApp->internalPathMatches("/share-edit"))
  return;
+
+ auto app = dynamic_cast<FileShelterApplication*>(Wt::WApplication::instance());
+ app->updateMenuVisibility();
 
  try
  {