diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/services/loader.js b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/services/loader.js index e094d749d07..9c3ba88f116 100644 --- a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/services/loader.js +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/services/loader.js @@ -125,6 +125,7 @@ function getLocations(scriptId) { '/platform-core/ui/blimpkit/input.js', '/platform-core/ui/blimpkit/link.js', '/platform-core/ui/blimpkit/list.js', + '/platform-core/ui/blimpkit/loader.js', '/platform-core/ui/blimpkit/menu.js', '/platform-core/ui/blimpkit/message-box.js', '/platform-core/ui/blimpkit/message-page.js', @@ -144,6 +145,7 @@ function getLocations(scriptId) { '/platform-core/ui/blimpkit/table.js', '/platform-core/ui/blimpkit/textarea.js', '/platform-core/ui/blimpkit/tile.js', + '/platform-core/ui/blimpkit/title.js', '/platform-core/ui/blimpkit/token.js', '/platform-core/ui/blimpkit/tokenizer.js', '/platform-core/ui/blimpkit/tool-header.js', diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/blimpkit.js b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/blimpkit.js index 81a53970635..78b34ddb556 100644 --- a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/blimpkit.js +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/blimpkit.js @@ -10,7 +10,7 @@ * SPDX-License-Identifier: EPL-2.0 */ const blimpkit = angular.module('blimpKit', ['ngAria']) - .info({ version: '1.0.9' }) + .info({ version: '1.1.0' }) .constant('ScreenEdgeMargin', { FULL: 16, DOUBLE: 32, diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/loader.js b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/loader.js new file mode 100644 index 00000000000..06f881f05d1 --- /dev/null +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/loader.js @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2024 Eclipse Dirigible contributors + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v20.html + * + * SPDX-FileCopyrightText: Eclipse Dirigible contributors + * SPDX-License-Identifier: EPL-2.0 + */ +blimpkit.directive('bkLoader', (classNames) => ({ + restrict: 'E', + transclude: false, + replace: true, + scope: { + size: '@?', + contrast: ' { + scope.getClasses = () => classNames('bk-loader', { + 'bk-loader--l': scope.size === 'l', + 'bk-loader--contrast': scope.contrast === true, + }); + }, + template: '
' +})); \ No newline at end of file diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/title.js b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/title.js index 41006da6d5e..447dc0218d0 100644 --- a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/title.js +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/blimpkit/title.js @@ -9,33 +9,25 @@ * SPDX-FileCopyrightText: Eclipse Dirigible contributors * SPDX-License-Identifier: EPL-2.0 */ -blimpkit.directive('bkTitle', function () { - /** - * headerSize: Number - If specified overrides the size of the heading element. Must be a number between 1 and 6 inclusive - * wrap: Boolean - Whether or not the title should wrap - */ - return { - restrict: 'A', - scope: { - headerSize: '<', - wrap: ' ({ + restrict: 'A', + scope: { + headerSize: '<', + wrap: ' { + element.addClass('fd-title'); + if (scope.wrap) element.addClass(`fd-title--wrap`); - function setHeaderSize(_newSize, oldSize) { - if (scope.headerSize) { - if (scope.headerSize >= 1 && scope.headerSize <= 6) { - if (oldSize) element.removeClass(`fd-title--h${oldSize}`); - element.addClass(`fd-title--h${scope.headerSize}`); - } else console.error(`bk-title error: 'header-size' must be a number between 1 and 6 inclusive`); - } + function setHeaderSize(_newSize, oldSize) { + if (scope.headerSize) { + if (scope.headerSize >= 1 && scope.headerSize <= 6) { + if (oldSize) element.removeClass(`fd-title--h${oldSize}`); + element.addClass(`fd-title--h${scope.headerSize}`); + } else console.error(`bk-title error: invalid 'header-size' value`); } - const headerSizeWatcher = scope.$watch('headerSize', setHeaderSize); - scope.$on('$destroy', function () { - headerSizeWatcher(); - }); } + const headerSizeWatcher = scope.$watch('headerSize', setHeaderSize); + scope.$on('$destroy', () => { headerSizeWatcher() }); } -}); \ No newline at end of file +})); \ No newline at end of file diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/platform/shell.js b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/platform/shell.js index 321120a96b3..151c290a701 100644 --- a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/platform/shell.js +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/platform/shell.js @@ -427,7 +427,7 @@ angular.module('platformShell', ['ngCookies', 'platformUser', 'platformExtension }, template: `
- + {{ busy }}
diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/blimpkit.css b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/blimpkit.css index 6bef36fa33b..8a6a16b49f8 100644 --- a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/blimpkit.css +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/blimpkit.css @@ -196,6 +196,60 @@ ng-transclude:empty { color: var(--sapSelectedColor, #fecc04); } +/* Loader */ + +.bk-loader { + --bkLoader_Size: 1rem; + --bkLoader_BorderWidth: 0.125rem; + --bkLoader_Color: var(--fdBusy_Indicator_Dot_Color); + display: block; + border: var(--bkLoader_BorderWidth) solid transparent; + border-radius: 50%; + border-top: var(--bkLoader_BorderWidth) solid var(--bkLoader_Color); + border-bottom: var(--bkLoader_BorderWidth) solid var(--bkLoader_Color); + box-sizing: border-box; + width: var(--bkLoader_Size); + height: var(--bkLoader_Size); + -webkit-animation: loader 1.6s linear infinite; + animation: loader 1.6s linear infinite; +} + +.bk-loader--l { + --bkLoader_Size: 2rem; + --bkLoader_BorderWidth: 0.25rem; +} + +.bk-loader--contrast { + --bkLoader_Color: var(--fdBusy_Indicator_Dot_Contrast_Color); +} + +.fd-list__item>.bk-loader:first-child { + -webkit-margin-start: -0.125rem; + margin-inline-start: -0.125rem; + -webkit-margin-end: 0.875rem; + margin-inline-end: 0.875rem; +} + +@-webkit-keyframes loader { + 0% { + -webkit-transform: rotate(0deg); + } + + 100% { + -webkit-transform: rotate(360deg); + } +} + +@keyframes loader { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } +} + /* General helper classes */ .bk-padding--tiny { padding: 0.5rem; diff --git a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/shell.css b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/shell.css index 2fb8a464d9f..a812bbfdc96 100644 --- a/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/shell.css +++ b/components/platform/platform-core/src/main/resources/META-INF/dirigible/platform-core/ui/styles/shell.css @@ -95,6 +95,11 @@ body { box-sizing: border-box; } +.statusbar-busy { + padding-inline: 0.5rem; + gap: 0.5rem; +} + .statusbar-busy, .statusbar-message, .statusbar-error { diff --git a/components/security/security-basic/src/main/resources/public/error.html b/components/security/security-basic/src/main/resources/public/error.html index 346bbf417e2..55224853f0d 100644 --- a/components/security/security-basic/src/main/resources/public/error.html +++ b/components/security/security-basic/src/main/resources/public/error.html @@ -15,57 +15,42 @@ - - + - - Unexpected Error Occurred - - - + + + + - - -
- - Unexpected Error Occurred - - There was a problem serving the requested page. -
- Usually this means that an enexpected error - happened while processing your request. Here's what you can try next: -
-
- Reload the page, the problem may be temporary. If the problem persists, contact us - and we'll - help get you on your way. - - - - - - - -
+ + + Unexpected Error Occurred + + There was a problem serving the requested page. + Usually this means that an enexpected error happened while processing your request. + Here's what you can try next: + Reload the page, the problem may be temporary. + If the problem persists, contact usand we'll help get you on your way. + + + + + + + diff --git a/components/security/security-basic/src/main/resources/public/error/403.html b/components/security/security-basic/src/main/resources/public/error/403.html index 8f6c5964c19..e907b4f5d81 100644 --- a/components/security/security-basic/src/main/resources/public/error/403.html +++ b/components/security/security-basic/src/main/resources/public/error/403.html @@ -15,38 +15,33 @@ - - + - - Access Denied - - - - + + + + - + + -
- - Access Denied - - The page you're trying to access has resctricted access. -
- Contact your system administrator for more details. - - -
+ + + Access Denied + + The page you're trying to access has resctricted access. + Contact your system administrator for more details. + + + diff --git a/components/security/security-basic/src/main/resources/public/error/404.html b/components/security/security-basic/src/main/resources/public/error/404.html index f230f84d5b9..05af07cdee0 100644 --- a/components/security/security-basic/src/main/resources/public/error/404.html +++ b/components/security/security-basic/src/main/resources/public/error/404.html @@ -15,56 +15,40 @@ - - + - - Page Not Found - - - + + + + - - -
- - Page Not Found - - It looks like you've reached a URL that doesn't exist. -
- The page you are looking for is no longer here, or never existed in the first place. -
-
- You can go to the previous page, or start over from the home page. - - - - - - - - -
+ + + Page Not Found + + It looks like you've reached a URL that doesn't exist. + The page you are looking for is no longer here, or never existed in the first place. + You can go to the previous page, or start over from the home page. + + + + + + + diff --git a/components/security/security-basic/src/main/resources/public/error/500.html b/components/security/security-basic/src/main/resources/public/error/500.html index b6af41de448..42ee66c13ea 100644 --- a/components/security/security-basic/src/main/resources/public/error/500.html +++ b/components/security/security-basic/src/main/resources/public/error/500.html @@ -15,54 +15,39 @@ - - + - - Internal Server Error - - - + + + + - - -
- - Internal Server Error - - Oh no! Internal server error has occured!. -
-
- You can go to the previous page, or start over from the home page. - - - - - - - - -
+ + + Internal Server Error + + Oh no! Internal server error has occured! + You can go to the previous page, or start over from the home page. + + + + + + + diff --git a/components/security/security-basic/src/main/resources/static/index-busy.html b/components/security/security-basic/src/main/resources/static/index-busy.html index 94dacc55978..8b1c44b4ee1 100644 --- a/components/security/security-basic/src/main/resources/static/index-busy.html +++ b/components/security/security-basic/src/main/resources/static/index-busy.html @@ -15,76 +15,86 @@ - - + - - Loading ... - - - - + + + + + + + +
+

Preparing the Instance

+ + + + + {{::job.name}} + + + Loading job list... +
+ + Encounterd an error! + Error retreiving the health status + + diff --git a/components/security/security-basic/src/main/resources/static/logout.html b/components/security/security-basic/src/main/resources/static/logout.html index 07030430bd9..865112a9aff 100644 --- a/components/security/security-basic/src/main/resources/static/logout.html +++ b/components/security/security-basic/src/main/resources/static/logout.html @@ -12,51 +12,35 @@ --> - - - + - - + - - Logged out - - - + + + + - - -
- - You've successfully logged out! - - Click here to login again. - -
- - + + + + You've successfully logged out! + + + +
+ diff --git a/components/security/security-keycloak/src/main/resources/public/error.html b/components/security/security-keycloak/src/main/resources/public/error.html index 346bbf417e2..c4260f153cc 100644 --- a/components/security/security-keycloak/src/main/resources/public/error.html +++ b/components/security/security-keycloak/src/main/resources/public/error.html @@ -15,57 +15,42 @@ - - + - - Unexpected Error Occurred - - - + + + + - - -
- - Unexpected Error Occurred - - There was a problem serving the requested page. -
- Usually this means that an enexpected error - happened while processing your request. Here's what you can try next: -
-
- Reload the page, the problem may be temporary. If the problem persists, contact us - and we'll - help get you on your way. - - - - - - - -
+ + + Unexpected Error Occurred + + There was a problem serving the requested page. + Usually this means that an enexpected error + happened while processing your request. Here's what you can try next: + Reload the page, the problem may be temporary. + If the problem persists, contact us and we'll help get you on your way. + + + + + + + diff --git a/components/security/security-keycloak/src/main/resources/public/error/403.html b/components/security/security-keycloak/src/main/resources/public/error/403.html index 8f6c5964c19..918761e2fc8 100644 --- a/components/security/security-keycloak/src/main/resources/public/error/403.html +++ b/components/security/security-keycloak/src/main/resources/public/error/403.html @@ -15,38 +15,31 @@ - - + - - Access Denied - - - + + + + - - -
- - Access Denied - - The page you're trying to access has resctricted access. -
- Contact your system administrator for more details. - - -
+ + + Access Denied + + The page you're trying to access has resctricted access. + Contact your system administrator for more details. + + + diff --git a/components/security/security-keycloak/src/main/resources/public/error/404.html b/components/security/security-keycloak/src/main/resources/public/error/404.html index f230f84d5b9..2656597936e 100644 --- a/components/security/security-keycloak/src/main/resources/public/error/404.html +++ b/components/security/security-keycloak/src/main/resources/public/error/404.html @@ -15,56 +15,40 @@ - - + - - Page Not Found - - - + + + + - - -
- - Page Not Found - - It looks like you've reached a URL that doesn't exist. -
- The page you are looking for is no longer here, or never existed in the first place. -
-
- You can go to the previous page, or start over from the home page. - - - - - - - - -
+ + + Page Not Found + + It looks like you've reached a URL that doesn't exist. + The page you are looking for is no longer here, or never existed in the first place. + You can go to the previous page, or start over from the home page. + + + + + + + diff --git a/components/security/security-keycloak/src/main/resources/public/error/500.html b/components/security/security-keycloak/src/main/resources/public/error/500.html index b6af41de448..e0cc643b3e0 100644 --- a/components/security/security-keycloak/src/main/resources/public/error/500.html +++ b/components/security/security-keycloak/src/main/resources/public/error/500.html @@ -15,54 +15,39 @@ - - + - - Internal Server Error - - - + + + + - - -
- - Internal Server Error - - Oh no! Internal server error has occured!. -
-
- You can go to the previous page, or start over from the home page. - - - - - - - - -
+ + + Internal Server Error + + Oh no! Internal server error has occured! + You can go to the previous page, or start over from the home page. + + + + + + + diff --git a/components/security/security-keycloak/src/main/resources/static/index-busy.html b/components/security/security-keycloak/src/main/resources/static/index-busy.html index 94dacc55978..8b1c44b4ee1 100644 --- a/components/security/security-keycloak/src/main/resources/static/index-busy.html +++ b/components/security/security-keycloak/src/main/resources/static/index-busy.html @@ -15,76 +15,86 @@ - - + - - Loading ... - - - - + + + + + + + +
+

Preparing the Instance

+ + + + + {{::job.name}} + + + Loading job list... +
+ + Encounterd an error! + Error retreiving the health status + + diff --git a/components/security/security-keycloak/src/main/resources/static/logout.html b/components/security/security-keycloak/src/main/resources/static/logout.html index 07030430bd9..865112a9aff 100644 --- a/components/security/security-keycloak/src/main/resources/static/logout.html +++ b/components/security/security-keycloak/src/main/resources/static/logout.html @@ -12,51 +12,35 @@ --> - - - + - - + - - Logged out - - - + + + + - - -
- - You've successfully logged out! - - Click here to login again. - -
- - + + + + You've successfully logged out! + + + +
+ diff --git a/components/security/security-oauth2/src/main/resources/public/error.html b/components/security/security-oauth2/src/main/resources/public/error.html index 346bbf417e2..4282ba44b27 100644 --- a/components/security/security-oauth2/src/main/resources/public/error.html +++ b/components/security/security-oauth2/src/main/resources/public/error.html @@ -15,57 +15,42 @@ - - + - - Unexpected Error Occurred - - - + + + + - - -
- - Unexpected Error Occurred - - There was a problem serving the requested page. -
- Usually this means that an enexpected error - happened while processing your request. Here's what you can try next: -
-
- Reload the page, the problem may be temporary. If the problem persists, contact us - and we'll - help get you on your way. - - - - - - - -
+ + + Unexpected Error Occurred + + There was a problem serving the requested page. + Usually this means that an enexpected error happened while processing your request. + Here's what you can try next: + Reload the page, the problem may be temporary. + If the problem persists, contact us and we'll help get you on your way. + + + + + + + diff --git a/components/security/security-oauth2/src/main/resources/public/error/403.html b/components/security/security-oauth2/src/main/resources/public/error/403.html index 8f6c5964c19..5f8e2fd036c 100644 --- a/components/security/security-oauth2/src/main/resources/public/error/403.html +++ b/components/security/security-oauth2/src/main/resources/public/error/403.html @@ -15,38 +15,31 @@ - - + - - Access Denied - - - + + + + - - -
- - Access Denied - - The page you're trying to access has resctricted access. -
- Contact your system administrator for more details. - - -
+ + + Access Denied + + The page you're trying to access has resctricted access. + Contact your system administrator for more details. + + + diff --git a/components/security/security-oauth2/src/main/resources/public/error/404.html b/components/security/security-oauth2/src/main/resources/public/error/404.html index f230f84d5b9..62f749ab18d 100644 --- a/components/security/security-oauth2/src/main/resources/public/error/404.html +++ b/components/security/security-oauth2/src/main/resources/public/error/404.html @@ -15,56 +15,40 @@ - - + - - Page Not Found - - - + + + + - - -
- - Page Not Found - - It looks like you've reached a URL that doesn't exist. -
- The page you are looking for is no longer here, or never existed in the first place. -
-
- You can go to the previous page, or start over from the home page. - - - - - - - - -
+ + + Page Not Found + + It looks like you've reached a URL that doesn't exist. + The page you are looking for is no longer here, or never existed in the first place. + You can go to the previous page, or start over from the home page. + + + + + + + diff --git a/components/security/security-oauth2/src/main/resources/public/error/500.html b/components/security/security-oauth2/src/main/resources/public/error/500.html index b6af41de448..4485ed4289b 100644 --- a/components/security/security-oauth2/src/main/resources/public/error/500.html +++ b/components/security/security-oauth2/src/main/resources/public/error/500.html @@ -15,54 +15,39 @@ - - + - - Internal Server Error - - - + + + + - - -
- - Internal Server Error - - Oh no! Internal server error has occured!. -
-
- You can go to the previous page, or start over from the home page. - - - - - - - - -
+ + + Internal Server Error + + Oh no! Internal server error has occured! + You can go to the previous page, or start over from the home page. + + + + + + + diff --git a/components/security/security-oauth2/src/main/resources/static/index-busy.html b/components/security/security-oauth2/src/main/resources/static/index-busy.html index 2465ebbf27e..8b1c44b4ee1 100644 --- a/components/security/security-oauth2/src/main/resources/static/index-busy.html +++ b/components/security/security-oauth2/src/main/resources/static/index-busy.html @@ -12,88 +12,89 @@ --> - - - + - - Loading ... - - - - + + + + + + + +
+

Preparing the Instance

+ + + + + {{::job.name}} + + + Loading job list... +
+ + Encounterd an error! + Error retreiving the health status + + diff --git a/components/security/security-oauth2/src/main/resources/static/logout.html b/components/security/security-oauth2/src/main/resources/static/logout.html index 07030430bd9..865112a9aff 100644 --- a/components/security/security-oauth2/src/main/resources/static/logout.html +++ b/components/security/security-oauth2/src/main/resources/static/logout.html @@ -12,51 +12,35 @@ --> - - - + - - + - - Logged out - - - + + + + - - -
- - You've successfully logged out! - - Click here to login again. - -
- - + + + + You've successfully logged out! + + + +
+ diff --git a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java index 169b8f84165..f1b353a0067 100644 --- a/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java +++ b/tests/tests-framework/src/main/java/org/eclipse/dirigible/tests/framework/HtmlElementType.java @@ -19,7 +19,7 @@ public enum HtmlElementType { SPAN("span"), // HEADER3("h3"), // DIV("div"), // - FD_MESSAGE_PAGE_TITLE("fd-message-page-title"), // + FD_MESSAGE_PAGE_TITLE("bk-message-page-title"), // HEADER1("h1"); private final String type;