Merge pull request #126 from MetaCell/feature/naming_fixes

changes to the pipeline
MetaCell · May 4, 2023 · 3ac789b · 3ac789b
2 parents d8c7334 + 9b6bed7
commit 3ac789b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/frontend/src/Pages/SentenceDetails.tsx b/frontend/src/Pages/SentenceDetails.tsx
@@ -103,7 +103,7 @@ const SentencesDetails = () => {
           ) {
             if (
               window.confirm(
-                `This sentence is assigned to ${sentence.owner.first_name}, assign to yourself?`
+                `This sentence is assigned to ${sentence.owner.first_name}, assign to yourself? To view the record without assigning ownership, select Cancel.`
               )
             ) {
               sentenceService

diff --git a/frontend/src/Pages/StatementDetails.tsx b/frontend/src/Pages/StatementDetails.tsx
@@ -68,7 +68,7 @@ const StatementDetails = () => {
           ) {
             if (
               window.confirm(
-                `This statement is assigned to ${statement.owner.first_name}, assign to yourself?`
+                `This statement is assigned to ${statement.owner.first_name}, assign to yourself? To view the record without assigning ownership, select Cancel.`
               )
             ) {
               statementService

diff --git a/frontend/src/components/CheckForDuplicates/NoResults.tsx b/frontend/src/components/CheckForDuplicates/NoResults.tsx
@@ -21,8 +21,7 @@ export default function NoResults({handleClearSearch}: any) {
             flexDirection: "column"
         }}>
             <Typography variant="h6">No duplicates found</Typography>
-            <Typography sx={{textAlign: "center"}}>We couldn’t find any record with these origin and destination in the
-                database.</Typography>
+            <Typography sx={{textAlign: "center"}}>We couldn't find any records with this origin and destination in the database.</Typography>
             <Button sx={{margin: "3em", color: "#344054", border: "1px solid #D0D5DD"}} variant="outlined"
                     onClick={() => handleClearSearch()}>
                 Clear Search

diff --git a/k8s/codefresh.yaml b/k8s/codefresh.yaml
@@ -18,7 +18,7 @@ steps:
     stage: buildComposer
     buildkit: true
     image_name: "sckan/composer"
-    tag: "${{CF_BUILD_ID}}"
+    tag: "${{CF_SHORT_REVISION}}"
     dockerfile: Dockerfile
     registry: ${{REGISTRY}}
   buildNginx:
@@ -27,9 +27,9 @@ steps:
     stage: buildNginx
     buildkit: true
     build_arguments:
-    - COMPOSER=us.gcr.io/metacellllc/sckan/composer:${{CF_BUILD_ID}}
+    - COMPOSER=us.gcr.io/metacellllc/sckan/composer:${{CF_SHORT_REVISION}}
     image_name: "sckan/nginx"
-    tag: "${{CF_BUILD_ID}}"
+    tag: "${{CF_SHORT_REVISION}}"
     dockerfile: ./nginx/Dockerfile
     registry: ${{REGISTRY}}
   deploy-to-kubernetes:
@@ -44,4 +44,4 @@ steps:
       - /cf-deploy-kubernetes ingress.yaml
     environment:
       - KUBECONTEXT=${{CLUSTER}}
-      - KUBERNETES_NAMESPACE=${{NAMESPACE}}
+      - KUBERNETES_NAMESPACE=${{NAMESPACE}}