show edit option for only resources created via add flow

openshift · Feb 26, 2020 · c8ea1bb · c8ea1bb
1 parent 883c693
commit c8ea1bb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/frontend/packages/dev-console/src/actions/modify-application.ts b/frontend/packages/dev-console/src/actions/modify-application.ts
@@ -1,6 +1,7 @@
 import { KebabOption } from '@console/internal/components/utils';
 import { truncateMiddle } from '@console/internal/components/utils/truncate-middle';
 import { K8sResourceKind, K8sKind } from '@console/internal/module/k8s';
+import { ServiceModel } from '@console/knative-plugin';
 import { RESOURCE_NAME_TRUNCATE_LENGTH } from '../const';
 import { editApplicationModal } from '../components/modals';
 
@@ -25,8 +26,13 @@ export const ModifyApplication = (kind: K8sKind, obj: K8sResourceKind): KebabOpt
 };
 
 export const EditApplication = (model: K8sKind, obj: K8sResourceKind): KebabOption => {
+  const annotation =
+    obj.metadata.annotations && obj.metadata.annotations['openshift.io/generated-by'];
   return {
     label: `Edit ${truncateMiddle(obj.metadata.name, { length: RESOURCE_NAME_TRUNCATE_LENGTH })}`,
+    hidden:
+      (obj.kind !== ServiceModel.kind && !annotation) ||
+      (annotation && annotation !== 'OpenShiftWebConsole'),
     href: `/edit/ns/${obj.metadata.namespace}?name=${obj.metadata.name}&kind=${obj.kind ||
       model.kind}`,
     accessReview: {

diff --git a/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts b/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts
@@ -417,7 +417,7 @@ export const createOrUpdateDeployImageResources = async (
       internalImageName || name,
       imageStreamTag,
       internalImageNamespace,
-      undefined,
+      annotations,
       _.get(appResources, 'editAppResource.data'),
     );
     requests.push(

diff --git a/...d/packages/dev-console/src/utils/__tests__/__snapshots__/shared-submit-utils.spec.ts.snap b/...d/packages/dev-console/src/utils/__tests__/__snapshots__/shared-submit-utils.spec.ts.snap
@@ -43,6 +43,7 @@ Object {
     "defaultAnnotations": Object {
       "app.openshift.io/vcs-ref": "master",
       "app.openshift.io/vcs-uri": "https://github.com/test/repo",
+      "openshift.io/generated-by": "OpenShiftWebConsole",
     },
     "labels": Object {
       "app": "test-app",
@@ -109,6 +110,7 @@ Object {
     "annotations": Object {
       "app.openshift.io/vcs-ref": "master",
       "app.openshift.io/vcs-uri": "https://github.com/test/repo",
+      "openshift.io/generated-by": "OpenShiftWebConsole",
     },
     "labels": Object {
       "app": "test-app",

diff --git a/frontend/packages/dev-console/src/utils/resource-label-utils.ts b/frontend/packages/dev-console/src/utils/resource-label-utils.ts
@@ -34,6 +34,7 @@ export const getAppAnnotations = (gitURL: string, gitRef: string) => {
   return {
     'app.openshift.io/vcs-uri': gitURL,
     'app.openshift.io/vcs-ref': ref,
+    'openshift.io/generated-by': 'OpenShiftWebConsole',
   };
 };
 

diff --git a/frontend/packages/knative-plugin/src/utils/create-knative-utils.ts b/frontend/packages/knative-plugin/src/utils/create-knative-utils.ts
@@ -71,6 +71,7 @@ export const getKnativeServiceDepResource = (
         ...labels,
         ...(!create && { 'serving.knative.dev/visibility': `cluster-local` }),
       },
+      annotations,
     },
     spec: {
       template: {