Add pipeline credential management section to start pipeline modal

openshift · Apr 13, 2020 · 117f929 · 117f929
1 parent 6af7521
commit 117f929
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 28 deletions.
diff --git a/...nd/packages/dev-console/src/components/pipelines/pipeline-form/PipelineSecretSection.scss b/...nd/packages/dev-console/src/components/pipelines/pipeline-form/PipelineSecretSection.scss
@@ -1,12 +1,12 @@
 .odc-pipeline-secret-section {
-  margin-top: calc(-1 * var(--pf-global--spacer--sm));
+  margin-top: var(--pf-global--spacer--sm);
   padding-left: var(--pf-global--spacer--lg);
   &__secret-form {
     border: 1px dashed var(--pf-global--BorderColor--100);
     padding: var(--pf-global--spacer--md);
   }
   &__secret-action {
-    margin-top: calc(-1 * var(--pf-global--spacer--sm));
+    margin-top: var(--pf-global--spacer--sm);
     padding-left: 0;
   }
 }

diff --git a/frontend/packages/dev-console/src/components/pipelines/pipeline-form/SecretForm.tsx b/frontend/packages/dev-console/src/components/pipelines/pipeline-form/SecretForm.tsx
@@ -21,7 +21,7 @@ const authTypes = {
 };
 
 const renderSecretForm = (
-  type: string,
+  type: SecretType,
   stringData: {
     [key: string]: any;
   },
@@ -61,24 +61,22 @@ const SecretForm: React.FC<FormikValues> = ({
     [SecretType.dockerconfigjson]: {},
   });
 
-  const setValues = (type) => {
-    type === SecretType.dockerconfigjson
-      ? setFieldValue(
-          'formData',
-          _.mapValues({ '.dockerconfigjson': stringData[type] }, JSON.stringify),
-        )
-      : setFieldValue('formData', stringData[type]);
+  const setValues = (type: SecretType) => {
+    if (type === SecretType.dockerconfigjson) {
+      setFieldValue(
+        'formData',
+        _.mapValues({ '.dockerconfigjson': stringData[type] }, JSON.stringify),
+      );
+    } else {
+      setFieldValue('formData', stringData[type]);
+    }
   };
 
   const onDataChanged = (event) => {
     setStringData((prevState) => _.merge({}, prevState, { [values.type]: event }));
     setValues(values.type);
   };
 
-  const handleTypeChange = (type) => {
-    setValues(type);
-  };
-
   return (
     <div className="odc-secret-form">
       <h1 className="odc-secret-form__title">Create Secret</h1>
@@ -103,7 +101,7 @@ const SecretForm: React.FC<FormikValues> = ({
           label="Authentication Type"
           items={authTypes}
           title={authTypes[values.type]}
-          onChange={handleTypeChange}
+          onChange={(type: SecretType) => setValues(type)}
           fullWidth
           required
         />

diff --git a/frontend/packages/dev-console/src/components/pipelines/pipeline-form/SecretsList.scss b/frontend/packages/dev-console/src/components/pipelines/pipeline-form/SecretsList.scss
@@ -1,8 +1,5 @@
 .odc-secrets-list {
-  &__secrets {
-    &--item {
-      margin-top: var(--pf-global--spacer--sm);
-    }
-    padding-bottom: var(--pf-global--spacer--md);
+  &__secretsItem {
+    margin-top: var(--pf-global--spacer--sm);
   }
 }
diff --git a/frontend/packages/dev-console/src/components/pipelines/pipeline-form/SecretsList.tsx b/frontend/packages/dev-console/src/components/pipelines/pipeline-form/SecretsList.tsx
@@ -25,12 +25,12 @@ type SecretsListProps = {
 const secretTypes = [SecretType.dockerconfigjson, SecretType.basicAuth, SecretType.sshAuth];
 
 const Secrets: React.FC<SecretsProps> = ({ secrets, serviceaccounts }) => {
-  const servicAccountSecrets = _.map(serviceaccounts.data.secrets, 'name');
+  const serviceAccountSecrets = _.map(serviceaccounts.data.secrets, 'name');
   const filterData = _.filter(
     secrets.data,
     (secret) =>
       _.includes(secretTypes, secret.type) &&
-      _.includes(servicAccountSecrets, secret.metadata.name),
+      _.includes(serviceAccountSecrets, secret.metadata.name),
   );
   const sortedFilterData = _.sortBy(filterData, (data) => data.metadata.name);
 
@@ -41,7 +41,7 @@ const Secrets: React.FC<SecretsProps> = ({ secrets, serviceaccounts }) => {
         {sortedFilterData.map((secret) => {
           return (
             <ResourceLink
-              className="odc-secrets-list__secrets--item"
+              className="odc-secrets-list__secretsItem"
               key={secret.metadata.uid}
               kind={SecretModel.kind}
               name={secret.metadata.name}

diff --git a/frontend/public/module/k8s/types.ts b/frontend/public/module/k8s/types.ts
@@ -612,12 +612,12 @@ export type Patch = {
 export type RollingUpdate = { maxUnavailable?: number | string; maxSurge?: number | string };
 export type DeploymentUpdateStrategy =
   | {
-    type: 'Recreate';
-  }
+      type: 'Recreate';
+    }
   | {
-    type: 'RollingUpdate';
-    rollingUpdate: RollingUpdate;
-  };
+      type: 'RollingUpdate';
+      rollingUpdate: RollingUpdate;
+    };
 
 export type MachineDeploymentKind = {
   spec: {