Merge branch 'master' into support-check-constraint-backend

.github/workflows/integration-tests-against-emulator.yaml

@@ -52,7 +52,7 @@ jobs:
 
     services:
       spanner_emulator:
-        image: gcr.io/cloud-spanner-emulator/emulator:1.5.27
+        image: gcr.io/cloud-spanner-emulator/emulator:1.5.28
         ports:
           - 9010:9010
           - 9020:9020

ui/cypress/e2e/spec.cy.ts

@@ -8,6 +8,7 @@ describe('template spec', () => {
     cy.intercept('GET', `${url}/GetSessions`, { statusCode: 200, body: [] }).as('getSessions');
     cy.intercept('GET', `${url}/GetConfig`, { statusCode: 200 }).as('getConfig');
     cy.intercept('GET', `${url}/GetLatestSessionDetails`, { statusCode: 200 }).as('getLatestSessionDetails');
+    cy.intercept('GET', `${url}/IsConfigSet`, { statusCode: 200, body: true }).as('IsConfigSet');
     cy.visit('http://localhost:4200/');
   });
 

ui/src/app/components/direct-connection/direct-connection.component.spec.ts

@@ -13,6 +13,7 @@ import { MatInputModule } from '@angular/material/input'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { SnackbarService } from 'src/app/services/snackbar/snackbar.service'
 import { MatSnackBarModule } from '@angular/material/snack-bar'
+import { MatDialog } from '@angular/material/dialog'
 
 const appRoutes: Routes = [{ path: 'workspace', component: WorkspaceComponent }]
 
@@ -35,7 +36,10 @@ describe('DirectConnectionComponent', () => {
         BrowserAnimationsModule,
         MatSnackBarModule,
       ],
-      providers: [SnackbarService],
+      providers: [
+        SnackbarService,
+        { provide: MatDialog, useValue: {} }
+      ],
     }).compileComponents()
   })
 

ui/src/app/components/direct-connection/direct-connection.component.ts

@@ -9,6 +9,8 @@ import { DialectList, InputType, PersistedFormValues, StorageKeys } from 'src/ap
 import { SnackbarService } from 'src/app/services/snackbar/snackbar.service'
 import { extractSourceDbName } from 'src/app/utils/utils'
 import { ClickEventService } from 'src/app/services/click-event/click-event.service'
+import { MatDialog } from '@angular/material/dialog'
+import { InfodialogComponent } from '../infodialog/infodialog.component'
 
 @Component({
   selector: 'app-direct-connection',
@@ -38,6 +40,7 @@ export class DirectConnectionComponent implements OnInit {
 
   connectRequest: any = null
   getSchemaRequest: any = null
+  isConfigSet: boolean = false
   shardedResponseList = [
     { value: false, displayName: 'No'},
     { value: true, displayName: 'Yes'},
@@ -51,7 +54,8 @@ export class DirectConnectionComponent implements OnInit {
     private data: DataService,
     private loader: LoaderService,
     private snackbarService: SnackbarService,
-    private clickEvent: ClickEventService
+    private clickEvent: ClickEventService,
+    private dialog: MatDialog,
   ) {}
 
   ngOnInit(): void {
@@ -103,43 +107,67 @@ export class DirectConnectionComponent implements OnInit {
       })
   }
 
-  connectToDb() {
-    this.clickEvent.openDatabaseLoader('direct', this.connectForm.value.dbName!)
-    window.scroll(0, 0)
-    this.data.resetStore()
-    localStorage.clear()
-    const { dbEngine, isSharded, hostName, port, userName, password, dbName, dialect } = this.connectForm.value
-    localStorage.setItem(PersistedFormValues.DirectConnectForm, JSON.stringify(this.connectForm.value))
-    let config: IDbConfig = {
-      dbEngine: dbEngine!,
-      isSharded: isSharded!,
-      hostName: hostName!,
-      port: port!,
-      userName: userName!,
-      password: password!,
-      dbName: dbName!,
-    }
-    this.connectRequest =this.fetch.connectTodb(config, dialect!).subscribe({
-        next: () => {
-          this.getSchemaRequest = this.data.getSchemaConversionFromDb()
-          this.data.conv.subscribe((res) => {
-            localStorage.setItem(
-              StorageKeys.Config,
-              JSON.stringify({ dbEngine, hostName, port, userName, password, dbName })
-            )
-            localStorage.setItem(StorageKeys.Type, InputType.DirectConnect)
-            localStorage.setItem(StorageKeys.SourceDbName, extractSourceDbName(dbEngine!))
-            this.clickEvent.closeDatabaseLoader()
-            //after a successful load, remove the persisted values.
-            localStorage.removeItem(PersistedFormValues.DirectConnectForm)
-            this.router.navigate(['/workspace'])
-          })
-        },
-        error: (e) => { 
-          this.snackbarService.openSnackBar(e.error, 'Close')
-          this.clickEvent.closeDatabaseLoader()
-        },
-      })
+  async connectToDb() {
+    this.data.updateIsConfigSet();
+    this.fetch.getIsConfigSet().subscribe({
+      next: (res: boolean) => {
+        this.isConfigSet = res;
+
+        if (!this.isConfigSet) {
+          this.dialog.open(InfodialogComponent, {
+            data: {
+              message: "Please configure spanner project id and instance id to proceed",
+              type: 'error',
+              title: 'Configure Spanner',
+            },
+            maxWidth: '500px',
+          });
+          return;
+        }
+
+        this.clickEvent.openDatabaseLoader('direct', this.connectForm.value.dbName!);
+        window.scroll(0, 0);
+        this.data.resetStore();
+        localStorage.clear();
+        const { dbEngine, isSharded, hostName, port, userName, password, dbName, dialect } = this.connectForm.value;
+        localStorage.setItem(PersistedFormValues.DirectConnectForm, JSON.stringify(this.connectForm.value));
+
+        let config: IDbConfig = {
+          dbEngine: dbEngine!,
+          isSharded: isSharded!,
+          hostName: hostName!,
+          port: port!,
+          userName: userName!,
+          password: password!,
+          dbName: dbName!,
+        };
+
+        this.connectRequest = this.fetch.connectTodb(config, dialect!).subscribe({
+          next: () => {
+            this.getSchemaRequest = this.data.getSchemaConversionFromDb();
+            this.data.conv.subscribe((res) => {
+              localStorage.setItem(
+                StorageKeys.Config,
+                JSON.stringify({ dbEngine, hostName, port, userName, password, dbName })
+              );
+              localStorage.setItem(StorageKeys.Type, InputType.DirectConnect);
+              localStorage.setItem(StorageKeys.SourceDbName, extractSourceDbName(dbEngine!));
+              this.clickEvent.closeDatabaseLoader();
+              // After a successful load, remove the persisted values.
+              localStorage.removeItem(PersistedFormValues.DirectConnectForm);
+              this.router.navigate(['/workspace']);
+            });
+          },
+          error: (e) => {
+            this.snackbarService.openSnackBar(e.error, 'Close');
+            this.clickEvent.closeDatabaseLoader();
+          },
+        });
+      },
+      error: (err) => {
+        console.error('Error fetching configuration:', err);
+      },
+    });
   }
 
   refreshDbSpecifcConnectionOptions() {

ui/src/app/services/data/data.service.ts

@@ -36,6 +36,7 @@ export class DataService {
   // currentSessionSub not using any where
   private currentSessionSub = new BehaviorSubject({} as ISession)
   private isOfflineSub = new BehaviorSubject<boolean>(false)
+  private isConfigSetSub = new BehaviorSubject<boolean>(false)
   private ruleMapSub = new BehaviorSubject<IRule[]>([])
   private treeUpdatedSub = new Subject<void>();
 
@@ -55,6 +56,7 @@ export class DataService {
   sessions = this.sessionsSub.asObservable()
   config = this.configSub.asObservable().pipe(filter((res) => Object.keys(res).length !== 0))
   isOffline = this.isOfflineSub.asObservable()
+  isConfigSet = this.isConfigSetSub.asObservable()
   currentSession = this.currentSessionSub
     .asObservable()
     .pipe(filter((res) => Object.keys(res).length !== 0))
@@ -448,6 +450,12 @@ export class DataService {
     })
   }
 
+  updateIsConfigSet() {
+    this.fetch.getIsConfigSet().subscribe((res: boolean) => {
+      this.isConfigSetSub.next(res)
+    })
+  }
+
   addColumn(tableId: string,payload: IAddColumn) {
     this.fetch.addColumn(tableId,payload).subscribe({
       next: (res: any) => {

ui/src/app/services/fetch/fetch.service.ts

@@ -268,6 +268,10 @@ export class FetchService {
     return this.http.get<ISpannerConfig>(`${this.url}/GetConfig`)
   }
 
+  getIsConfigSet() {
+    return this.http.get<boolean>(`${this.url}/IsConfigSet`);
+  }  
+
   setSpannerConfig(payload: ISpannerConfig) {
     return this.http.post<ISpannerConfig>(`${this.url}/SetSpannerConfig`, payload)
   }

webv2/config/config_handler.go

@@ -38,6 +38,11 @@ type ConfigWithMetadata struct {
 	IsConfigValid       bool
 }
 
+func IsConfigSet(w http.ResponseWriter, r *http.Request) {
+	config := TryInitializeSpannerConfig()
+	json.NewEncoder(w).Encode(config.GCPProjectID != "")
+}
+
 func GetConfig(w http.ResponseWriter, r *http.Request) {
 	content, err := GetSpannerConfig()
 	if err != nil {

webv2/routes.go

@@ -116,6 +116,7 @@ func getRoutes() *mux.Router {
 	// Application Configuration
 	router.HandleFunc("/GetConfig", config.GetConfig).Methods("GET")
 	router.HandleFunc("/SetSpannerConfig", config.SetSpannerConfig).Methods("POST")
+	router.HandleFunc("/IsConfigSet", config.IsConfigSet).Methods("GET")
 
 	// Run migration
 	router.HandleFunc("/Migrate", migrate).Methods("POST")