Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
183d24a
app iframe mode
PatrikMatiasko Jul 23, 2023
8809493
app iframe mode
PatrikMatiasko Jul 23, 2023
f4c6a65
app iframe mode
PatrikMatiasko Jul 23, 2023
6060529
app iframe mode
PatrikMatiasko Jul 23, 2023
a12ba7f
app iframe mode
PatrikMatiasko Aug 1, 2023
f3f21bb
app iframe mode
PatrikMatiasko Aug 1, 2023
9a6c30b
app iframe mode
PatrikMatiasko Aug 1, 2023
0337977
app iframe mode
PatrikMatiasko Aug 1, 2023
ba7b475
redirectUri for onboard
PatrikMatiasko Aug 2, 2023
9873293
redirectUri for onboard
PatrikMatiasko Aug 2, 2023
1725509
redirectUri for onboard
PatrikMatiasko Aug 2, 2023
f2d9f6f
iframe mode with parent config from url
PatrikMatiasko Aug 2, 2023
71f84f3
ClientApp Devices moved to shared-ui
PatrikMatiasko Aug 5, 2023
1d7a68e
removed iframe mode
PatrikMatiasko Aug 5, 2023
a55ad7e
renamed reducer
PatrikMatiasko Aug 7, 2023
e9a8981
renamed reducer
PatrikMatiasko Aug 7, 2023
c6decd0
renamed reducer
PatrikMatiasko Aug 7, 2023
ad38a02
update of shared-ui
PatrikMatiasko Aug 8, 2023
67a7616
AppAuthProvider.tsx moved to shared-ui
PatrikMatiasko Aug 9, 2023
74b15c2
InitializedByAnother moved to shared-ui
PatrikMatiasko Aug 10, 2023
ed9b86f
InitializedByAnother moved to shared-ui
PatrikMatiasko Aug 10, 2023
f409188
update of shared-ui
PatrikMatiasko Aug 11, 2023
bb40819
MockApp moved to shared-ui
PatrikMatiasko Aug 11, 2023
a8ec534
MockApp moved to shared-ui
PatrikMatiasko Aug 11, 2023
cc276b2
Merge branch 'main' into pm/iframe-mode
PatrikMatiasko Aug 29, 2023
826f475
missing authority shows InitializedByAnother screen
PatrikMatiasko Aug 29, 2023
55f676b
missing authority shows InitializedByAnother screen
PatrikMatiasko Aug 29, 2023
106e602
Merge branch 'main' into pm/iframe-mode
PatrikMatiasko Sep 24, 2023
298527a
PR update
PatrikMatiasko Sep 24, 2023
28bd326
custom initialization process
PatrikMatiasko Oct 1, 2023
073e457
custom initialization process
PatrikMatiasko Oct 1, 2023
69a1c7d
remote clients merge
PatrikMatiasko Oct 29, 2023
175429c
remote clients merge
PatrikMatiasko Oct 29, 2023
71432e1
shared ui update
PatrikMatiasko Nov 23, 2023
b7f7b65
shared ui update
PatrikMatiasko Nov 23, 2023
8a1d3a4
PSK logout & reset
PatrikMatiasko Nov 24, 2023
ba02423
PSK logout & reset
PatrikMatiasko Nov 24, 2023
6c6e797
Merge branch 'main' into pm/iframe-mode
PatrikMatiasko Nov 27, 2023
724a37b
sonar
PatrikMatiasko Nov 27, 2023
8eb586a
re-initialization update
PatrikMatiasko Nov 29, 2023
69d00b5
re-initialization update
PatrikMatiasko Dec 2, 2023
91afa64
re-initialization update
PatrikMatiasko Dec 2, 2023
36c8e18
no reset for diff owner
PatrikMatiasko Dec 4, 2023
605df09
reFetchConfig after initialization change
PatrikMatiasko Dec 4, 2023
acf9053
reFetchConfig after initialization change
PatrikMatiasko Dec 4, 2023
fe31dc8
data reset for X509
PatrikMatiasko Dec 5, 2023
a6e5b57
data reset for X509
PatrikMatiasko Dec 5, 2023
a7cf882
removed react-bootstrap & boostrap
PatrikMatiasko Dec 5, 2023
c237889
removed react-bootstrap & boostrap
PatrikMatiasko Dec 5, 2023
c8bc46f
Toast fix
PatrikMatiasko Dec 6, 2023
5cf821d
Logo component
PatrikMatiasko Dec 6, 2023
13f90f5
Logo component
PatrikMatiasko Dec 6, 2023
08c2dfb
App cleanup
PatrikMatiasko Dec 6, 2023
aa69eda
App cleanup
PatrikMatiasko Dec 6, 2023
1d3ddae
Redirect to homepage after logout
PatrikMatiasko Dec 6, 2023
8cf2b69
DevicesResourcesModal update
PatrikMatiasko Dec 6, 2023
9098acb
update deps
jkralik Dec 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependency/googleapis
Submodule googleapis updated 1029 files
4 changes: 3 additions & 1 deletion web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ yarn-error.log*
/playwright/test-results/
/playwright/playwright-report/
/playwright/.cache/
/playwright/storageState.json
/playwright/storageState.json

/public/theme
52,518 changes: 23,160 additions & 29,358 deletions web/package-lock.json

Large diffs are not rendered by default.

100 changes: 41 additions & 59 deletions web/package.json
Original file line number Diff line number Diff line change
@@ -1,92 +1,73 @@
{
"name": "plgd-client-application",
"version": "3.0.0",
"private": false,
"private": true,
"dependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/plugin-transform-react-jsx": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@babel/preset-react": "^7.22.5",
"@babel/preset-typescript": "^7.22.5",
"@emotion/babel-plugin": "^11.11.0",
"@emotion/babel-preset-css-prop": "^11.11.0",
"@emotion/react": "^11.11.1",
"@reduxjs/toolkit": "^1.9.5",
"@types/jest": "^28.1.8",
"@types/lodash": "^4.14.195",
"@types/node": "^18.15.11",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@types/react-helmet": "^6.1.6",
"@types/react-table": "^7.7.14",
"@types/url-parse": "^1.4.8",
"@types/uuid": "^9.0.2",
"@typescript-eslint/parser": "^5.61.0",
"axios": "^1.4.0",
"bootstrap": "^5.3.0",
"classnames": "^2.3.2",
"cross-env": "^7.0.2",
"date-fns": "^2.30.0",
"detect-browser": "^5.3.0",
"framer-motion": "^10.12.18",
"@reduxjs/toolkit": "^1.9.7",
"cross-env": "^7.0.3",
"history": "^5.3.0",
"jsoneditor": "^9.10.2",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.21",
"oidc-client": "^1.11.5",
"oidc-react": "^3.2.2",
"postcss-normalize": "^10.0.1",
"postcss-preset-env": "^9.0.0",
"prop-types": "^15.8.1",
"random-words": "^2.0.0",
"postcss-preset-env": "^9.3.0",
"react": "^18.2.0",
"react-avatar": "^5.0.3",
"react-bootstrap": "^2.8.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-intl": "^5.25.1",
"react-intl-po": "^2.2.2",
"react-redux": "^8.1.1",
"react-resize-detector": "^9.1.0",
"react-router-dom": "^6.14.1",
"react-redux": "^8.1.3",
"react-router-dom": "^6.20.0",
"react-scripts": "5.0.1",
"react-select": "^5.7.3",
"react-table": "^7.8.0",
"react-toastify": "^9.1.3",
"redux": "^4.2.1",
"redux-batched-actions": "^0.5.0",
"redux-persist": "^6.0.0",
"typescript": "^4.9.4",
"units-converter": "^1.0.3",
"uuid": "^9.0.0",
"validate.js": "^0.13.1",
"web-vitals": "^3.3.2"
"web-vitals": "^3.5.0"
},
"devDependencies": {
"@babel/cli": "^7.22.6",
"@babel/cli": "^7.23.4",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@babel/preset-env": "^7.23.5",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@craco/craco": "^7.1.0",
"@formatjs/cli": "^6.1.3",
"@formatjs/ts-transformer": "^3.13.3",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
"babel-plugin-formatjs": "^10.5.3",
"eslint": "8.44.0",
"eslint-config-prettier": "^8.8.0",
"@formatjs/cli": "^6.2.4",
"@formatjs/ts-transformer": "^3.13.9",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.10",
"@types/lodash": "^4.14.202",
"@types/node": "^20.10.3",
"@types/react": "^18.2.42",
"@types/react-dom": "^18.2.17",
"@types/react-helmet": "^6.1.11",
"@typescript-eslint/parser": "^6.13.2",
"babel-plugin-formatjs": "^10.5.10",
"eslint": "8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-react-app": "^7.0.1",
"eslint-formatter-pretty": "^5.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.2",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"npm-run-all": "^4.1.5",
"prettier": "2.8.1",
"prettier": "3.1.0",
"react-app-alias-ex": "^2.1.0",
"sass": "^1.63.6",
"sass": "^1.69.5",
"shelljs": "^0.8.5",
"webpack": "^5.88.1"
"typescript": "^4.9.4",
"webpack": "^5.89.0"
},
"overrides": {
"react-refresh": "0.11.0"
},
"scripts": {
"start": "npm run generate-language-files && craco start",
Expand All @@ -97,7 +78,8 @@
"generate-language-files": "node ./scripts/generate-language-files.js",
"lint": "npm-run-all :lint:eslint :lint:prettier",
":lint:eslint": "eslint --ext .js,.jsx,.ts,.tsx -c .eslintrc.js --max-warnings 0 --format=pretty ./src",
":lint:prettier": "prettier ./src --check"
":lint:prettier": "prettier ./src --check",
":generate:theme": "npm run :generate:theme -w @plgd/shared-ui"
},
"workspaces": [
"./packages/*"
Expand Down
2 changes: 1 addition & 1 deletion web/packages/shared-ui
Submodule shared-ui updated 314 files
4 changes: 2 additions & 2 deletions web/playwright/tests/devices/detail/onboard.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { test, expect } from '@playwright/test'
import testId from '../../../../src/testId'
import testId from '../../../../packages/shared-ui/src/app/clientApp/testId'

test('onboard device', async ({ page }) => {
const { WELL_KNOWN_CONFIG, REACT_APP_TEST_LOGIN_USERNAME, REACT_APP_TEST_LOGIN_PASSWORD } = process.env
Expand All @@ -14,7 +14,7 @@ test('onboard device', async ({ page }) => {
// back to page
await page.goto('/')

await page.getByTestId('devsim-server00').click()
// await page.getByTestId('devsim-server00').click()

// is onboarded -> exist offboard button
if (await page.getByTestId(offboardButton).isVisible()) {
Expand Down
1 change: 1 addition & 0 deletions web/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root" style="height: 100vh;"></div>
<div id="modal-root"></div>
<div id="toast-root"></div>
</body>

</html>
16 changes: 16 additions & 0 deletions web/src/containers/App/App.i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,20 @@ export const messages = defineMessages({
id: 'app.clickHere',
defaultMessage: 'Click here!',
},
theme: {
id: 'app.theme',
defaultMessage: 'Theme',
},
configurationUpdated: {
id: 'app.configurationUpdated',
defaultMessage: 'Configuration Updated',
},
configurationUpdatedMessage: {
id: 'app.configurationUpdatedMessage',
defaultMessage: 'The configuration was successfully updated.',
},
config: {
id: 'app.config',
defaultMessage: 'Config',
},
})
30 changes: 1 addition & 29 deletions web/src/containers/App/App.scss
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
@import '~bootstrap/scss/bootstrap';
@import '@/assets/fonts/fontawesome/css/all.min.css';
@import 'react-toastify/dist/ReactToastify.css';

@import '@shared-ui/common/styles/colors.scss';
@import '@shared-ui/common/styles/default.scss';
@import '@shared-ui/common/styles/animations.scss';
@import '@shared-ui/common/styles/form.scss';
@import '@shared-ui/components/Atomic/PageLoader/PageLoader.scss';

@import '@shared-ui/components/Atomic/Table/Table.scss';
@import '@shared-ui/components/Atomic/Table/Pagination.scss';
@import '@shared-ui/components/Atomic/Badge/Badge.scss';
@import '@shared-ui/components/Atomic/Label/Label.scss';
@import '@shared-ui/components/Atomic/Button/Button.scss';
@import '@shared-ui/components/Atomic/Editor/Editor.scss';
@import '@shared-ui/components/Atomic/Toast/Toast.scss';
@import '@shared-ui/components/Atomic/Checkbox/Checkbox.scss';
@import '@shared-ui/components/Atomic/TextField/TextField.scss';
@import '@shared-ui/components/Atomic/TreeExpander/TreeExpander.scss';
@import '@shared-ui/components/Atomic/CopyBox/CopyBox.scss';
@import '@shared-ui/components/Atomic/SplitButton/SplitButton.scss';

html {
height: 100%;
Expand All @@ -31,12 +17,6 @@ body {
#root {
height: 100%;
min-height: 100vh;
//display: flex;
//flex-direction: column;

& > div:first-child{
min-height: 100vh;
}
}

#app {
Expand All @@ -48,14 +28,6 @@ body {
overflow: hidden;
}


// Collapsed menu state
#app.collapsed {
#content {
//margin-left: $left_panel_collapsed;
}
}

.client-error-message,
.page-loading-text {
text-align: center;
Expand Down
Loading