Bug#35805288 Edit Rest Object issues

- The 'no_update' column was missing in the update statement
- Disable the service and schema selection when editing a dbObject

Change-Id: I6845a1558275d83f7d92c77624e729c4030f77e8

Author: migueltadeu

gui/extension/tests/e2e/lib/db.ts

@@ -1161,17 +1161,25 @@ export class Database {
 
         if (restObject.restServicePath) {
             const inService = await dialog.findElement(locator.mrsDbObjectDialog.service);
-            await inService.click();
-            const popup = await driver.wait(until.elementLocated(locator.mrsDbObjectDialog.serviceList),
-                constants.wait5seconds, "Service list was not found");
-            await popup.findElement(By.id(restObject.restServicePath)).click();
+            const isDisabled = await inService.getAttribute("disabled")
+                .then(() => { return true; }).catch(() => { return false; });
+            if (!isDisabled) {
+                await inService.click();
+                const popup = await driver.wait(until.elementLocated(locator.mrsDbObjectDialog.serviceList),
+                    constants.wait5seconds, "Service list was not found");
+                await popup.findElement(By.id(restObject.restServicePath)).click();
+            }
         }
         if (restObject.restSchemaPath) {
             const inSchema = await dialog.findElement(locator.mrsDbObjectDialog.schema);
-            await inSchema.click();
-            const popup = await driver.wait(until.elementLocated(locator.mrsDbObjectDialog.schemaList),
-                constants.wait5seconds, "Schema drop down list was not found");
-            await popup.findElement(By.id(restObject.restSchemaPath)).click();
+            const isDisabled = await inSchema.getAttribute("disabled")
+                .then(() => { return true; }).catch(() => { return false; });
+            if (!isDisabled) {
+                await inSchema.click();
+                const popup = await driver.wait(until.elementLocated(locator.mrsDbObjectDialog.schemaList),
+                    constants.wait5seconds, "Schema drop down list was not found");
+                await popup.findElement(By.id(restObject.restSchemaPath)).click();
+            }
         }
         if (restObject.restObjectPath) {
             const inObjPath = await dialog.findElement(locator.mrsDbObjectDialog.requestPath);

gui/extension/tests/e2e/lib/until.ts

@@ -270,12 +270,14 @@ export const extensionIsReady = (): Condition<boolean> => {
             console.log("<<<<<DEV TOOLS Console log>>>>");
             console.log(await logs.get(logging.Type.BROWSER));
 
-            let text = `Extension was not loaded successfully after ${feLoadTries} tries. Check the logs. `;
+            const text = `Extension was not loaded successfully after ${feLoadTries} tries. Check the logs.`;
             // one last try to recover
             const path = join(await Misc.getExtentionOutputLogsFolder(), constants.feLogFile);
             const output = (await fs.readFile(path)).toString();
-
-            if (output.match(/(ERROR|error)/) !== null) {
+            console.log("-----OUTPUT LOGS------");
+            console.log(output);
+            throw new Error(text);
+            /*if (output.match(/(ERROR|error)/) !== null) {
                 console.log("An error was found on the OUTPUT tab, removing Internal DB");
                 await Misc.removeInternalDB();
                 text += `Internal DB was removed. Please re-run the tests`;
@@ -287,7 +289,7 @@ export const extensionIsReady = (): Condition<boolean> => {
                 }
             } else {
                 throw new Error(text);
-            }
+            }*/
         }
 
         credentialHelperOk = await Misc.findOnMySQLShLog(/Failed to initialize the default helper/);

gui/extension/tests/e2e/tests/ui-rest.ts

@@ -626,7 +626,6 @@ describe("MySQL REST Service", () => {
             const treeTable = await Misc.getTreeElement(constants.dbTreeSection,
                 `/${tableToDump} (${tableToDump})`);
             const editedObject: interfaces.IRestObject = {
-                //restServicePath: `${serviceToEdit.settings.hostNameFilter}${serviceToEdit.servicePath}`,
                 restServicePath: `${globalService.settings.hostNameFilter}${globalService.servicePath}`,
                 restSchemaPath: sakilaRestSchema.restSchemaPath,
                 restObjectPath: `/editedObject`,

gui/frontend/src/modules/mrs/dialogs/MrsDbObjectDialog.tsx

@@ -142,6 +142,11 @@ export class MrsDbObjectDialog extends AwaitableValueEditDialog {
             return request.values?.dbSchemaId === schema.id;
         });
 
+        let updateDisabled;
+        if (!this.createDbObject) {
+            updateDisabled = [CommonDialogValueOption.Disabled];
+        }
+
         const mainSection: IDialogSection = {
             caption: title,
             values: {
@@ -152,6 +157,7 @@ export class MrsDbObjectDialog extends AwaitableValueEditDialog {
                     choices: services.map((service) => { return service.hostCtx; }),
                     horizontalSpan: 2,
                     description: "The path of the REST Service",
+                    options: updateDisabled,
                 },
                 schema: {
                     type: "choice",
@@ -162,6 +168,7 @@ export class MrsDbObjectDialog extends AwaitableValueEditDialog {
                     }),
                     horizontalSpan: 2,
                     description: "The path of the REST Schema",
+                    options: updateDisabled,
                 },
                 requestPath: {
                     type: "text",

mrs_plugin/db_objects.py

@@ -742,6 +742,8 @@ def set_crud_operations(db_object_id=None, crud_operations=None,
         current_crud, current_format = lib.db_objects.get_crud_operations(session, db_object_id)
 
         objects = lib.db_objects.get_objects(session=session, db_object_id=db_object_id)
+        for object in objects:
+            object["fields"] = lib.db_objects.get_object_fields_with_references(session, object["id"])
 
         try:
             lib.database.grant_db_object(

mrs_plugin/lib/db_objects.py

@@ -261,9 +261,6 @@ def add_db_object(session, schema_id, db_object_name, request_path, db_object_ty
                   crud_operation_format, comments, media_type, auto_detect_media_type, auth_stored_procedure,
                   options, objects, db_object_id=None, reuse_ids=False):
 
-    options = core.convert_json(options)
-    objects = core.convert_json(objects)
-
     if not isinstance(db_object_name, str):
         raise Exception('Invalid object name.')
 
@@ -298,8 +295,6 @@ def add_db_object(session, schema_id, db_object_name, request_path, db_object_ty
     core.check_request_path(
         session, schema["host_ctx"] + schema["request_path"] + request_path)
 
-    core.check_mrs_object_names(session=session, db_schema_id=schema_id, objects=objects)
-
     if db_object_type == "PROCEDURE" or db_object_type == "FUNCTION":
         crud_operations = ["UPDATE"]
 
@@ -575,6 +570,7 @@ def set_object_fields_with_references(session, db_object_id, obj):
                 "allow_filtering": field.get("allow_filtering"),
                 "allow_sorting": field.get("allow_sorting", 0),
                 "no_check": field.get("no_check"),
+                "no_update": field.get("no_update"),
                 "sdk_options": core.convert_dict_to_json_string(field.get("sdk_options")),
                 "comments": field.get("comments"),
             }).exec(session)

mrs_plugin/tests/conftest.py

@@ -70,18 +70,23 @@ def init_mrs():
         temp_dirs.append(temp_dir)
         PHONE_BOOKS[db] = helpers.create_mrs_phonebook_schema(session, "/test", db, temp_dir)
 
+    lib.services.set_current_service_id(session, PHONE_BOOKS["PhoneBook"]["service_id"])
+
     yield session
 
     for temp_dir in temp_dirs:
         temp_dir.cleanup()
 
     session.close()
-    mysqlsh.globals.dba.stop_sandbox_instance(connection_data["port"], {
-        "password": connection_data["password"],
+    # mysqlsh.globals.dba.stop_sandbox_instance(connection_data["port"], {
+    #     "password": connection_data["password"],
+    #     "sandboxDir": deployment_dir.name
+    # })
+
+    mysqlsh.globals.dba.kill_sandbox_instance(connection_data["port"], {
         "sandboxDir": deployment_dir.name
     })
 
-
 @pytest.fixture(scope="session")
 def phone_book(init_mrs):
     yield PHONE_BOOKS["PhoneBook"]
@@ -96,8 +101,8 @@ def analog_phone_book(init_mrs):
 
 
 @pytest.fixture(scope="session")
-def table_contents(phone_book) -> helpers.TableContents:
-    def create_table_content_object(table_name, schema=None, take_snapshot=True):
+def table_contents(phone_book):
+    def create_table_content_object(table_name, schema=None, take_snapshot=True) -> helpers.TableContents:
         schema = schema or phone_book
         return helpers.TableContents(schema["session"], table_name, take_snapshot)
     yield create_table_content_object

mrs_plugin/tests/unit/helpers.py

@@ -24,11 +24,12 @@
 
 import mysqlsh
 from mrs_plugin import lib
-from ... schemas import add_schema, delete_schema
-from ... services import add_service, delete_service, get_service
-from ... db_objects import add_db_object, delete_db_object
+from mrs_plugin.schemas import add_schema, delete_schema
+from mrs_plugin.services import add_service, delete_service, get_service
+from mrs_plugin.db_objects import add_db_object, delete_db_object
 
-def get_default_db_object_init(schema_id, name=None, request_path=None):
+def get_default_db_object_init(session, schema_id, name=None, request_path=None):
+    object_id = lib.core.get_sequence_id(session)
     return {
         "schema_id": schema_id,
         "db_object_name": name or "ContactBasicInfo",
@@ -44,12 +45,48 @@ def get_default_db_object_init(schema_id, name=None, request_path=None):
         "enabled": True,
         "media_type": "media type",
         "auto_detect_media_type": True,
-        "auth_stored_procedure": False,
+        "auth_stored_procedure": None,
         "options": {
             "aaa": "val aaa",
             "bbb": "val bbb"
         },
-        "objects": [],
+        "objects": [
+            {
+                "id": object_id,
+                "name":"MyServicePhoneBookContactsWithEmail",
+                "position":0,
+                "kind":"RESULT",
+                "comments": "Comment for object",
+                "sdk_options": {
+                    "option1": "value 1",
+                    "option2": "value 2",
+                },
+                "fields":[
+                    {
+                        "id": lib.core.get_sequence_id(session),
+                        "object_id": object_id,
+                        "name":"id",
+                        "position":1,
+                        "db_column":{
+                            "comment":"",
+                            "datatype":"int",
+                            "id_generation":None,
+                            "is_generated":False,
+                            "is_primary":False,
+                            "is_unique":False,
+                            "name":"id",
+                            "not_null":True,
+                            "srid":None
+                        },
+                        "enabled":True,
+                        "allow_filtering":True,
+                        "allow_sorting":False,
+                        "no_check":False,
+                        "no_update":False
+                    }
+                ]
+            }
+        ],
     }
 
 def get_default_user_init(auth_app_id,
@@ -265,11 +302,14 @@ def take_snapshot(self):
         self._snapshot = TableContents.TableSnapshot(lib.core.select(table=self._table_name).exec(self._session).items)
 
     @property
-    def snapshot(self):
+    def snapshot(self) -> TableSnapshot:
+        assert self._snapshot is not None
         return self._snapshot
 
     @property
     def same_as_snapshot(self):
+        assert self._snapshot is not None
+
         current = lib.core.select(table=self._table_name).exec(self._session).items
         if len(current) != len(self._snapshot):
             return False
@@ -281,6 +321,8 @@ def same_as_snapshot(self):
         return True
 
     def assert_same(self):
+        assert self._snapshot is not None
+
         current = lib.core.select(table=self._table_name).exec(self._session).items
         if len(current) != len(self._snapshot):
             return False
@@ -290,6 +332,8 @@ def assert_same(self):
 
     @property
     def diff_text(self):
+        assert self._snapshot is not None
+
         current = lib.core.select(table=self._table_name).exec(self._session).items
         if len(self._snapshot._data) != len(current):
             return f"\nCurrent:\n  {current}\nExpected:\n  {self._snapshot._data}"
@@ -444,7 +488,7 @@ def create_mrs_phonebook_schema(session, service_context_root, schema_name, temp
     }
     from ... schemas import add_schema
     schema_id = add_schema(**schema_data)
-    schema = lib.schemas.get_schema(session, schema_id=schema_id)
+    schema = lib.schemas.get_schema(session, schema_id=lib.core.id_to_binary(schema_id, "schema_id"))
 
     content_set = lib.content_sets.get_content_set(session, service_id=service["id"], request_path="/test_content_set")