adds tabledata file and new calc view to test sac

mechevarria · Mar 16, 2021 · 7c864a2 · 7c864a2
1 parent 24e3265
commit 7c864a2
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 108 deletions.
diff --git a/cf-db.sh b/cf-db.sh
@@ -11,7 +11,7 @@ cp mta.yaml mtad.yaml
 
 cf deploy ./ -f
 
-cf create-service-key mcoleman-rtwp-hdi-hana mcoleman-rtwp-hdi-hana-key
+cf create-service-key rtwp-hdi-hana rtwp-hdi-hana-key
 
 rm mtad.yaml
 rm cp-rtwp.mtar
diff --git a/cf-rtwp-api.sh b/cf-rtwp-api.sh
@@ -7,10 +7,10 @@
 #   keycloak_url=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
 #   echo keycloak_url=$keycloak_url
 # fi
-
+ 
 keycloak_url='https://rtwp-keycloak.cfapps.us10.hana.ondemand.com/auth'
 
-service=mcoleman-rtwp-hdi-hana
+service=rtwp-hdi-hana
 status=$(cf service $service | sed -n 3p)
 if [[ $status = "FAILED" ]]; then
   exit 1

diff --git a/db/src/CV_TEST.hdbcalculationview b/db/src/CV_TEST.hdbcalculationview
@@ -39,12 +39,7 @@
     <attribute id="GEO_LOC" order="7" displayAttribute="false" attributeHierarchyActive="false">
       <descriptions defaultDescription="GEO_LOC"/>
       <keyMapping columnObjectName="BADGE_LOCATION" columnName="GEO_LOC"/>
-    </attribute>
-    <attribute id="SEEN_TS" order="8" displayAttribute="false" attributeHierarchyActive="false">
-      <descriptions defaultDescription="SEEN_TS"/>
-      <keyMapping columnObjectName="BADGE_LOCATION" columnName="SEEN_TS"/>
-    </attribute>
-  </attributes>
+    </attribute></attributes>
   <calculatedAttributes/>
   <baseMeasures/>
   <calculatedMeasures/>

diff --git a/db/src/tableImports.hdbtabledata b/db/src/tableImports.hdbtabledata
@@ -9,8 +9,8 @@
 			"dialect": "HANA",
 			"type_config": {
 				"delimiter": ","
-			}
-        },
+			} 
+        }, 
         "import_settings": {
         "include_filter" : [ ],
         "import_columns": ["ID",

diff --git a/mta.yaml b/mta.yaml
@@ -2,22 +2,24 @@ _schema-version: "3.3"
 ID: cp-rtwp
 version: 0.0.1
 modules:
-- name: mcoleman-hdi-hana-deployer
+- name: hdi-hana-deployer
   type: hdb
   path: db
   properties:
     OPTIMIZE_MEMORY: true
   requires:
-  - name: mcoleman-rtwp-hdi-hana
+  - name: rtwp-hdi-hana
   parameters:
     disk-quota: 1024M
     memory: 128M
 resources:
-- name: mcoleman-rtwp-hdi-hana
+- name: rtwp-hdi-hana
   type: com.sap.xs.hdi-container
   parameters:
+    service-name: rtwp-hdi-hana
     config:
-      schema: mcoleman
+      schema: RTWP_SCHEMA
+      makeUniqueName: false
     service: hana
   properties:
     hdi-container-name: ${service-name}
diff --git a/rtwp-admin/local-setup.sh b/rtwp-admin/local-setup.sh
@@ -1,19 +1,21 @@
 #!/usr/bin/env bash
 
-status=$(cf app rtwp-keycloak | sed -n 3p)
-if [[ $status = "FAILED" ]]; then
-  exit 1
-else
-  export KEYCLOAK=true
-  export KEYCLOAK_URL=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
-  echo KEYCLOAK_URL=$KEYCLOAK_URL
-fi
+# status=$(cf app rtwp-keycloak | sed -n 3p)
+# if [[ $status = "FAILED" ]]; then
+#   exit 1
+# else
+#   export KEYCLOAK=true
+#   export KEYCLOAK_URL=https://$(cf app rtwp-keycloak | awk '{print $2}' | sed -n 5p)/auth
+#   echo KEYCLOAK_URL=$KEYCLOAK_URL
+# fi
+
+KEYCLOAK_URL=https://rtwp-keycloak.cfapps.us10.hana.ondemand.com/auth;
 
-status=$(cf app rtwp-api | sed -n 3p)
+status=$(cf app mcoleman-rtwp-api | sed -n 3p)
 if [[ $status = "FAILED" ]]; then
   exit 1
 else
-  export EXPRESS_URL=https://$(cf app rtwp-api | awk '{print $2}' | sed -n 5p)/
+  export EXPRESS_URL=https://$(cf app mcoleman-rtwp-api | awk '{print $2}' | sed -n 5p)/
   echo EXPRESS_URL=$EXPRESS_URL
 fi
 

diff --git a/rtwp-admin/package-lock.json b/rtwp-admin/package-lock.json
diff --git a/rtwp-admin/src/components/Stats.vue b/rtwp-admin/src/components/Stats.vue
@@ -68,6 +68,27 @@
         </div>
       </div>
     </div>
+    <div id="editor" ref="editor">SAC HERE</div>
+    <!-- <div 
+      id="iframe-wrapper"
+      :style="iframe.wrapperStyle" 
+    > -->
+    <div 
+      id="iframe-wrapper"
+    >
+        <!-- <iframe width="560" height="315" src="https://www.youtube.com/embed/M2kSJbLbIgQ" frameborder="0" allowfullscreen></iframe>  -->
+        <iframe width="560" height="315" src="https://oidsr44e6zfcs2ucrpdelht.us10.sac.ondemand.com/sap/fpa/ui/tenants/71e4c/bo/story/4F6973040B65B9BAD132645019AC1687?mode=embed" frameborder="0" allowfullscreen></iframe> 
+      <!-- <iframe 
+        v-if="loaded"
+        :src="iframe.src"
+        :style="iframe.style"
+        :height="iframe.style.height"
+        :width="iframe.style.width"
+      
+        frameborder="0"
+      ></iframe> -->
+    </div>
+
   </span>
 </template>
 <script>
@@ -102,7 +123,13 @@ export default {
             data: []
           }
         ]
-      }
+      },
+    //   iframe: {
+    //     //   https://<yourSACtenantURI>/sap/fpa/ui/tenants/<yourTenantID>/bo/story/<yourStoryID>?<Parameters>
+    //     // src: 'https://oidsr44e6zfcs2ucrpdelht.us10.sac.ondemand.com/sap/fpa/ui/tenants/71e4c/bo/story/4F6973040B65B9BAD132645019AC1687?mode=embed'
+    //     src: 'https://www.youtube.com/embed/owsfdh4gxyc'
+    //   }
+
     }
   },
   methods: {
@@ -142,6 +169,22 @@ export default {
   created() {
     this.getData()
   }
+//    mounted() {
+//     let editor = this.$refs.editor;
+//     this.iframe.style = {
+//       position: 'absolute',
+//       width: window.innerWidth,
+//       height: window.innerHeight,
+//       top: -editor.offsetTop + 'px',
+//       left: -editor.offsetLeft + 'px',
+//     }    
+//     this.iframe.wrapperStyle = {
+//       overflow: 'hidden',
+//       height: editor.clientHeight + 'px',
+//       width: editor.clientWidth + 'px',
+//     } 
+//     this.loaded = true;
+//   }
 }
 </script>
 <style scoped>