Merge pull request #1597 from newrelic/jerel/screenshot-output-updates

Update CLI output to match the latest changes to the catalog commands
newrelic · Sep 10, 2021 · 56d8139 · 56d8139
2 parents fadbdc2 + 3dbe9d8
commit 56d8139
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 77 deletions.
diff --git a/src/images/create-hello-world/new-catalog-stub.png b/src/images/create-hello-world/new-catalog-stub.png
diff --git a/src/markdown-pages/build-apps/build-hello-world-app.mdx b/src/markdown-pages/build-apps/build-hello-world-app.mdx
@@ -222,15 +222,15 @@ nr1 create
 
   <Step>
 
-Select **catalog**, which creates a stub in your project under the `catalog` directory. Here's how the results might look in your code editor:
+Select **catalog**, which creates a stub in your project under the _catalog_ directory in the root directory and any launcher, Nerdlet, or visualization directory. Here's how the results might look in your code editor:
 
 ![Catalog stub](../../images/create-hello-world/new-catalog-stub.png)
 
   </Step>
 
   <Step>
 
-In the `catalog` directory of your project, add screenshots or various types of metadata to describe your project. For details about what you can add, see [Add catalog metadata and screenshots](https://docs.newrelic.com/docs/new-relic-one/use-new-relic-one/build-new-relic-one/discover-manage-applications-new-relic-one-catalog#clamshell-2).
+In the root `catalog` directory of your project, add screenshots or various types of metadata to describe your project. For details about what you can add, see [Add catalog metadata and screenshots](https://docs.newrelic.com/docs/new-relic-one/use-new-relic-one/build-new-relic-one/discover-manage-applications-new-relic-one-catalog#clamshell-2).
 
   </Step>
 

diff --git a/src/markdown-pages/build-apps/create-an-ab-test-application/catalog-info.mdx b/src/markdown-pages/build-apps/create-an-ab-test-application/catalog-info.mdx
@@ -38,13 +38,13 @@ cd nru-programmability-course/describe-app/ab-test
 
 <Step>
 
-Create the _catalog_ directory:
+Create the _catalog_ directories:
 
 ```sh
 nr1 create --type catalog
 ```
 
-This creates a _catalog_ directory with template files for inputting custom information about your app.
+This creates a root _catalog_ directory with template files for inputting custom information about your app and a catalog directory for each Nerdpack item where screenshots can be stored.
 
 <Callout variant="tip">
 
@@ -135,4 +135,4 @@ This lesson is part of a course that teaches you how to build a New Relic One ap
 
 </Callout>
 
-</HideWhenEmbedded>
+</HideWhenEmbedded>
diff --git a/src/markdown-pages/build-apps/create-an-ab-test-application/publish.mdx b/src/markdown-pages/build-apps/create-an-ab-test-application/publish.mdx
@@ -82,26 +82,22 @@ In _package.json_, set `version` to `1.0.0`:
 
 ```json filename=package.json lineHighlight=4
 {
-    "private": true,
-    "name": "ab-test",
-    "version": "1.0.0",
-    "scripts": {
-        "start": "nr1 nerdpack:serve",
-        "test": "exit 0"
-    },
-    "nr1": {
-        "uuid": "2d923ba6-d231-4dd3-830f-b1923577a422"
-    },
-    "dependencies": {
-        "prop-types": "^15.6.2",
-        "react": "^16.6.3",
-        "react-dom": "^16.6.3"
-    },
-    "browserslist": [
-        "last 2 versions",
-        "not ie < 11",
-        "not dead"
-    ]
+  "private": true,
+  "name": "ab-test",
+  "version": "1.0.0",
+  "scripts": {
+    "start": "nr1 nerdpack:serve",
+    "test": "exit 0"
+  },
+  "nr1": {
+    "uuid": "2d923ba6-d231-4dd3-830f-b1923577a422"
+  },
+  "dependencies": {
+    "prop-types": "^15.6.2",
+    "react": "^16.6.3",
+    "react-dom": "^16.6.3"
+  },
+  "browserslist": ["last 2 versions", "not ie < 11", "not dead"]
 }
 ```
 
@@ -209,8 +205,8 @@ Submit your catalog information:
 
 ```sh
 nr1 catalog:submit
-[output] Uploading screenshots...
-[output]  {green}✔  {plain}Screenshots uploaded
+[output] Uploading screenshots from nru-programmability-course/publish/ab-test...
+[output]  {success}✔{normal}  Screenshots uploaded from: nru-programmability-course/publish/ab-test
 [output]  {green}✔  {plain}Updated metadata for AbTest 1.0.0
 ```
 
@@ -238,18 +234,26 @@ View your catalog information:
 
 ```sh
 nr1 catalog:info
-[output] {purple}description: {plain}Nerdpack ab-test
-[output] {purple}details: {plain}Display test data for our newsletter subscription A/B test
-[output] {purple}displayName: {plain}AbTest
-[output] {purple}icon.url: {plain}https://nr3.nr-ext.net/artifact-index-production/a685fec2-29fb-40b0-9f65-4178...
-[output] {purple}previews.0.url: {plain}https://application-catalog-production.s3.us-east-2.amazonaws.com/nerdpacks/a...
-[output] {purple}releaseDate: {plain}2021-03-12T15:46:09.600138Z
-[output] {purple}repository: {plain}https://github.com/newrelic-experimental/nru-programmability-course
-[output] {purple}tagline: {plain}Win @ newsletter subscriptions
-[output] {purple}version: {plain}1.0.0
-[output] {purple}whatsNew.changes: {plain}Initial release! Includes:
-[output] - A variety of charts for understanding the test r...
-[output] {purple}whatsNew.version: {plain}1.0.0
+[output] AbTest (Nerdpack):
+[output]     {purple}description: {plain}Nerdpack ab-test
+[output]     {purple}details: {plain}Display test data for our newsletter subscription A/B test
+[output]     {purple}displayName: {plain}AbTest
+[output]     {purple}icon.url: {plain}https://nr3.nr-ext.net/artifact-index-production/a685fec2-29fb-40b0-9f65-4178...
+[output]     {purple}previews.0.url: {plain}https://application-catalog-production.s3.us-east-2.amazonaws.com/nerdpacks/a...
+[output]     {purple}releaseDate: {plain}2021-03-12T15:46:09.600138Z
+[output]     {purple}repository: {plain}https://github.com/newrelic-experimental/nru-programmability-course
+[output]     {purple}tagline: {plain}Win @ newsletter subscriptions
+[output]     {purple}version: {plain}1.0.0
+[output]     {purple}whatsNew.changes: {plain}Initial release! Includes:
+[output]     - A variety of charts for understanding the test r...
+[output]     {purple}whatsNew.version: {plain}1.0.0
+[output] AbTestLauncher (Launcher):
+[output]     {purple}description: {plain}Describe me
+[output]     {purple}displayName: {plain}AbTestLauncher
+[output]     {purple}icon.url: {plain}https://nr3.nr-ext.net/artifact-index-production/a685fec2-29fb-40b0-9f65-4178...
+[output] AbTestNerdlet (Nerdlet):
+[output]     {purple}displayName: {plain}AbTestNerdlet
+[output]     {purple}supportedEntityTypes.mode: NONE
 ```
 
 All the information from _catalog_ shows here.
@@ -333,4 +337,5 @@ This lesson is part of a course that teaches you how to build a New Relic One ap
 
 </Callout>
 
-</HideWhenEmbedded>
+</HideWhenEmbedded>
+