11381 (#295)

* Changes post review

These changes are the ones which were found during the initial review of the lab.

* Change to display special characters

* Updating the live_labs with screenshots and minor code changes.

* Adding automation changes

json-duality-adb-free/introduction/intro-json-autorest.md

@@ -35,7 +35,7 @@ These tutorials include the SQL, PL/SQL, and cURL commands to work with the exam
 For the sake of simplicity, these REST APIs are unprotected. Oracle Database REST APIs offer performance AND secure access for application developers, and it is recommended you protect your endpoints with the proper web privileges and roles.
 
 
-Estimated Time: 30 minutes
+Estimated Time: 45 minutes
 
 ### Objectives
 In this lab, you will:

json-duality-adb-free/setup-environment/setup-environment.md

@@ -6,7 +6,7 @@ Oracle Database 23ai JSON Relational Duality converges the benefits of the Relat
 
 In this workshop, we will be using a set of tables used to store data on F1 racing teams, drivers, and race results. We will then create JSON Duality Views on top of these tables to reference them as JSON documents. Then we will use AutoREST to enable our duality views to be used with REST calls. 
 
-Estimated Time: 15 minutes
+Estimated Time: 10 minutes
 
 
 ### Objectives
@@ -24,72 +24,30 @@ This lab assumes you have:
 - Oracle Autonomous Database 23ai Free Tier instance
 
 
-## Task 1: Preparing your database user
+## Task 1: Logging in your database
 
 1. Your browser should be open at the Oracle LiveLabs My Reservations page. When your LiveLabs environment is ready, click **Launch Workshop**.
 
 2. Click **View Login Info**.
 
     ![Image alt text](images/login-info.png " ")
 
-3. Click **Copy Password** and then **Launch OCI**.
+3. Scroll down to the **Terraform Values** section and copy value for username **hol23ai**. Now click the **SQL Web Developer URL** to open the SQL Developer page.
 
-    ![Image alt text](images/reservation-info.png " ")
+    ![Copy password](images/terraform_values.png " ")
 
-4. Use **Oracle Cloud Infrastructure Direct Sign-in** to paste the password you copied. When you log-in for the first time, it will ask you to update the password. Write down in your notes the new password. Also make a note of the compartment name.
+4. Click **Advanced** and enter **HOL23AI**. Sign in with new user **hol23ai** and paste the password copied earlier.
+
+    ![Login with user](images/user_signin.png " ")
 
-    ![Image alt text](images/oci-sing-in.png " ")
-
-5. Use the main menu **≡** to navigate to Oracle Database > **Autonomous Database**.
-
-    ![Image alt text](images/main-menu.png " ")
-
-6. Select your reservation **Compartment** on the left side drop-down, and click on your Autonomous Database instance name. Your compartment name is the same which was noted from the reservation information screen.
-
-    ![Image alt text](images/adb-instance.png " ")
-
-7. Familiarize yourself with the OCI console for Autonomous Database.
-
-    ![Image alt text](images/adb-console.png " ")
-
-8. Use Database Actions menu to open **Database Users** console.
-
-    ![Image alt text](images/database-actions.png " ")
-
-9. Click **Create User**.
-
-    ![Image alt text](images/database-users.png " ")
-
-10. Create a new user called **hol23ai** (case insensitive). You may use the same password from admin user you received on Reservation Information dialog at step #3. Enable **Web Access** and set **UNLIMITED** quota on tablespace DATA.
-
-    ![Image alt text](images/create-user.png " ")
+5. Click **SQL** worksheet button under Development.
 
-11. Click **Granted Roles**. Add ```ORDS_ADMINISTRATOR_ROLE```, ```ORDS_RUNTIME_ROLE``` as Granted and Default.
-
-    ![Image alt text](images/granted-roles.png " ")
-
-12. Add DWROLE as Granted and Default. Click **Create User**.
-
-    ![Image alt text](images/dwrole.png " ")
-
-13. The new hol23ai user card will appear in the list. You can copy the SQL Developer URL in your notes.
-
-    ![Image alt text](images/hol23ai-user.png " ")
-
-14. Click the ADMIN user menu, and **Sign Out**.
-
-    ![Image alt text](images/sign-out.png " ")
-
-15. Sign-in with the new user **hol23ai**.
-
-    ![Image alt text](images/hol23ai-sign-in.png " ")
-
-16. Click **SQL** worksheet button under Development and Click **Open**.
-
-    ![Image alt text](images/development-sql.png " ")
+    ![Image alt text](images/oci-sing-in.png " ")
 
-17. As you go through this workshop, we will specify click the Run button or Run Script button. The Run button runs just one SQL Statement and formats the output into a data grid. The Run Script button runs many SQL statements and spools their output. We will highlight which to use.
+6. As you go through this workshop, we will specify click the Run button or Run Script button. The Run button runs just one SQL Statement and formats the output into a data grid. The Run Script button runs many SQL statements and spools their output. We will highlight which to use.
 
+    ![Run SQL Script](images/run-sql-script.png " ")
+
     **NOTE**: Use the delete option to clear the previous commands before running a new command.
 
 ## Task 2: Create database tables and JSON Duality Views

json-duality-adb-free/workshops/sandbox-json-autorest/manifest.json

@@ -1,5 +1,5 @@
 {
-    "workshoptitle": "AutoREST with JSON Relational Duality Views in 23ai Free",
+    "workshoptitle": "AutoREST with JSON Relational Duality Views in 23ai",
     "help": "[email protected]",
 
     "tutorials": [
@@ -8,6 +8,12 @@
             "description": "Introduction",
             "filename": "../../introduction/intro-json-autorest.md"
         },
+        {
+            "title": "Get Started",
+            "description": "This is the prerequisites for customers using Free Trial and Paid tenancies, and Always Free accounts (if applicable). The title of the lab and the Contents Menu title (the title above) match for Prerequisite lab. This lab is always first.",
+            "filename": "https://oracle-livelabs.github.io/common/labs/cloud-login/cloud-login-livelabs2.md"
+
+        },
         {
             "title": "Lab 1: Setup Environment",
             "description": "Setup Environment",
@@ -31,7 +37,7 @@
         {
             "title": "Need Help?",
             "description": "Solutions to Common Problems and Directions for Receiving Live Help",
-            "filename": "https://oracle-livelabs.github.io/common/labs/need-help/need-help-freetier.md"
+            "filename": "https://oracle-livelabs.github.io/common/labs/need-help/need-help-livelabs.md"
         }
     ]
 }