Merge pull request #426 from TeskaLabs/bugfix/display-button-title

Display button titles
TeskaLabs · Jun 14, 2023 · 3a35738 · 3a35738
2 parents b193d29 + 22335e0
commit 3a35738
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -92,6 +92,8 @@
 
 - Remove pointer-events style for tree-menu-item (INDIGO Sprint 230609, [!427](https://github.com/TeskaLabs/asab-webui/pull/427))
 
+- Fixed title display for buttons after a session has ended. Added disabling inputs, Pie chart clickable parts, disabling `tree-menu-item` and reloading the page after clicking the Forward or Backward buttons in the browser (INDIGO Sprint 230609, [!426](https://github.com/TeskaLabs/asab-webui/pull/426))
+
 ## v23.5
 
 ### Features

diff --git a/src/modules/auth/index.js b/src/modules/auth/index.js
@@ -280,14 +280,19 @@ export default class AuthModule extends Module {
 			if (that.App.Store != null) {
 				that.App.Store.dispatch({ type: types.AUTH_SESSION_EXPIRATION, sessionExpired: true });
 				// Disable buttons and pagination in the whole screen
-				[...document.querySelectorAll('[class^="btn"]:not(.alert-button), [class*=" btn"]:not(.alert-button), .page-item')].forEach(i => {
+				[...document.querySelectorAll('[class^="btn"]:not(.alert-button), [class*=" btn"]:not(.alert-button), .btn-group a, .page-item, input, select')].forEach(i => {
 					i.classList.add("disabled");
 					i.setAttribute("disabled", "");
 				});
 				// Disable link without class "nav-link" in the whole screen
 				[...document.querySelectorAll('a:not(.nav-link)')].forEach(i => {
 					i.classList.add("disabled-link");
 				});
+				// Tracks Forward and Backward clicks in the browser and reloads the page
+				window.addEventListener('popstate', () => {
+					window.location.reload();
+
+				});
 			}
 		}
 		else {

diff --git a/src/styles/components/button.scss b/src/styles/components/button.scss
@@ -108,7 +108,9 @@ $btn-dark-outline-hover-bg-color: var(--btn-dark-outline-hover-bg-color);
 		color: $btn-txt;
 	}
 	&.disabled, &:disabled {
-		pointer-events: none;
+		 & [class^="cil-"] {
+			 pointer-events: none;
+		 }
 	}
 }
 
@@ -490,7 +492,6 @@ $btn-dark-outline-hover-bg-color: var(--btn-dark-outline-hover-bg-color);
 		text-decoration: none;
 	}
 	&.disabled, &:disabled, &-sm.disabled, &-sm:disabled {
-		pointer-events: none;
 		filter: opacity(60%);
 		.btn {
 			filter: opacity(100%);

diff --git a/src/styles/components/dropdown.scss b/src/styles/components/dropdown.scss
@@ -45,7 +45,13 @@ $disabled-dropdown-item: var(--disabled-dropdown-item);
 		border: none;
 	}
 }
-
+.dropdown {
+	&.action-button-dropdown {
+		&.disabled, &:disabled {
+			pointer-events: none;
+		}
+	}
+}
 .dropdown-toggle {
 	padding: 8px;
 	color: $toggle-text-color;