TEIIDTOOLS-330 - First working of UI support for publish

* Changes the publish action from sending to git repository to generating a service in openshift.
teiid · Mar 26, 2018 · aeeebe5 · aeeebe5
1 parent 87ef7ae
commit aeeebe5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/ngapp/src/app/dataservices/dataservices.component.ts b/ngapp/src/app/dataservices/dataservices.component.ts
@@ -447,19 +447,19 @@ export class DataservicesComponent extends AbstractPageComponent implements OnIn
     this.logger.log("[DataservicesPageComponent] Publishing Dataservice: " + svcName);
     const self = this;
     this.dataserviceService
-      .exportDataservice(svcName)
+      .publishDataservice(svcName)
       .subscribe(
         (wasSuccess) => {
           self.exportNotificationHeader = this.exportSuccessHeader;
-          self.exportNotificationMessage = "   " + svcName + " was published successfully!";
+          self.exportNotificationMessage = "   " + svcName + " publishing successfully initiated!";
           self.exportNotificationType = NotificationType.SUCCESS;
-          this.logger.log("[DataservicesPageComponent] Publish Dataservice was successful");
+          this.logger.log("[DataservicesPageComponent] Dataservice publishing initiation was successful");
         },
         (error) => {
           self.exportNotificationHeader = this.exportFailedHeader;
           self.exportNotificationMessage = "   Failed to publish dataservice " + svcName + "!";
           self.exportNotificationType = NotificationType.DANGER;
-          this.logger.log("[DataservicesPageComponent] Publish Dataservice failed.");
+          this.logger.log("[DataservicesPageComponent] Publish dataservice " + svcName + " failed.");
         }
       );
   }

diff --git a/ngapp/src/app/dataservices/shared/dataservice.service.ts b/ngapp/src/app/dataservices/shared/dataservice.service.ts
@@ -454,36 +454,18 @@ export class DataserviceService extends ApiService {
   }
 
   /**
-   * Export a dataservice to a git repository
+   * Publish a dataservice
    * @param {string} dataserviceName the dataservice name
    * @returns {Observable<boolean>}
    */
-  public exportDataservice(dataserviceName: string): Observable<boolean> {
-    const repoPathKey = this.appSettings.GIT_REPO_PATH_KEY;
-    const repoBranchKey = this.appSettings.GIT_REPO_BRANCH_KEY;
-    const repoUsernameKey = this.appSettings.GIT_REPO_USERNAME_KEY;
-    const repoPasswordKey = this.appSettings.GIT_REPO_PASSWORD_KEY;
-    const repoAuthorEmailKey = this.appSettings.GIT_REPO_AUTHOR_EMAIL_KEY;
-    const repoAuthorNameKey = this.appSettings.GIT_REPO_AUTHOR_NAME_KEY;
-    const repoFilePathKey = this.appSettings.GIT_REPO_FILE_PATH_KEY;
+  public publishDataservice(dataserviceName: string): Observable<boolean> {
 
     // The payload for the rest call
     const payload = {
-      "storageType": "git",
-      "dataPath": "/" + this.getKomodoUserWorkspacePath() + "/" + dataserviceName,
-      "parameters":
-        {
-          [repoPathKey] : this.appSettings.getGitRepoProperty(repoPathKey),
-          [repoBranchKey] : this.appSettings.getGitRepoProperty(repoBranchKey),
-          [repoFilePathKey] : dataserviceName,
-          [repoUsernameKey] : this.appSettings.getGitRepoProperty(repoUsernameKey),
-          [repoPasswordKey] : btoa(this.appSettings.getGitRepoProperty(repoPasswordKey)),
-          [repoAuthorNameKey] : this.appSettings.getGitRepoProperty(repoAuthorNameKey),
-          [repoAuthorEmailKey] : this.appSettings.getGitRepoProperty(repoAuthorEmailKey)
-        }
+      "name": dataserviceName
     };
 
-    const url = environment.komodoImportExportUrl + "/" + DataservicesConstants.dataservicesExport;
+    const url = environment.komodoTeiidUrl + "/" + DataservicesConstants.dataservicesPublish;
 
     return this.http
       .post(url, payload, this.getAuthRequestOptions())

diff --git a/ngapp/src/app/dataservices/shared/dataservices-constants.ts b/ngapp/src/app/dataservices/shared/dataservices-constants.ts
@@ -15,6 +15,7 @@ import { NavigationItemConfig } from "patternfly-ng";
 export class DataservicesConstants {
 
   public static readonly dataservicesExport = "export";
+  public static readonly dataservicesPublish = "publish";
 
   public static readonly dataserviceRootRoute = "dataservice";
   public static readonly dataserviceRootPath = "/" + DataservicesConstants.dataserviceRootRoute;