From 415b67204d56bd7c12562e8436152a3ad2528c97 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 25 Mar 2022 21:45:48 +0530 Subject: [PATCH] fix: backup push --- .../app/routes/Apps/Gluu/GluuProperties.js | 1 + admin-ui/app/utils/ApiResources.js | 1 + .../components/UserManagement/Timezones.js | 388 ++++++++++++++++++ .../components/UserManagement/UserAddPage.js | 31 ++ .../components/UserManagement/UserForm.js | 143 +++++++ .../components/UserManagement/UserList.js | 9 +- admin-ui/plugins/admin/plugin-metadata.js | 12 +- 7 files changed, 578 insertions(+), 7 deletions(-) create mode 100644 admin-ui/plugins/admin/components/UserManagement/Timezones.js create mode 100644 admin-ui/plugins/admin/components/UserManagement/UserAddPage.js create mode 100644 admin-ui/plugins/admin/components/UserManagement/UserForm.js diff --git a/admin-ui/app/routes/Apps/Gluu/GluuProperties.js b/admin-ui/app/routes/Apps/Gluu/GluuProperties.js index 0299487e5..c084e1533 100644 --- a/admin-ui/app/routes/Apps/Gluu/GluuProperties.js +++ b/admin-ui/app/routes/Apps/Gluu/GluuProperties.js @@ -12,6 +12,7 @@ function GluuProperties({ valuePlaceholder, options, }) { + console.log(options) const [properties, setProperties] = useState(options) const { t } = useTranslation() diff --git a/admin-ui/app/utils/ApiResources.js b/admin-ui/app/utils/ApiResources.js index 382998d75..fa7271d2e 100644 --- a/admin-ui/app/utils/ApiResources.js +++ b/admin-ui/app/utils/ApiResources.js @@ -9,3 +9,4 @@ export const LDAP = 'ldap' export const SQL = 'sql' export const COUCHBASE = 'couchbase' export const CACHE = 'cache' +export const USERS = 'user_management' diff --git a/admin-ui/plugins/admin/components/UserManagement/Timezones.js b/admin-ui/plugins/admin/components/UserManagement/Timezones.js new file mode 100644 index 000000000..e693f9dc2 --- /dev/null +++ b/admin-ui/plugins/admin/components/UserManagement/Timezones.js @@ -0,0 +1,388 @@ +export const timezones = [ + 'Africa/Abidjan', + 'Africa/Accra', + 'Africa/Algiers', + 'Africa/Bissau', + 'Africa/Cairo', + 'Africa/Casablanca', + 'Africa/Ceuta', + 'Africa/El_Aaiun', + 'Africa/Johannesburg', + 'Africa/Juba', + 'Africa/Khartoum', + 'Africa/Lagos', + 'Africa/Maputo', + 'Africa/Monrovia', + 'Africa/Nairobi', + 'Africa/Ndjamena', + 'Africa/Sao_Tome', + 'Africa/Tripoli', + 'Africa/Tunis', + 'Africa/Windhoek', + 'America/Adak', + 'America/Anchorage', + 'America/Araguaina', + 'America/Argentina/Buenos_Aires', + 'America/Argentina/Catamarca', + 'America/Argentina/Cordoba', + 'America/Argentina/Jujuy', + 'America/Argentina/La_Rioja', + 'America/Argentina/Mendoza', + 'America/Argentina/Rio_Gallegos', + 'America/Argentina/Salta', + 'America/Argentina/San_Juan', + 'America/Argentina/San_Luis', + 'America/Argentina/Tucuman', + 'America/Argentina/Ushuaia', + 'America/Asuncion', + 'America/Atikokan', + 'America/Bahia', + 'America/Bahia_Banderas', + 'America/Barbados', + 'America/Belem', + 'America/Belize', + 'America/Blanc-Sablon', + 'America/Boa_Vista', + 'America/Bogota', + 'America/Boise', + 'America/Cambridge_Bay', + 'America/Campo_Grande', + 'America/Cancun', + 'America/Caracas', + 'America/Cayenne', + 'America/Chicago', + 'America/Chihuahua', + 'America/Costa_Rica', + 'America/Creston', + 'America/Cuiaba', + 'America/Curacao', + 'America/Danmarkshavn', + 'America/Dawson', + 'America/Dawson_Creek', + 'America/Denver', + 'America/Detroit', + 'America/Edmonton', + 'America/Eirunepe', + 'America/El_Salvador', + 'America/Fort_Nelson', + 'America/Fortaleza', + 'America/Glace_Bay', + 'America/Goose_Bay', + 'America/Grand_Turk', + 'America/Guatemala', + 'America/Guayaquil', + 'America/Guyana', + 'America/Halifax', + 'America/Havana', + 'America/Hermosillo', + 'America/Indiana/Indianapolis', + 'America/Indiana/Knox', + 'America/Indiana/Marengo', + 'America/Indiana/Petersburg', + 'America/Indiana/Tell_City', + 'America/Indiana/Vevay', + 'America/Indiana/Vincennes', + 'America/Indiana/Winamac', + 'America/Inuvik', + 'America/Iqaluit', + 'America/Jamaica', + 'America/Juneau', + 'America/Kentucky/Louisville', + 'America/Kentucky/Monticello', + 'America/La_Paz', + 'America/Lima', + 'America/Los_Angeles', + 'America/Maceio', + 'America/Managua', + 'America/Manaus', + 'America/Martinique', + 'America/Matamoros', + 'America/Mazatlan', + 'America/Menominee', + 'America/Merida', + 'America/Metlakatla', + 'America/Mexico_City', + 'America/Miquelon', + 'America/Moncton', + 'America/Monterrey', + 'America/Montevideo', + 'America/Nassau', + 'America/New_York', + 'America/Nipigon', + 'America/Nome', + 'America/Noronha', + 'America/North_Dakota/Beulah', + 'America/North_Dakota/Center', + 'America/North_Dakota/New_Salem', + 'America/Nuuk', + 'America/Ojinaga', + 'America/Panama', + 'America/Pangnirtung', + 'America/Paramaribo', + 'America/Phoenix', + 'America/Port-au-Prince', + 'America/Port_of_Spain', + 'America/Porto_Velho', + 'America/Puerto_Rico', + 'America/Punta_Arenas', + 'America/Rainy_River', + 'America/Rankin_Inlet', + 'America/Recife', + 'America/Regina', + 'America/Resolute', + 'America/Rio_Branco', + 'America/Santarem', + 'America/Santiago', + 'America/Santo_Domingo', + 'America/Sao_Paulo', + 'America/Scoresbysund', + 'America/Sitka', + 'America/St_Johns', + 'America/Swift_Current', + 'America/Tegucigalpa', + 'America/Thule', + 'America/Thunder_Bay', + 'America/Tijuana', + 'America/Toronto', + 'America/Vancouver', + 'America/Whitehorse', + 'America/Winnipeg', + 'America/Yakutat', + 'America/Yellowknife', + 'Antarctica/Casey', + 'Antarctica/Davis', + 'Antarctica/DumontDUrville', + 'Antarctica/Macquarie', + 'Antarctica/Mawson', + 'Antarctica/Palmer', + 'Antarctica/Rothera', + 'Antarctica/Syowa', + 'Antarctica/Troll', + 'Antarctica/Vostok', + 'Asia/Almaty', + 'Asia/Amman', + 'Asia/Anadyr', + 'Asia/Aqtau', + 'Asia/Aqtobe', + 'Asia/Ashgabat', + 'Asia/Atyrau', + 'Asia/Baghdad', + 'Asia/Baku', + 'Asia/Bangkok', + 'Asia/Barnaul', + 'Asia/Beirut', + 'Asia/Bishkek', + 'Asia/Brunei', + 'Asia/Chita', + 'Asia/Choibalsan', + 'Asia/Colombo', + 'Asia/Damascus', + 'Asia/Dhaka', + 'Asia/Dili', + 'Asia/Dubai', + 'Asia/Dushanbe', + 'Asia/Famagusta', + 'Asia/Gaza', + 'Asia/Hebron', + 'Asia/Ho_Chi_Minh', + 'Asia/Hong_Kong', + 'Asia/Hovd', + 'Asia/Irkutsk', + 'Asia/Jakarta', + 'Asia/Jayapura', + 'Asia/Jerusalem', + 'Asia/Kabul', + 'Asia/Kamchatka', + 'Asia/Karachi', + 'Asia/Kathmandu', + 'Asia/Khandyga', + 'Asia/Kolkata', + 'Asia/Krasnoyarsk', + 'Asia/Kuala_Lumpur', + 'Asia/Kuching', + 'Asia/Macau', + 'Asia/Magadan', + 'Asia/Makassar', + 'Asia/Manila', + 'Asia/Nicosia', + 'Asia/Novokuznetsk', + 'Asia/Novosibirsk', + 'Asia/Omsk', + 'Asia/Oral', + 'Asia/Pontianak', + 'Asia/Pyongyang', + 'Asia/Qatar', + 'Asia/Qostanay', + 'Asia/Qyzylorda', + 'Asia/Riyadh', + 'Asia/Sakhalin', + 'Asia/Samarkand', + 'Asia/Seoul', + 'Asia/Shanghai', + 'Asia/Singapore', + 'Asia/Srednekolymsk', + 'Asia/Taipei', + 'Asia/Tashkent', + 'Asia/Tbilisi', + 'Asia/Tehran', + 'Asia/Thimphu', + 'Asia/Tokyo', + 'Asia/Tomsk', + 'Asia/Ulaanbaatar', + 'Asia/Urumqi', + 'Asia/Ust-Nera', + 'Asia/Vladivostok', + 'Asia/Yakutsk', + 'Asia/Yangon', + 'Asia/Yekaterinburg', + 'Asia/Yerevan', + 'Atlantic/Azores', + 'Atlantic/Bermuda', + 'Atlantic/Canary', + 'Atlantic/Cape_Verde', + 'Atlantic/Faroe', + 'Atlantic/Madeira', + 'Atlantic/Reykjavik', + 'Atlantic/South_Georgia', + 'Atlantic/Stanley', + 'Australia/Adelaide', + 'Australia/Brisbane', + 'Australia/Broken_Hill', + 'Australia/Darwin', + 'Australia/Eucla', + 'Australia/Hobart', + 'Australia/Lindeman', + 'Australia/Lord_Howe', + 'Australia/Melbourne', + 'Australia/Perth', + 'Australia/Sydney', + 'CET', + 'CST6CDT', + 'EET', + 'EST', + 'EST5EDT', + 'Etc/GMT', + 'Etc/GMT+1', + 'Etc/GMT+10', + 'Etc/GMT+11', + 'Etc/GMT+12', + 'Etc/GMT+2', + 'Etc/GMT+3', + 'Etc/GMT+4', + 'Etc/GMT+5', + 'Etc/GMT+6', + 'Etc/GMT+7', + 'Etc/GMT+8', + 'Etc/GMT+9', + 'Etc/GMT-1', + 'Etc/GMT-10', + 'Etc/GMT-11', + 'Etc/GMT-12', + 'Etc/GMT-13', + 'Etc/GMT-14', + 'Etc/GMT-2', + 'Etc/GMT-3', + 'Etc/GMT-4', + 'Etc/GMT-5', + 'Etc/GMT-6', + 'Etc/GMT-7', + 'Etc/GMT-8', + 'Etc/GMT-9', + 'Etc/UTC', + 'Europe/Amsterdam', + 'Europe/Andorra', + 'Europe/Astrakhan', + 'Europe/Athens', + 'Europe/Belgrade', + 'Europe/Berlin', + 'Europe/Brussels', + 'Europe/Bucharest', + 'Europe/Budapest', + 'Europe/Chisinau', + 'Europe/Copenhagen', + 'Europe/Dublin', + 'Europe/Gibraltar', + 'Europe/Helsinki', + 'Europe/Istanbul', + 'Europe/Kaliningrad', + 'Europe/Kiev', + 'Europe/Kirov', + 'Europe/Lisbon', + 'Europe/London', + 'Europe/Luxembourg', + 'Europe/Madrid', + 'Europe/Malta', + 'Europe/Minsk', + 'Europe/Monaco', + 'Europe/Moscow', + 'Europe/Oslo', + 'Europe/Paris', + 'Europe/Prague', + 'Europe/Riga', + 'Europe/Rome', + 'Europe/Samara', + 'Europe/Saratov', + 'Europe/Simferopol', + 'Europe/Sofia', + 'Europe/Stockholm', + 'Europe/Tallinn', + 'Europe/Tirane', + 'Europe/Ulyanovsk', + 'Europe/Uzhgorod', + 'Europe/Vienna', + 'Europe/Vilnius', + 'Europe/Volgograd', + 'Europe/Warsaw', + 'Europe/Zaporozhye', + 'Europe/Zurich', + 'HST', + 'Indian/Chagos', + 'Indian/Christmas', + 'Indian/Cocos', + 'Indian/Kerguelen', + 'Indian/Mahe', + 'Indian/Maldives', + 'Indian/Mauritius', + 'Indian/Reunion', + 'MET', + 'MST', + 'MST7MDT', + 'PST8PDT', + 'Pacific/Apia', + 'Pacific/Auckland', + 'Pacific/Bougainville', + 'Pacific/Chatham', + 'Pacific/Chuuk', + 'Pacific/Easter', + 'Pacific/Efate', + 'Pacific/Enderbury', + 'Pacific/Fakaofo', + 'Pacific/Fiji', + 'Pacific/Funafuti', + 'Pacific/Galapagos', + 'Pacific/Gambier', + 'Pacific/Guadalcanal', + 'Pacific/Guam', + 'Pacific/Honolulu', + 'Pacific/Kiritimati', + 'Pacific/Kosrae', + 'Pacific/Kwajalein', + 'Pacific/Majuro', + 'Pacific/Marquesas', + 'Pacific/Nauru', + 'Pacific/Niue', + 'Pacific/Norfolk', + 'Pacific/Noumea', + 'Pacific/Pago_Pago', + 'Pacific/Palau', + 'Pacific/Pitcairn', + 'Pacific/Pohnpei', + 'Pacific/Port_Moresby', + 'Pacific/Rarotonga', + 'Pacific/Tahiti', + 'Pacific/Tarawa', + 'Pacific/Tongatapu', + 'Pacific/Wake', + 'Pacific/Wallis', + 'WET', +] diff --git a/admin-ui/plugins/admin/components/UserManagement/UserAddPage.js b/admin-ui/plugins/admin/components/UserManagement/UserAddPage.js new file mode 100644 index 000000000..9a6fe9704 --- /dev/null +++ b/admin-ui/plugins/admin/components/UserManagement/UserAddPage.js @@ -0,0 +1,31 @@ +import React from 'react' +import { useHistory } from 'react-router-dom' +import { Container, CardBody, Card } from '../../../../app/components' +import UserForm from './UserForm' +import GluuAlert from '../../../../app/routes/Apps/Gluu/GluuAlert' +import { useTranslation } from 'react-i18next' + +function UserAddPage() { + const userAction = {} + const history = useHistory() + const { t } = useTranslation() + + return ( + + {/* */} + + + + + + + + + + ) +} +export default UserAddPage diff --git a/admin-ui/plugins/admin/components/UserManagement/UserForm.js b/admin-ui/plugins/admin/components/UserManagement/UserForm.js new file mode 100644 index 000000000..b09cf6e4f --- /dev/null +++ b/admin-ui/plugins/admin/components/UserManagement/UserForm.js @@ -0,0 +1,143 @@ +import React, { useState } from 'react' +import { useFormik } from 'formik' +import * as Yup from 'yup' +import { + Col, + InputGroup, + CustomInput, + Form, + FormGroup, + Input, +} from '../../../../app/components' +import GluuLabel from '../../../../app/routes/Apps/Gluu/GluuLabel' +import GluuInumInput from '../../../../app/routes/Apps/Gluu/GluuInumInput' +import GluuProperties from '../../../../app/routes/Apps/Gluu/GluuProperties' +import Counter from '../../../../app/components/Widgets/GroupedButtons/Counter' +import GluuCommitFooter from '../../../../app/routes/Apps/Gluu/GluuCommitFooter' +import GluuCommitDialog from '../../../../app/routes/Apps/Gluu/GluuCommitDialog' +import GluuTooltip from '../../../../app/routes/Apps/Gluu/GluuTooltip' +import { SCRIPT, USERS } from '../../../../app/utils/ApiResources' +import { useTranslation } from 'react-i18next' +import { timezones } from './Timezones' +function UserForm() { + const { t } = useTranslation() + const [init, setInit] = useState(false) + const [modal, setModal] = useState(false) + + return ( +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {timezones.map((data, key) => ( + + ))} + + + + + + + + + + + +
+ ) +} + +export default UserForm diff --git a/admin-ui/plugins/admin/components/UserManagement/UserList.js b/admin-ui/plugins/admin/components/UserManagement/UserList.js index e957bb06d..e9970328d 100644 --- a/admin-ui/plugins/admin/components/UserManagement/UserList.js +++ b/admin-ui/plugins/admin/components/UserManagement/UserList.js @@ -11,6 +11,7 @@ import { useTranslation } from 'react-i18next' import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper' import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon' import applicationStyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle' +import { useHistory } from 'react-router-dom' import { hasPermission, buildPayload, @@ -36,6 +37,11 @@ function UserList(props) { const options = [] const userAction = {} const pageSize = localStorage.getItem('paggingSize') || 10 + const history = useHistory() + + function handleGoToUserAddPage() { + return history.push('/adm/usermanagement/add') + } if (hasPermission(permissions, ROLE_WRITE)) { myActions.push({ @@ -43,7 +49,7 @@ function UserList(props) { tooltip: `${t('messages.add_role')}`, iconProps: { color: 'primary' }, isFreeAction: true, - onClick: () => console.log('HELLO'), + onClick: () => handleGoToUserAddPage(), }) } @@ -60,6 +66,7 @@ function UserList(props) { // toggle() // doFetchList() // } + return ( diff --git a/admin-ui/plugins/admin/plugin-metadata.js b/admin-ui/plugins/admin/plugin-metadata.js index eded898ca..fc340ef95 100644 --- a/admin-ui/plugins/admin/plugin-metadata.js +++ b/admin-ui/plugins/admin/plugin-metadata.js @@ -1,7 +1,7 @@ import HealthPage from './components/Health/HealthPage' import ReportPage from './components/Reports/ReportPage' -import LicenseDetailsPage from './components/Configuration/LicenseDetailsPage' import UserList from './components/UserManagement/UserList' +import UserAddPage from './components/UserManagement/UserAddPage' import UiRoleListPage from './components/Roles/UiRoleListPage' import UiPermListPage from './components/Permissions/UiPermListPage' import MappingPage from './components/Mapping/MappingPage' @@ -76,7 +76,7 @@ const pluginMetadata = { }, { title: 'menus.user_management', - path: PLUGIN_BASE_APTH + '/usermanagement', + path: PLUGIN_BASE_APTH + '/usersmanagement', permission: ACR_READ, }, ], @@ -134,13 +134,13 @@ const pluginMetadata = { permission: ACR_READ, }, { - component: LicenseDetailsPage, - path: PLUGIN_BASE_APTH + '/licenseDetails', + component: UserList, + path: PLUGIN_BASE_APTH + '/usersmanagement', permission: ACR_READ, }, { - component: UserList, - path: PLUGIN_BASE_APTH + '/usermanagement', + component: UserAddPage, + path: PLUGIN_BASE_APTH + '/usermanagement/add', permission: ACR_READ, }, ],