foreman_webhooks 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b02cc3608aff370684d6d34c74f2fe15f794353bd2306e87ad00e15666d4ba2
-  data.tar.gz: 12bf2e494176a7659adb7c34e22a40d20222d2d3f9e807333de78de96963fd3d
+  metadata.gz: 11967cfaa258f41f6eb8da34eff7cac3ffd49a0cab95c91e238f8c65945f4fbc
+  data.tar.gz: f843b1328b7468d718346008d107ae4fb3792a3d72cce7cdcc36ed9c9a38f310
 SHA512:
-  metadata.gz: 8c78d4b90cc00f17c9a1c2dcee266f6dbb3282a882df71917a03393ad28c2c6dee9f911ebfcee49b09eddd530a4af1d7dd5468416373ef3745d6b292ea9801c1
-  data.tar.gz: a7305852c794911f35efc349061a2c6ad7839269d4c3fd1e51a2ab322ef8cc825b837231d7e67c9fd439e41068bcec361519b6418975055489cc706f9477ee9e
+  metadata.gz: 399113aecc0426b5755fea689c673aeb6168b87243558581bbe16ffaff3653d7c7db41ed0c4bb5f8ac775c61242d49528e824633c8ce134566de8fa1a79ff0ff
+  data.tar.gz: 8e6143ca148607b43998723d0d1592ba90bc8592842bc1bf7c7ed02ad162e9b152a44de90736c1eb5d050b633eb460941aa7f1861396e73053b7007c4d17878b

data/app/views/api/v2/webhooks/show.json.rabl

@@ -15,6 +15,10 @@ attributes :target_url,
            :ssl_ca_certs,
            :user
 
+node :password_set do |webhook|
+  webhook.password.present?
+end
+
 child :webhook_template do
   extends 'api/v2/webhook_templates/base'
 end

data/lib/foreman_webhooks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWebhooks
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/ForemanFormikField.js

@@ -21,6 +21,8 @@ const ForemanFormikField = ({
   placeholder,
   options,
   isLoading,
+  disabled,
+  setDisabled,
 }) => (
   <FormikField name={name}>
     {({
@@ -32,6 +34,15 @@ const ForemanFormikField = ({
 
         return filter(initialOptions, o => o.value === fieldValue);
       };
+      const passwordInput = (
+        <input
+          {...field}
+          placeholder={disabled ? '********' : ''}
+          type={type}
+          disabled={disabled}
+          className="form-control"
+        />
+      );
       let content = null;
       switch (type) {
         case 'textarea':
@@ -56,10 +67,30 @@ const ForemanFormikField = ({
               onChange={selected =>
                 setFieldValue(field.name, selected[0]?.value)
               }
-              // onBlur={e => setFieldTouched(field.name, true)}
             />
           );
           break;
+        case 'password':
+          content = setDisabled ? (
+            <div className="input-group">
+              {passwordInput}
+              <span className="input-group-btn">
+                <button
+                  className="btn btn-default"
+                  onClick={e => {
+                    e.preventDefault();
+                    setDisabled(!disabled);
+                  }}
+                  title={__('Change the password')}
+                >
+                  <span className="pficon pficon-edit" />
+                </button>
+              </span>
+            </div>
+          ) : (
+            passwordInput
+          );
+          break;
         default:
           content = (
             <input
@@ -101,6 +132,8 @@ ForemanFormikField.propTypes = {
   placeholder: PropTypes.string,
   options: PropTypes.array,
   isLoading: PropTypes.bool,
+  disabled: PropTypes.bool,
+  setDisabled: PropTypes.func,
 };
 
 ForemanFormikField.defaultProps = {
@@ -112,6 +145,8 @@ ForemanFormikField.defaultProps = {
   placeholder: '',
   options: null,
   isLoading: false,
+  disabled: false,
+  setDisabled: undefined,
 };
 
 export default ForemanFormikField;

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/Components/WebhookFormTabs.js

@@ -18,6 +18,8 @@ const WebhookFormTabs = ({
   availableEvents,
   isTemplatesLoading,
   isEventsLoading,
+  isPasswordDisabled,
+  setIsPasswordDisabled,
 }) => (
   <Tabs activeKey={activeTab} onSelect={handleTabClick} isFilled>
     <Tab
@@ -90,6 +92,8 @@ const WebhookFormTabs = ({
           type="password"
           label={__('Password')}
           labelHelp={__('Authentication credentials')}
+          disabled={isPasswordDisabled}
+          setDisabled={setIsPasswordDisabled}
         />
         <ForemanFormikField
           name="verify_ssl"
@@ -153,11 +157,15 @@ WebhookFormTabs.propTypes = {
   availableEvents: PropTypes.array.isRequired,
   isTemplatesLoading: PropTypes.bool.isRequired,
   isEventsLoading: PropTypes.bool.isRequired,
+  isPasswordDisabled: PropTypes.bool,
+  setIsPasswordDisabled: PropTypes.func,
 };
 
 WebhookFormTabs.defaultProps = {
   disabled: false,
   formProps: {},
+  isPasswordDisabled: false,
+  setIsPasswordDisabled: undefined,
 };
 
 export default WebhookFormTabs;

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/WebhookForm.js

@@ -25,6 +25,8 @@ const WebhookForm = ({
   availableEvents,
   isTemplatesLoading,
   isEventsLoading,
+  isPasswordDisabled,
+  setIsPasswordDisabled,
 }) => {
   const webhookTemplates = templates.map(t => ({ value: t.id, label: t.name }));
 
@@ -51,6 +53,8 @@ const WebhookForm = ({
         availableEvents={availableEvents}
         isEventsLoading={isEventsLoading}
         isTemplatesLoading={isTemplatesLoading}
+        isPasswordDisabled={isPasswordDisabled}
+        setIsPasswordDisabled={setIsPasswordDisabled}
       />
     </ForemanForm>
   );
@@ -64,6 +68,13 @@ WebhookForm.propTypes = {
   availableEvents: PropTypes.array.isRequired,
   isEventsLoading: PropTypes.bool.isRequired,
   isTemplatesLoading: PropTypes.bool.isRequired,
+  isPasswordDisabled: PropTypes.bool,
+  setIsPasswordDisabled: PropTypes.func,
+};
+
+WebhookForm.defaultProps = {
+  isPasswordDisabled: false,
+  setIsPasswordDisabled: undefined,
 };
 
 export default WebhookForm;

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/__tests__/__snapshots__/WebhookForm.test.js.snap

@@ -241,6 +241,7 @@ exports[`WebhookForm rendering should render for edit page 1`] = `
       ]
     }
     isEventsLoading={false}
+    isPasswordDisabled={false}
     isTemplatesLoading={false}
     webhookTemplates={
       Array [
@@ -492,6 +493,7 @@ exports[`WebhookForm rendering should render for new page 1`] = `
       ]
     }
     isEventsLoading={false}
+    isPasswordDisabled={false}
     isTemplatesLoading={false}
     webhookTemplates={
       Array [

data/webpack/ForemanWebhooks/Routes/Webhooks/Components/WebhookForm/index.js

@@ -24,7 +24,13 @@ import {
 
 const params = { page: 1, search: 'snippet = false', per_page: 'all' };
 
-const ConnectedWebhookForm = ({ onCancel, handleSubmit, initialValues }) => {
+const ConnectedWebhookForm = ({
+  onCancel,
+  handleSubmit,
+  initialValues,
+  isPasswordDisabled,
+  setIsPasswordDisabled,
+}) => {
   const dispatch = useDispatch();
 
   const templates = useSelector(selectWebhookTemplates);
@@ -60,6 +66,8 @@ const ConnectedWebhookForm = ({ onCancel, handleSubmit, initialValues }) => {
       initialValues={initialValues}
       isTemplatesLoading={isTemplatesLoading}
       isEventsLoading={isEventsLoading}
+      isPasswordDisabled={isPasswordDisabled}
+      setIsPasswordDisabled={setIsPasswordDisabled}
     />
   );
 };
@@ -68,6 +76,13 @@ ConnectedWebhookForm.propTypes = {
   onCancel: PropTypes.func.isRequired,
   handleSubmit: PropTypes.func.isRequired,
   initialValues: PropTypes.object.isRequired,
+  isPasswordDisabled: PropTypes.bool,
+  setIsPasswordDisabled: PropTypes.func,
+};
+
+ConnectedWebhookForm.defaultProps = {
+  isPasswordDisabled: false,
+  setIsPasswordDisabled: undefined,
 };
 
 export default ConnectedWebhookForm;

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookCreateModal.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Modal } from 'patternfly-react';
 import { useDispatch } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -47,11 +48,12 @@ const WebhookCreateModal = ({ onSuccess, onCancel }) => {
   return (
     <ForemanModal
       id={WEBHOOK_CREATE_MODAL_ID}
-      title={__('Create Webhook')}
       backdrop="static"
       className="webhooks-modal"
     >
-      <ForemanModal.Header />
+      <Modal.Header>
+        <Modal.Title>{__('Create Webhook')}</Modal.Title>
+      </Modal.Header>
       <ConnectedWebhookForm
         handleSubmit={handleSubmit}
         initialValues={initialWebhookValues}

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/Components/WebhookEditModal.js

@@ -1,4 +1,5 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
+import { Modal } from 'patternfly-react';
 import { useSelector, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 
@@ -29,22 +30,11 @@ import './WebhookModal.scss';
 const WebhookEditModal = ({ toEdit, onSuccess, onCancel }) => {
   const dispatch = useDispatch();
 
+  const [isPasswordDisabled, setIsPasswordDisabled] = useState(false);
   const id = toEdit;
 
-  const handleSubmit = (values, actions) =>
-    dispatch(
-      submitForm({
-        url: foremanUrl(`/api${WEBHOOKS_PATH}/${id}`),
-        values: { ...values, controller: 'webhooks' },
-        item: 'Webhook',
-        message: __('Webhook was successfully updated.'),
-        method: 'put',
-        successCallback: onSuccess,
-        actions,
-      })
-    );
-
   const isLoading = useSelector(selectIsLoading);
+  const isPasswordSet = useSelector(selectWebhookValues).passwordSet;
   const initialWebhookValues = {
     id: useSelector(selectWebhookValues).id,
     name: useSelector(selectWebhookValues).name,
@@ -62,6 +52,27 @@ const WebhookEditModal = ({ toEdit, onSuccess, onCancel }) => {
     proxy_authorization: useSelector(selectWebhookValues).proxyAuthorization,
   };
 
+  useEffect(() => {
+    setIsPasswordDisabled(isPasswordSet);
+  }, [isPasswordSet]);
+
+  const handleSubmit = (values, actions) => {
+    if (isPasswordDisabled) {
+      delete values.password;
+    }
+    dispatch(
+      submitForm({
+        url: foremanUrl(`/api${WEBHOOKS_PATH}/${id}`),
+        values: { ...values, controller: 'webhooks' },
+        item: 'Webhook',
+        message: __('Webhook was successfully updated.'),
+        method: 'put',
+        successCallback: onSuccess,
+        actions,
+      })
+    );
+  };
+
   useEffect(() => {
     if (id) {
       dispatch(
@@ -73,21 +84,31 @@ const WebhookEditModal = ({ toEdit, onSuccess, onCancel }) => {
     }
   }, [id, dispatch]);
 
+  const onEditCancel = () => {
+    if (isPasswordSet) setIsPasswordDisabled(true);
+    onCancel();
+  };
+
   return (
     <ForemanModal
       id={WEBHOOK_EDIT_MODAL_ID}
-      title={`${__('Edit')} ${initialWebhookValues.name}`}
       backdrop="static"
       className="webhooks-modal"
     >
-      <ForemanModal.Header />
+      <Modal.Header>
+        <Modal.Title>
+          {`${__('Edit')} ${initialWebhookValues.name}`}
+        </Modal.Title>
+      </Modal.Header>
       {isLoading ? (
         <Loading />
       ) : (
         <ConnectedWebhookForm
           handleSubmit={handleSubmit}
           initialValues={initialWebhookValues}
-          onCancel={onCancel}
+          onCancel={onEditCancel}
+          isPasswordDisabled={isPasswordDisabled}
+          setIsPasswordDisabled={setIsPasswordDisabled}
         />
       )}
     </ForemanModal>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc