This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 9422101b4ea7bac245c4f13d1eb061f8d15daf13
Merge: af4fdfd1b d29c2a471
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Thu Oct 26 10:03:02 2023 -0700
Merge branch 'master' into RANGER-3923
.../react-webapp/src/components/Editable.jsx | 16 +-
.../main/webapp/react-webapp/src/styles/style.css | 7 +
.../webapp/react-webapp/src/utils/XAMessages.js | 4 +-
.../main/webapp/react-webapp/src/utils/XAUtils.js | 28 +-
.../AuditEvent/AdminLogs/PolicyViewDetails.jsx | 179 +++++----
.../views/PolicyListing/AddUpdatePolicyForm.jsx | 430 +++++++++++++++------
.../views/PolicyListing/PolicyConditionsComp.jsx | 2 +-
.../src/views/PolicyListing/PolicyListing.jsx | 15 +-
.../views/PolicyListing/PolicyPermissionItem.jsx | 106 +++--
.../src/views/Resources/ModalResourceComp.jsx | 1 +
.../src/views/Resources/ResourceComp.jsx | 64 ++-
.../src/views/Resources/ResourceSelectComp.jsx | 20 +-
.../src/views/SecurityZone/SecurityZoneForm.jsx | 1 -
.../views/ServiceManager/ServiceAuditFilter.jsx | 1 -
14 files changed, 572 insertions(+), 302 deletions(-)
diff --cc security-admin/src/main/webapp/react-webapp/src/styles/style.css
index f6f3f5529,46e8eeda1..7cb54b7dc
mode 100755,100644..100755
--- a/security-admin/src/main/webapp/react-webapp/src/styles/style.css
+++ b/security-admin/src/main/webapp/react-webapp/src/styles/style.css
@@@ -2559,394 -2554,8 +2559,401 @@@ li.list-group-item:hover
.text-word-break {
word-break: break-all;
}
++
+.gds-table {
+ margin-left: auto;
+ margin-right: auto;
+ width: 700px;
+}
+
+.gds-tr {
+ text-align: center !important;
+ padding-top: 100px;
+ padding-bottom: 20px;
+ padding-left: 30px;
+ padding-right: 40px;
+}
+
+.gds-header-wrapper {
+ background-color: #f3f8f9;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 1rem;
+ border-bottom: 1px solid #d6d6d6;
+ position: sticky;
+ top: 0;
+ z-index: 1;
+}
+
+.gds-form-header-wrapper {
+ background-color: #ffffff;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 1rem;
+ border-bottom: 1px solid #d6d6d6;
+ position: sticky;
+ top: 0;
+ z-index: 1;
+}
+
+.gds-header {
+ color: #222222;
+ font-size: 18px;
+ font-weight: 300;
+ line-height: 20px;
+ margin: 0;
+ padding: 0;
+ text-transform: none;
+ flex: 1;
+}
+
+.gds-header-btn-grp {
+ display: flex;
+ gap: 0.875rem;
+}
+
+.gds-form-wrap {
+ max-width: 880px;
+ margin: 0 auto;
+ background-color: #fff;
+}
+
+.gds-form-header {
+ padding-top: 70px;
+ text-align: center;
+}
+
+.gds-form-step-num {
+ margin-bottom: 1.5rem;
+ text-transform: uppercase;
+ font-size: 1rem;
+}
+
+.gds-form-step-name {
+ font-size: 1.5rem;
+ margin-bottom: 3rem;
+}
+
+.gds-form-content {
+ display: flex;
+ flex-direction: column;
+ gap: 2.5rem;
+}
+
+.gds-form-input {
+ width: 100%;
+}
+
+.gds-add-principle {
+ display: inline-flex;
+ justify-content: space-between;
+ gap: 0.875rem;
+ width: 100%;
+ align-items: flex-start;
+}
+
+.flex-1 {
+ flex: 1;
+}
+
+.gds-text-input {
+ min-height: 40px;
+ margin-bottom: 2rem;
+}
+
+.gds-button {
+ height: 40px;
+}
+
+.gds-tab-content {
+ width: 760px; /* 52.77% . Max screen size 1440px*/
+ margin-left: 120px;
+ margin-top: 40px;
+}
+
+.gds-request-content {
+ width: 920px;
+ margin: 0 auto;
+}
+
+.gds-inline-field-grp {
+ display: inline-flex;
+ flex-direction: column;
+ align-items: flex-start;
+ gap: 1rem;
+ margin-bottom: 2rem;
+}
+
+.gds-inline-listing {
+ border-bottom: 1px solid #eee;
+ margin-bottom: 1rem;
+ padding-bottom: 1rem;
+}
+
+.gds-right-inline-field-grp {
+ display: inline-flex;
+ flex-direction: column;
+ align-items: flex-end;
+ gap: 1rem;
+ margin-bottom: 2rem;
+}
+
+.gds-left-inline-field {
+ width: 160px;
+ flex-shrink: 0;
+}
+
+.gds-right-inline-field {
+ width: 160px;
+ text-align: right;
+ flex-shrink: 0;
+}
+
+.gds-description {
+ border: none;
+}
+
+.gds-content-border {
+ border: 1px solid #eeeeee;
+ border-radius: 16px;
+ padding: 1.5rem 1.25rem 2.5rem 1.25rem;
+}
+
+.gds-content-header {
+ font-size: 1.125rem;
+ padding-bottom: 1rem;
+ border-bottom: 1px solid #eeeeee;
+}
+
+.gds-card-heading {
+ font-size: 1.125rem;
+ padding-bottom: 1rem;
+ border-bottom: 1px solid #dddddd;
+}
+
+.gds-card-heading-border {
+ border-bottom: 1px solid #dddddd;
+}
+
+.gds-acc-card-header {
+ padding: 0.5rem 0.75rem;
+}
+
+.gds-heading-5 {
+ font-size: 1.125rem;
+}
+
+/* .gds-section-title {
+ padding: 1.5rem 1rem 0rem 1rem;
+} */
+
+.gds-flex {
+ display: inline-flex;
+ gap: 0.875rem;
+}
+
+.gds-section-card {
+ padding: 1.5rem 1rem;
+}
+
+.gds-action-card {
+ padding: 1.5rem 1rem;
+ border-radius: 16px;
+}
+
+.gds-action-card .gds-section-title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-bottom: 1px solid #dddddd;
+ padding-bottom: 0.75rem;
+}
+
+.gds-action-card .gds-card-heading {
+ border: 0;
+ font-size: 1.125rem;
+ margin: 0;
+ padding: 0;
+}
+
+.gds-principle-listing {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0.5rem 0rem;
+}
+
+.gds-bg-white {
+ background: white;
+}
+
+.gds-bg-light {
+ background: #fafafa;
+ gap: 0.875rem;
+}
+
+.gds-input {
+ height: 38px;
+}
+
+.gap-1 {
+ gap: 1rem;
+}
+
+.gap-half {
+ gap: 0.5rem;
+}
+
+.gap-one-fourth {
+ gap: 0.25rem;
+}
+
+.gds-access-grant-form {
+ max-width: 1208px;
+ padding: 0.5rem;
+ margin: 0 auto;
+}
+
+.gds-grant-det-cond {
+ margin-bottom: 3rem;
+ flex: 1;
+}
+
+.gds-grant-row {
+ display: grid;
+ grid-gap: 0.5rem;
+ grid-template-columns: 80px 1fr 80px;
+}
+
+.gds-flex {
+ display: flex;
+}
+
+.top-0 {
+ top: 0;
+}
+
+input.gds-placeholder::placeholder,
+textarea.gds-placeholder::placeholder,
+.gds-form-wrap input::placeholder,
+.gds-form-wrap textarea::placeholder {
+ font-size: 13px;
+}
+
+.gds-resource-options .card-header {
+ padding: 0.75rem;
+ background-color: #f2f2f2;
+ border-bottom: 1px solid #ced4da;
+}
+
+.gds-resource-options.card {
+ border: 1px solid #ced4da;
+ overflow: unset;
+}
+
+.gds-chips {
+ display: flex;
+ gap: 0.5rem;
+}
+
+.gds-chips .badge {
+ padding: 0.5rem;
+ background-color: #f2f2f2;
+ font-weight: normal;
+ font-size: 14px;
+}
+
+.gds-res-acc-header a {
+ color: rgba(0, 0, 0, 0.87);
+ font-size: 0.875rem;
+ text-decoration: none;
+ line-height: 1.5;
+}
+
+.gds-res-acc-header i {
+ font-size: 1rem;
+ line-height: 1;
+ height: 16px;
+}
+
+.gds-res-card-body {
+ padding: 1.25rem 0 0 0;
+}
+
+.gds-hr {
+ background: #ced4da;
+}
+
+.gds-added-res-listing .form-label {
+ text-transform: capitalize;
+ color: rgba(0, 0, 0, 0.54);
+}
+
+.gds-opacity-lowest {
+ opacity: 0.2;
+}
+
+.badge-sm {
+ padding: 4px 6px !important;
+ font-size: 12px !important;
+}
+
+.gds-principle-width {
+ max-width: 760px;
+ margin: 0 auto;
+}
+
+.hide-arrow .dropdown-toggle::after {
+ display: none; /* Hide the down arrow */
+}
+
+.gds-requested-status {
+ background: #ffc107;
+}
+
+.gds-granted-status {
+ background: #28a745;
+ color: #ffffff;
+}
+
+.gds-active-status {
+ background: #007bff;
+ color: #ffffff;
+}
+
+.gds-denied-status {
+ background: #dc3545;
+ color: #ffffff;
+}
+
+.w-50 {
+ width: 50% !important;
+}
+
+.gds-label-color {
+ color: #777777;
+}
+
+.autoResizeTextarea {
+ width: 100%;
+ padding: 4px 36px 4px 10px;
+ resize: none;
+ overflow: hidden;
+ border: 1px solid #ccc;
+}
+
+.gds-info-tarea {
+ position: absolute;
+ font-size: 15px;
+ top: 8px;
+ right: 8px;
+ cursor: pointer;
+}
++
+ .resource-block {
+ padding: 0.5rem 0;
+ border-bottom: 1px solid #dddddd;
+ margin:1rem 2rem;
+ }
diff --cc
security-admin/src/main/webapp/react-webapp/src/views/Resources/ResourceComp.jsx
index 42b4eaddc,0067e6ee9..fa4d518f4
mode 100755,100644..100755
---
a/security-admin/src/main/webapp/react-webapp/src/views/Resources/ResourceComp.jsx
+++
b/security-admin/src/main/webapp/react-webapp/src/views/Resources/ResourceComp.jsx
@@@ -39,9 -39,9 +39,10 @@@ export default function ResourceComp(pr
formValues,
serviceDetails,
policyType,
- policyItem,
policyId,
+ name,
- isMultiResources
++ isMultiResources,
+ isGds
} = props;
const [rsrcState, setLoader] = useState({ loader: false, resourceKey: -1 });
const toastId = useRef(null);
