Add command

* removed enableGalleryPublish, enableLinkInjection

* removed ENABLE_GALLERY_PUBLISH

.env.example

@@ -4,6 +4,8 @@ PORTAL_RUNNER_SUBSCRIPTION=
 PORTAL_RUNNER_RESOURCE_GROUP=
 PORTAL_RUNNER_DATABASE_ACCOUNT=
 PORTAL_RUNNER_DATABASE_ACCOUNT_KEY=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY=
 PORTAL_RUNNER_CONNECTION_STRING=
 NOTEBOOKS_TEST_RUNNER_TENANT_ID=
 NOTEBOOKS_TEST_RUNNER_CLIENT_ID=

.eslintignore

@@ -162,7 +162,7 @@ src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValueValidator.ts
 src/Explorer/Panes/UploadFilePane.ts
 src/Explorer/Panes/UploadItemsPane.ts
-src/Explorer/SplashScreen/SplashScreenComponentAdapter.test.ts
+src/Explorer/SplashScreen/SplashScreen.test.ts
 src/Explorer/Tables/Constants.ts
 src/Explorer/Tables/DataTable/CacheBase.ts
 src/Explorer/Tables/DataTable/DataTableBindingManager.ts
@@ -200,7 +200,6 @@ src/Explorer/Tabs/QueryTab.test.ts
 src/Explorer/Tabs/QueryTab.ts
 src/Explorer/Tabs/QueryTablesTab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
-src/Explorer/Tabs/SparkMasterTab.ts
 src/Explorer/Tabs/StoredProcedureTab.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts
@@ -377,8 +376,7 @@ src/Explorer/Notebook/temp/inputs/editor.tsx
 src/Explorer/Notebook/temp/markdown-cell.tsx
 src/Explorer/Notebook/temp/source.tsx
 src/Explorer/Notebook/temp/syntax-highlighter/index.tsx
-src/Explorer/SplashScreen/SplashScreenComponent.tsx
-src/Explorer/SplashScreen/SplashScreenComponentApdapter.tsx
+src/Explorer/SplashScreen/SplashScreen.tsx
 src/Explorer/Tabs/GalleryTab.tsx
 src/Explorer/Tabs/NotebookViewerTab.tsx
 src/Explorer/Tabs/TerminalTab.tsx

.eslintrc.allFiles.js

@@ -0,0 +1,35 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+  },
+  plugins: ["@typescript-eslint"],
+  globals: {
+    Atomics: "readonly",
+    SharedArrayBuffer: "readonly",
+  },
+  overrides: [
+    {
+      files: ["**/*.tsx"],
+      plugins: ["react"],
+    },
+    {
+      files: ["**/*.{test,spec}.{ts,tsx}"],
+      env: {
+        jest: true,
+      },
+      plugins: ["jest"],
+    },
+  ],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+    sourceType: "module",
+  },
+  rules: {
+    "@typescript-eslint/no-unused-vars-experimental": "error",
+  },
+};

CODING_GUIDELINES.md

@@ -0,0 +1,194 @@
+# Coding Guidelines and Recommendations
+
+Cosmos Explorer has been under constant development for over 5 years. As a result, there are many different patterns and practices in the codebase. This document serves as a guide to how we write code and helps avoid propagating practices which are no longer preferred. Each requirement in this document is labeled and color-coded to show the relative importance. In order from highest to lowest importance:
+
+✅ DO this. If you feel you need an exception, engage with the project owners _prior_ to implementation.
+
+⛔️ DO NOT do this. If you feel you need an exception, engage with the project owners _prior_ to implementation.
+
+☑️ YOU SHOULD strongly consider this but it is not a requirement. If not following this advice, please comment code with why and proactively begin a discussion as part of the PR process.
+
+⚠️ YOU SHOULD NOT strongly consider not doing this. If not following this advice, please comment code with why and proactively begin a discussion as part of the PR process.
+
+💭 YOU MAY consider this advice if appropriate to your situation. Other team members may comment on this as part of PR review, but there is no need to be proactive.
+
+## Development Environment
+
+☑️ YOU SHOULD
+
+- Use VSCode and install the following extensions. This setup will catch most linting/formatting/type errors as you develop:
+  - [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+  - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+
+💭 YOU MAY
+
+- Use the [GitHub CLI](https://cli.github.com/). It has helpful workflows for submitting PRs as well as for checking out other team member's PRs.
+- Use Windows, Linux (including WSL), or OSX. We have team members developing on all three environments.
+
+✅ DO
+
+- Maintain cross-platform compatibility when modifying any engineering or build systems
+
+## Code Formatting
+
+✅ DO
+
+- Use [Prettier](https://prettier.io/) to format your code
+  - This will occur automatically if using the recommended editor setup
+  - `npm run format` will also format code
+
+## Linting
+
+✅ DO
+
+- Use [ESLint](https://eslint.org/) to check for code errors.
+  - This will occur automatically if using the recommended editor setup
+  - `npm run lint` will also check for linting errors
+
+💭 YOU MAY
+
+- Consider adding new lint rules.
+  - If you find yourself performing "nits" as part of PR review, consider adding a lint rule that will automatically catch the error in the future
+
+⚠️ YOU SHOULD NOT
+
+- Disable lint rules
+  - Lint rules exist as guidance and to catch common mistakes
+  - You will find places we disable specific lint rules however it should be exceptional.
+  - If a rule does need to be disabled, prefer disabling a specific line instead of the entire file.
+
+⛔️ DO NOT
+
+- Add [TSLint](https://palantir.github.io/tslint/) rules
+  - TSLint has been deprecated and is on track to be removed
+  - Always prefer ESLint rules
+
+## UI Components
+
+☑️ YOU SHOULD
+
+- Write new components using [React](https://reactjs.org/). We are actively migrating Cosmos Explorer off of [Knockout](https://knockoutjs.com/).
+- Use [Fluent](https://developer.microsoft.com/en-us/fluentui#/) components.
+  - Fluent components are designed to be highly accessible and composable
+  - Using Fluent allows us to build upon the work of the Fluent team and leads to a lower total cost of ownership for UI code
+
+### React
+
+☑️ YOU SHOULD
+
+- Use pure functional components when no state is required
+
+💭 YOU MAY
+
+- Use functional (hooks) or class components
+  - The project contains examples of both
+  - Neither is strongly preferred at this time
+
+⛔️ DO NOT
+
+- Use inheritance for sharing component behavior.
+  - React documentation covers this topic in detail https://reactjs.org/docs/composition-vs-inheritance.html
+- Suffix your file or component name with "Component"
+  - Even though the code has examples of it, we are ending the practice.
+
+## Libraries
+
+⚠️ YOU SHOULD NOT
+
+- Add new libraries to package.json.
+  - Adding libraries may bring in code that explodes the bundled size or attempts to run NodeJS code in the browser
+  - Consult with project owners for help with library selection if one is needed
+
+⛔️ DO NOT
+
+- Use underscore.js
+  - Much of this library is now native to JS and will be automatically transpiled
+- Use jQuery
+  - Much of this library is not native to the DOM.
+  - We are planning to remove it
+
+## Testing
+
+⛔️ DO NOT
+
+- Decrease test coverage
+  - Unit/Functional test coverage is checked as part of the CI process
+
+### Unit Tests
+
+✅ DO
+
+- Write unit tests for non-UI and utility code.
+- Write your tests using [Jest](https://jestjs.io/)
+
+☑️ YOU SHOULD
+
+- Abstract non-UI and utility code so it can run either the NodeJS or Browser environment
+
+### Functional(Component) Tests
+
+✅ DO
+
+- Write tests for UI components
+- Write your tests using [Jest](https://jestjs.io/)
+- Use either Enzyme or React Testing Library to perform component tests.
+
+### Mocking
+
+✅ DO
+
+- Use Jest's built-in mocking helpers
+
+☑️ YOU SHOULD
+
+- Write code that does not require mocking
+- Build components that do not require mocking extremely large or difficult to mock objects (like Explorer.ts). Pass _only_ what you need.
+
+⛔️ DO NOT
+
+- Use sinon.js for mocking
+  - Sinon has been deprecated and planned for removal
+
+### End to End Tests
+
+✅ DO
+
+- Use [Puppeteer](https://developers.google.com/web/tools/puppeteer) and [Jest](https://jestjs.io/)
+- Write or modify an existing E2E test that covers the primary use case of any major feature.
+  - Use caution. Do not try to cover every case. End to End tests can be slow and brittle.
+
+☑️ YOU SHOULD
+
+- Write tests that use accessible attributes to perform actions. Role, Title, Label, etc
+  - More information https://testing-library.com/docs/queries/about#priority
+
+⚠️ YOU SHOULD NOT
+
+- Add test specfic `data-*` attributes to dom elements
+  - This is a common current practice, but one we would like to avoid in the future
+  - End to end tests need to use semantic HTML and accesible attributes to be truely end to end
+  - No user or screen reader actually navigates an app using `data-*` attributes
+- Add arbitrary time delays to wait for page to render or element to be ready.
+  - All the time delays add up and slow down testing.
+  - Prefer using the framework's "wait for..." functionality.
+
+### Migrating Knockout to React
+
+✅ DO
+
+- Consult other team members before beginning migration work. There is a significant amount of flux in patterns we are using and it is important we do not propagate incorrect patterns.
+- Start by converting HTML to JSX: https://magic.reactjs.net/htmltojsx.htm. Add functionality as a second step.
+
+☑️ YOU SHOULD
+
+- Write React components that require no dependency on Knockout or observables to trigger rendering.
+
+## Browser Support
+
+✅ DO
+
+- Support all [browsers supported by the Azure Portal](https://docs.microsoft.com/en-us/azure/azure-portal/azure-portal-supported-browsers-devices)
+- Support IE11
+  - In practice, this should not need to be considered as part of a normal development workflow
+  - Polyfills and transpilation are already provided by our engineering systems.
+  - This requirement will be removed on March 30th, 2021 when Azure drops IE11 support.

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contribution guidelines to Data Explorer
 
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+This project welcomes contributions and suggestions. Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
 the rights to use your contribution. For details, visit https://cla.microsoft.com.
 
@@ -13,6 +13,7 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
 ## Microsoft Open Source Code of Conduct
+
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 
 Resources:
@@ -20,33 +21,3 @@ Resources:
 - [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
 - [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
 - Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
-
-## Browser support
-Please make sure to support all modern browsers as well as Internet Explorer 11.
-For IE support, polyfill is preferred over new usage of lodash or underscore. We already polyfill almost everything by importing babel-polyfill at the top of entry points.
-
-
-## Coding guidelines, conventions and recommendations
-### Typescript
-* Follow this [typescript style guide](https://github.com/excelmicro/typescript) which is based on [airbnb's style  guide](https://github.com/airbnb/javascript).
-* Conventions speficic to this project:
-  - Use double-quotes for string
-  - Don't use `null`, use `undefined`
-  - Pascal case for private static readonly fields
-  - Camel case for classnames in markup
-* Don't use class unless necessary
-* Code related to notebooks should be dynamically imported so that it is loaded from a separate bundle only if the account is notebook-enabled. There are already top-level notebook components which are dynamically imported and their dependencies can be statically imported from these files.
-* Prefer using [Fluent UI controls](https://developer.microsoft.com/en-us/fluentui#/controls/web) over creating your own, in order to maintain consistency and support a11y.
-
-### React
-* Prefer using React class components over function components and hooks unless you have a simple component and require no nested functions:
-  * Nested functions may be harder to test independently
-  * Switching from function component to class component later mayb be painful
-
-## Testing
-Any PR should not decrease testing coverage.
-
-## Recommended Tools and VS Code extensions
-* [Bookmarks](https://github.com/alefragnani/vscode-bookmarks)
-* [Bracket pair colorizer](https://github.com/CoenraadS/Bracket-Pair-Colorizer-2)
-* [GitHub Pull Requests and Issues](https://github.com/Microsoft/vscode-pull-request-github)

configs/mpac.json

@@ -1,4 +1,3 @@
 {
- "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com",
- "ENABLE_GALLERY_PUBLISH": true
+ "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com"
 }

package-lock.json

@@ -1611,6 +1611,15 @@
         "@hapi/hoek": "^8.3.0"
       }
     },
+    "@ianvs/eslint-stats": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@ianvs/eslint-stats/-/eslint-stats-2.0.0.tgz",
+      "integrity": "sha512-DnIVVAiXR4tfWERTiQxr1Prrs/uFEbC1C4gTGORMvbF4k7ENyVQeLcoUfNyhlAj2MB/OeorCrN3wSnYuDOUS6Q==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "lodash": "^4.17.15"
+      }
+    },
     "@icons/material": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/@icons/material/-/material-0.2.4.tgz",
@@ -7021,6 +7030,11 @@
       "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
       "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="
     },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
+    },
     "check-types": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz",
@@ -7277,6 +7291,19 @@
         }
       }
     },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
+    },
     "clipboard": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
@@ -7288,6 +7315,11 @@
         "tiny-emitter": "^2.0.0"
       }
     },
+    "clipboard-copy": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clipboard-copy/-/clipboard-copy-4.0.1.tgz",
+      "integrity": "sha512-wOlqdqziE/NNTUJsfSgXmBMIrYmfd5V0HCGsR8uAKHcg+h9NENWINcfRjtWGU77wDHC8B8ijV4hMTGYbrKovng=="
+    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -9674,6 +9706,100 @@
         }
       }
     },
+    "eslint-filtered-fix": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-filtered-fix/-/eslint-filtered-fix-0.1.2.tgz",
+      "integrity": "sha512-WjubxjjPpqT+kQWKH59ZK17b0sdAwnDNVHXVcscCGNfKS36Big+AnlR3o9/0v3WRbeU6HSkrfE4vaFFRoywpUw==",
+      "requires": {
+        "optionator": "^0.9.1"
+      },
+      "dependencies": {
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "optionator": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+          "requires": {
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0",
+            "word-wrap": "^1.2.3"
+          }
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
+        }
+      }
+    },
+    "eslint-formatter-friendly": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-formatter-friendly/-/eslint-formatter-friendly-7.0.0.tgz",
+      "integrity": "sha512-WXg2D5kMHcRxIZA3ulxdevi8/BGTXu72pfOO5vXHqcAfClfIWDSlOljROjCSOCcKvilgmHz1jDWbvFCZHjMQ5w==",
+      "requires": {
+        "@babel/code-frame": "7.0.0",
+        "chalk": "2.4.2",
+        "extend": "3.0.2",
+        "strip-ansi": "5.2.0",
+        "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+          "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+          "requires": {
+            "@babel/highlight": "^7.0.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
+    "eslint-nibble": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-nibble/-/eslint-nibble-6.1.0.tgz",
+      "integrity": "sha512-GFgHPsoJMKkvNALHhR6C29KM0jtjBK+fS0pBUCZ6eOU38/hJyd9rNjdo+4LsoxrHhh69hEePZ0LgmFeuMsrT4g==",
+      "requires": {
+        "@ianvs/eslint-stats": "^2.0.0",
+        "chalk": "^2.4.2",
+        "eslint-filtered-fix": "^0.1.1",
+        "eslint-formatter-friendly": "^7.0.0",
+        "eslint-summary": "^1.0.0",
+        "inquirer": "7.0.1 - 7.2.0",
+        "optionator": "^0.8.3"
+      }
+    },
     "eslint-plugin-jest": {
       "version": "23.13.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.13.2.tgz",
@@ -9740,6 +9866,39 @@
         "estraverse": "^4.1.1"
       }
     },
+    "eslint-summary": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-summary/-/eslint-summary-1.0.0.tgz",
+      "integrity": "sha1-uBHwBDcBayDA9vUjRHm9Y5W1eIY=",
+      "requires": {
+        "chalk": "^1.0.0",
+        "text-table": "^0.2.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
     "eslint-utils": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
@@ -10080,6 +10239,16 @@
         }
       }
     },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
@@ -10323,6 +10492,14 @@
       "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -11415,7 +11592,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -12149,6 +12325,117 @@
         }
       }
     },
+    "inquirer": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz",
+      "integrity": "sha512-E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ==",
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+          "requires": {
+            "type-fest": "^0.11.0"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.1.tgz",
+          "integrity": "sha512-LL0OLyN6AnfV9xqGQpDBwedT2Rt63737LxvsRxbcwpa2aIeynBApG2Sm//F3TaLHIR1aJBN52DWklc06b94o5Q==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
+        }
+      }
+    },
     "internal-ip": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
@@ -15784,8 +16071,7 @@
     "mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
     "mimic-response": {
       "version": "2.1.0",
@@ -16058,6 +16344,11 @@
       "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
       "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg=="
     },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
+    },
     "nan": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
@@ -16611,7 +16902,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
       }
@@ -16699,6 +16989,11 @@
         "windows-release": "^3.1.0"
       }
     },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -18678,6 +18973,15 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
     },
+    "restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "requires": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -18727,6 +19031,11 @@
       "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
       "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="
     },
+    "run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
+    },
     "run-parallel": {
       "version": "1.1.10",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
@@ -20492,8 +20801,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "throat": {
       "version": "4.1.0",
@@ -20503,8 +20811,7 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
       "version": "2.0.5",
@@ -20552,6 +20859,14 @@
       "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz",
       "integrity": "sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA=="
     },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
     "tmpl": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",

package.json

@@ -49,6 +49,7 @@
     "bootstrap": "3.4.1",
     "canvas": "file:./canvas",
     "clean-webpack-plugin": "0.1.19",
+    "clipboard-copy": "4.0.1",
     "copy-webpack-plugin": "6.0.2",
     "crossroads": "0.12.2",
     "css-element-queries": "1.1.1",
@@ -60,6 +61,7 @@
     "dotenv": "8.2.0",
     "es6-object-assign": "1.1.0",
     "es6-symbol": "3.1.3",
+    "eslint-nibble": "6.1.0",
     "eslint-plugin-jest": "23.13.2",
     "eslint-plugin-react": "7.20.0",
     "hasher": "1.2.0",
@@ -211,6 +213,7 @@
     "format": "prettier --write \"{src,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"",
     "format:check": "prettier --check \"{src,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"",
     "lint": "tslint --project tsconfig.json && eslint \"**/*.{ts,tsx}\"",
+    "lint:important": "eslint --no-ingore --no-eslintrc -c ./eslintrc.important.js \"**/*.{ts,tsx}\"",
     "build:contracts": "npm run compile:contracts",
     "strictEligibleFiles": "node ./strict-migration-tools/index.js",
     "autoAddStrictEligibleFiles": "node ./strict-migration-tools/autoAdd.js",

sampleData/gremlinSampleData.json

@@ -3,6 +3,7 @@
   "offerThroughput": 400,
   "databaseLevelThroughput": false,
   "collectionId": "Persons",
+  "createNewDatabase": true,
   "partitionKey": { "kind": "Hash", "paths": ["/name"] },
   "data": [
     "g.addV('person').property(id, '1').property('name', 'Eva').property('age', 44)",

src/Common/Constants.ts

@@ -105,8 +105,6 @@ export class Features {
   public static readonly hostedDataExplorer = "hosteddataexplorerenabled";
   public static readonly enableTtl = "enablettl";
   public static readonly enableNotebooks = "enablenotebooks";
-  public static readonly enableGalleryPublish = "enablegallerypublish";
-  public static readonly enableLinkInjection = "enablelinkinjection";
   public static readonly enableSpark = "enablespark";
   public static readonly livyEndpoint = "livyendpoint";
   public static readonly notebookServerUrl = "notebookserverurl";
@@ -130,7 +128,6 @@ export class Flights {
   public static readonly MongoIndexEditor = "mongoindexeditor";
   public static readonly MongoIndexing = "mongoindexing";
   public static readonly AutoscaleTest = "autoscaletest";
-  public static readonly GalleryPublish = "gallerypublish";
 }
 
 export class AfecFeatures {

src/Common/MongoProxyClient.test.ts

@@ -220,7 +220,6 @@ describe("MongoProxyClient", () => {
   describe("getEndpoint", () => {
     beforeEach(() => {
       resetConfigContext();
-      delete window.authType;
       updateUserContext({
         databaseAccount,
       });
@@ -241,7 +240,9 @@ describe("MongoProxyClient", () => {
     });
 
     it("returns a guest endpoint", () => {
-      window.authType = AuthType.EncryptedToken;
+      updateUserContext({
+        authType: AuthType.EncryptedToken,
+      });
       const endpoint = getEndpoint();
       expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/guest/mongo/explorer");
     });

src/Common/MongoProxyClient.ts

@@ -20,7 +20,7 @@ const defaultHeaders = {
 };
 
 function authHeaders() {
-  if (window.authType === AuthType.EncryptedToken) {
+  if (userContext.authType === AuthType.EncryptedToken) {
     return { [HttpHeaders.guestAccessToken]: userContext.accessToken };
   } else {
     return { [HttpHeaders.authorization]: userContext.authorizationToken };
@@ -337,7 +337,7 @@ export function createMongoCollectionWithProxy(
 export function getEndpoint(): string {
   let url = (configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT) + "/api/mongo/explorer";
 
-  if (window.authType === AuthType.EncryptedToken) {
+  if (userContext.authType === AuthType.EncryptedToken) {
     url = url.replace("api/mongo", "api/guest/mongo");
   }
   return url;

src/Common/dataAccess/createCollection.test.ts

@@ -27,13 +27,17 @@ describe("createCollection", () => {
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await createCollection(createCollectionParams);
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       databases: {
         createIfNotExists: () => {

src/Common/dataAccess/createCollection.ts

@@ -35,7 +35,7 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
   );
   try {
     let collection: DataModels.Collection;
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       if (params.createNewDatabase) {
         const createDatabaseParams: DataModels.CreateDatabaseParams = {
           autoPilotMaxThroughput: params.autoPilotMaxThroughput,

src/Common/dataAccess/createDatabase.ts

@@ -34,7 +34,7 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
     if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {
       throw new Error("Creating database resources is not allowed for tables accounts");
     }
-    const database: DataModels.Database = await (window.authType === AuthType.AAD && !userContext.useSDKOperations
+    const database: DataModels.Database = await (userContext.authType === AuthType.AAD && !userContext.useSDKOperations
       ? createDatabaseWithARM(params)
       : createDatabaseWithSDK(params));
 

src/Common/dataAccess/createStoredProcedure.ts

@@ -22,7 +22,7 @@ export async function createStoredProcedure(
   const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/createTrigger.ts

@@ -19,7 +19,7 @@ export async function createTrigger(
   const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/createUserDefinedFunction.ts

@@ -22,7 +22,7 @@ export async function createUserDefinedFunction(
   const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/deleteCollection.test.ts

@@ -20,13 +20,17 @@ describe("deleteCollection", () => {
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await deleteCollection("database", "collection");
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       database: () => {
         return {

src/Common/dataAccess/deleteCollection.ts

@@ -13,7 +13,7 @@ import { client } from "../CosmosClient";
 export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteCollectionWithARM(databaseId, collectionId);
     } else {
       await client().database(databaseId).container(collectionId).delete();

src/Common/dataAccess/deleteDatabase.test.ts

@@ -20,13 +20,17 @@ describe("deleteDatabase", () => {
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await deleteDatabase("database");
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       database: () => {
         return {

src/Common/dataAccess/deleteDatabase.ts

@@ -16,7 +16,7 @@ export async function deleteDatabase(databaseId: string): Promise<void> {
     if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {
       throw new Error("Deleting database resources is not allowed for tables accounts");
     }
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteDatabaseWithARM(databaseId);
     } else {
       await client().database(databaseId).delete();

src/Common/dataAccess/deleteStoredProcedure.ts

@@ -14,7 +14,7 @@ export async function deleteStoredProcedure(
   const clearMessage = logConsoleProgress(`Deleting stored procedure ${storedProcedureId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/deleteTrigger.ts

@@ -10,7 +10,7 @@ export async function deleteTrigger(databaseId: string, collectionId: string, tr
   const clearMessage = logConsoleProgress(`Deleting trigger ${triggerId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/deleteUserDefinedFunction.ts

@@ -10,7 +10,7 @@ export async function deleteUserDefinedFunction(databaseId: string, collectionId
   const clearMessage = logConsoleProgress(`Deleting user defined function ${id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/getCollectionDataUsageSize.ts

@@ -41,7 +41,7 @@ interface MetricsResponse {
 }
 
 export const getCollectionUsageSizeInKB = async (databaseName: string, containerName: string): Promise<number> => {
-  if (window.authType !== AuthType.AAD) {
+  if (userContext.authType !== AuthType.AAD) {
     return undefined;
   }
 

src/Common/dataAccess/getIndexTransformationProgress.ts

@@ -3,9 +3,10 @@ import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import * as Constants from "../Constants";
 import { AuthType } from "../../AuthType";
+import { userContext } from "../../UserContext";
 
 export async function getIndexTransformationProgress(databaseId: string, collectionId: string): Promise<number> {
-  if (window.authType !== AuthType.AAD) {
+  if (userContext.authType !== AuthType.AAD) {
     return undefined;
   }
   let indexTransformationPercentage: number;

src/Common/dataAccess/readCollection.test.ts

@@ -9,6 +9,7 @@ import { updateUserContext } from "../../UserContext";
 describe("readCollection", () => {
   beforeAll(() => {
     updateUserContext({
+      authType: AuthType.ResourceToken,
       databaseAccount: {
         name: "test",
       } as DatabaseAccount,
@@ -17,7 +18,6 @@ describe("readCollection", () => {
   });
 
   it("should call SDK if logged in with resource token", async () => {
-    window.authType = AuthType.ResourceToken;
     (client as jest.Mock).mockReturnValue({
       database: () => {
         return {

src/Common/dataAccess/readCollectionOffer.ts

@@ -16,7 +16,7 @@ export const readCollectionOffer = async (params: ReadCollectionOfferParams): Pr
 
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience !== DefaultAccountExperienceType.Table
     ) {

src/Common/dataAccess/readCollections.test.ts

@@ -19,13 +19,17 @@ describe("readCollections", () => {
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await readCollections("database");
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       database: () => {
         return {

src/Common/dataAccess/readCollections.ts

@@ -15,7 +15,7 @@ export async function readCollections(databaseId: string): Promise<DataModels.Co
   const clearMessage = logConsoleProgress(`Querying containers for database ${databaseId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience !== DefaultAccountExperienceType.MongoDB &&
       userContext.defaultExperience !== DefaultAccountExperienceType.Table

src/Common/dataAccess/readDatabaseOffer.ts

@@ -15,7 +15,7 @@ export const readDatabaseOffer = async (params: ReadDatabaseOfferParams): Promis
 
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience !== DefaultAccountExperienceType.Table
     ) {

src/Common/dataAccess/readDatabases.test.ts

@@ -19,13 +19,17 @@ describe("readDatabases", () => {
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await readDatabases();
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       databases: {
         readAll: () => {

src/Common/dataAccess/readDatabases.ts

@@ -15,7 +15,7 @@ export async function readDatabases(): Promise<DataModels.Database[]> {
   const clearMessage = logConsoleProgress(`Querying databases`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience !== DefaultAccountExperienceType.Table
     ) {

src/Common/dataAccess/readMongoDBCollection.tsx

@@ -9,7 +9,7 @@ export async function readMongoDBCollectionThroughRP(
   databaseId: string,
   collectionId: string
 ): Promise<MongoDBCollectionResource> {
-  if (window.authType !== AuthType.AAD) {
+  if (userContext.authType !== AuthType.AAD) {
     return undefined;
   }
   let collection: MongoDBCollectionResource;

src/Common/dataAccess/readStoredProcedures.ts

@@ -14,7 +14,7 @@ export async function readStoredProcedures(
   const clearMessage = logConsoleProgress(`Querying stored procedures for container ${collectionId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/readTriggers.ts

@@ -14,7 +14,7 @@ export async function readTriggers(
   const clearMessage = logConsoleProgress(`Querying triggers for container ${collectionId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/readUserDefinedFunctions.ts

@@ -14,7 +14,7 @@ export async function readUserDefinedFunctions(
   const clearMessage = logConsoleProgress(`Querying user defined functions for container ${collectionId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/updateCollection.ts

@@ -41,7 +41,7 @@ export async function updateCollection(
 
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience !== DefaultAccountExperienceType.MongoDB &&
       userContext.defaultExperience !== DefaultAccountExperienceType.Table

src/Common/dataAccess/updateOffer.ts

@@ -58,7 +58,7 @@ export const updateOffer = async (params: UpdateOfferParams): Promise<Offer> =>
   const clearMessage = logConsoleProgress(`Updating offer for ${offerResourceText}`);
 
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       if (params.collectionId) {
         updatedOffer = await updateCollectionOfferWithARM(params);
       } else if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {

src/Common/dataAccess/updateStoredProcedure.ts

@@ -22,7 +22,7 @@ export async function updateStoredProcedure(
   const clearMessage = logConsoleProgress(`Updating stored procedure ${storedProcedure.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/updateTrigger.ts

@@ -19,7 +19,7 @@ export async function updateTrigger(
   const clearMessage = logConsoleProgress(`Updating trigger ${trigger.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/Common/dataAccess/updateUserDefinedFunction.ts

@@ -22,7 +22,7 @@ export async function updateUserDefinedFunction(
   const clearMessage = logConsoleProgress(`Updating user defined function ${userDefinedFunction.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {

src/ConfigContext.ts

@@ -26,7 +26,6 @@ export interface ConfigContext {
   GITHUB_CLIENT_SECRET?: string; // No need to inject secret for prod. Juno already knows it.
   hostedExplorerURL: string;
   armAPIVersion?: string;
-  ENABLE_GALLERY_PUBLISH?: boolean;
 }
 
 // Default configuration

src/Contracts/ViewModels.ts

@@ -108,7 +108,7 @@ export interface CollectionBase extends TreeNode {
   isCollectionExpanded: ko.Observable<boolean>;
 
   onDocumentDBDocumentsClick(): void;
-  onNewQueryClick(source: any, event: MouseEvent, queryText?: string): void;
+  onNewQueryClick(source: any, event?: MouseEvent, queryText?: string): void;
   expandCollection(): void;
   collapseCollection(): void;
   getDatabase(): Database;
@@ -140,11 +140,11 @@ export interface Collection extends CollectionBase {
   onSettingsClick: () => Promise<void>;
 
   onNewGraphClick(): void;
-  onNewMongoQueryClick(source: any, event: MouseEvent, queryText?: string): void;
+  onNewMongoQueryClick(source: any, event?: MouseEvent, queryText?: string): void;
   onNewMongoShellClick(): void;
-  onNewStoredProcedureClick(source: Collection, event: MouseEvent): void;
-  onNewUserDefinedFunctionClick(source: Collection, event: MouseEvent): void;
-  onNewTriggerClick(source: Collection, event: MouseEvent): void;
+  onNewStoredProcedureClick(source: Collection, event?: MouseEvent): void;
+  onNewUserDefinedFunctionClick(source: Collection, event?: MouseEvent): void;
+  onNewTriggerClick(source: Collection, event?: MouseEvent): void;
   storedProcedures: ko.Computed<StoredProcedure[]>;
   userDefinedFunctions: ko.Computed<UserDefinedFunction[]>;
   triggers: ko.Computed<Trigger[]>;
@@ -355,7 +355,7 @@ export enum CollectionTabKind {
   Notebook = 13 /* Deprecated */,
   Terminal = 14,
   NotebookV2 = 15,
-  SparkMasterTab = 16,
+  SparkMasterTab = 16 /* Deprecated */,
   Gallery = 17,
   NotebookViewer = 18,
   Schema = 19,
@@ -371,20 +371,20 @@ export enum TerminalKind {
 
 export interface DataExplorerInputsFrame {
   databaseAccount: any;
-  subscriptionId: string;
-  resourceGroup: string;
-  masterKey: string;
-  hasWriteAccess: boolean;
-  authorizationToken: string;
-  features: any;
-  csmEndpoint: string;
-  dnsSuffix: string;
-  serverId: string;
-  extensionEndpoint: string;
-  subscriptionType: SubscriptionType;
-  quotaId: string;
-  addCollectionDefaultFlight: string;
-  isTryCosmosDBSubscription: boolean;
+  subscriptionId?: string;
+  resourceGroup?: string;
+  masterKey?: string;
+  hasWriteAccess?: boolean;
+  authorizationToken?: string;
+  features: { [key: string]: string };
+  csmEndpoint?: string;
+  dnsSuffix?: string;
+  serverId?: string;
+  extensionEndpoint?: string;
+  subscriptionType?: SubscriptionType;
+  quotaId?: string;
+  addCollectionDefaultFlight?: string;
+  isTryCosmosDBSubscription?: boolean;
   loadDatabaseAccountTimestamp?: number;
   sharedThroughputMinimum?: number;
   sharedThroughputMaximum?: number;

src/Explorer/ComponentRegisterer.test.ts

@@ -20,10 +20,6 @@ describe("Component Registerer", () => {
     expect(ko.components.isRegistered("graph-style")).toBe(true);
   });
 
-  it("should register collapsible-panel component", () => {
-    expect(ko.components.isRegistered("collapsible-panel")).toBe(true);
-  });
-
   it("should register json-editor component", () => {
     expect(ko.components.isRegistered("json-editor")).toBe(true);
   });
@@ -69,10 +65,6 @@ describe("Component Registerer", () => {
     expect(ko.components.isRegistered("terminal-tab")).toBe(true);
   });
 
-  it("should register spark-master-tab component", () => {
-    expect(ko.components.isRegistered("spark-master-tab")).toBe(true);
-  });
-
   it("should register mongo-shell-tab component", () => {
     expect(ko.components.isRegistered("mongo-shell-tab")).toBe(true);
   });

src/Explorer/ComponentRegisterer.ts

@@ -1,7 +1,6 @@
 import * as ko from "knockout";
 import * as PaneComponents from "./Panes/PaneComponents";
 import * as TabComponents from "./Tabs/TabComponents";
-import { CollapsiblePanelComponent } from "./Controls/CollapsiblePanel/CollapsiblePanelComponent";
 import { DiffEditorComponent } from "./Controls/DiffEditor/DiffEditorComponent";
 import { DynamicListComponent } from "./Controls/DynamicList/DynamicListComponent";
 import { EditorComponent } from "./Controls/Editor/EditorComponent";
@@ -17,7 +16,6 @@ ko.components.register("input-typeahead", new InputTypeaheadComponent());
 ko.components.register("new-vertex-form", NewVertexComponent);
 ko.components.register("error-display", new ErrorDisplayComponent());
 ko.components.register("graph-style", GraphStyleComponent);
-ko.components.register("collapsible-panel", new CollapsiblePanelComponent());
 ko.components.register("editor", new EditorComponent());
 ko.components.register("json-editor", new JsonEditorComponent());
 ko.components.register("diff-editor", new DiffEditorComponent());
@@ -39,7 +37,6 @@ ko.components.register("mongo-shell-tab", new TabComponents.MongoShellTab());
 ko.components.register("conflicts-tab", new TabComponents.ConflictsTab());
 ko.components.register("notebookv2-tab", new TabComponents.NotebookV2Tab());
 ko.components.register("terminal-tab", new TabComponents.TerminalTab());
-ko.components.register("spark-master-tab", new TabComponents.SparkMasterTab());
 ko.components.register("gallery-tab", new TabComponents.GalleryTab());
 ko.components.register("notebook-viewer-tab", new TabComponents.NotebookViewerTab());
 
@@ -67,7 +64,6 @@ ko.components.register("table-query-select-pane", new PaneComponents.TableQueryS
 ko.components.register("cassandra-add-collection-pane", new PaneComponents.CassandraAddCollectionPaneComponent());
 ko.components.register("settings-pane", new PaneComponents.SettingsPaneComponent());
 ko.components.register("execute-sproc-params-pane", new PaneComponents.ExecuteSprocParamsComponent());
-ko.components.register("renew-adhoc-access-pane", new PaneComponents.RenewAdHocAccessPane());
 ko.components.register("upload-items-pane", new PaneComponents.UploadItemsPaneComponent());
 ko.components.register("load-query-pane", new PaneComponents.LoadQueryPaneComponent());
 ko.components.register("save-query-pane", new PaneComponents.SaveQueryPaneComponent());

src/Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.ts

@@ -1,56 +0,0 @@
-import * as ko from "knockout";
-import template from "./collapsible-panel-component.html";
-
-/**
- * Helper class for ko component registration
- */
-export class CollapsiblePanelComponent {
-  constructor() {
-    return {
-      viewModel: CollapsiblePanelViewModel,
-      template,
-    };
-  }
-}
-
-/**
- * Parameters for this component
- */
-interface CollapsiblePanelParams {
-  collapsedTitle: ko.Observable<string>;
-  expandedTitle: ko.Observable<string>;
-  isCollapsed?: ko.Observable<boolean>;
-  collapseToLeft?: boolean;
-}
-
-/**
- * Collapsible panel:
- *  Contains a header with [>] button to collapse and an title ("expandedTitle").
- *  Collapsing the panel:
- *   - shrinks width to narrow amount
- *   - hides children
- *   - shows [<]
- *   - shows vertical title ("collapsedTitle")
- *   - the default behavior is to collapse to the right (ie, place this component on the right or use "collapseToLeft" parameter)
- *
- * How to use in your markup:
- * <collapsible-panel params="{ collapsedTitle:'Properties', expandedTitle:'Expanded properties' }">
- *      <!-- add your markup here: the ko context is the same as outside of collapsible-panel (ie $data) -->
- * </collapsible-panel>
- *
- * Use the optional "isCollapsed" parameter to programmatically collapse/expand the pane from outside the component.
- * Use the optional "collapseToLeft" parameter to collapse to the left.
- */
-class CollapsiblePanelViewModel {
-  public params: CollapsiblePanelParams;
-  private isCollapsed: ko.Observable<boolean>;
-
-  public constructor(params: CollapsiblePanelParams) {
-    this.params = params;
-    this.isCollapsed = params.isCollapsed || ko.observable(false);
-  }
-
-  public toggleCollapse(): void {
-    this.isCollapsed(!this.isCollapsed());
-  }
-}

src/Explorer/Controls/CollapsiblePanel/collapsible-panel-component.html

@@ -1,44 +0,0 @@
-<div class="collapsiblePanel" data-bind="css: { paneCollapsed:isCollapsed() }">
-  <div class="panelHeader" data-bind="visible: !isCollapsed()">
-    <span
-      class="collapsedIconContainer collapseExpandButton"
-      data-bind="click:toggleCollapse, css: { 'pull-right':params.collapseToLeft }"
-    >
-      <img
-        class="collapsedIcon imgVerticalAlignment"
-        src="/imgarrowlefticon.svg"
-        alt="Collapse"
-        data-bind="css: { expanded:!isCollapsed(), iconMirror:params.collapseToLeft }"
-      />
-    </span>
-    <span
-      class="expandedTitle"
-      data-bind="text: params.expandedTitle, css:{ iconSpacer:!params.collapseToLeft }"
-    ></span>
-  </div>
-
-  <div class="collapsibleNav nav" data-bind="visible:isCollapsed">
-    <ul class="nav">
-      <li class="collapsedBtn collapseExpandButton">
-        <span class="collapsedIconContainer" data-bind="click: toggleCollapse">
-          <img
-            class="collapsedIcon"
-            src="/imgarrowlefticon.svg"
-            data-bind="css: { expanded:!isCollapsed(), iconMirror:params.collapseToLeft }"
-            alt="Expand"
-          />
-        </span>
-        <span class="rotatedInner" data-bind="click: toggleCollapse">
-          <span data-bind="text: params.collapsedTitle"></span>
-        </span>
-      </li>
-    </ul>
-  </div>
-
-  <div class="panelContent" data-bind="visible:!isCollapsed()">
-    <!-- ko with:$parent -->
-    <!-- ko template: { nodes: $componentTemplateNodes } -->
-    <!-- /ko -->
-    <!-- /ko -->
-  </div>
-</div>

src/Explorer/Controls/Dialog.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Dialog, DialogType, DialogFooter, IDialogProps } from "office-ui-fabric-react/lib/Dialog";
+import { Dialog as FluentDialog, DialogType, DialogFooter, IDialogProps } from "office-ui-fabric-react/lib/Dialog";
 import { IButtonProps, PrimaryButton, DefaultButton } from "office-ui-fabric-react/lib/Button";
 import { ITextFieldProps, TextField } from "office-ui-fabric-react/lib/TextField";
 import { Link } from "office-ui-fabric-react/lib/Link";
@@ -50,7 +50,7 @@ const DIALOG_TITLE_FONT_SIZE = "17px";
 const DIALOG_TITLE_FONT_WEIGHT = 400;
 const DIALOG_SUBTEXT_FONT_SIZE = "15px";
 
-export class DialogComponent extends React.Component<DialogProps, {}> {
+export class Dialog extends React.Component<DialogProps> {
   constructor(props: DialogProps) {
     super(props);
   }
@@ -91,7 +91,7 @@ export class DialogComponent extends React.Component<DialogProps, {}> {
         : undefined;
 
     return (
-      <Dialog {...dialogProps}>
+      <FluentDialog {...dialogProps}>
         {choiceGroupProps && <ChoiceGroup {...choiceGroupProps} />}
         {textFieldProps && <TextField {...textFieldProps} />}
         {linkProps && (
@@ -104,7 +104,7 @@ export class DialogComponent extends React.Component<DialogProps, {}> {
           <PrimaryButton {...primaryButtonProps} />
           {secondaryButtonProps && <DefaultButton {...secondaryButtonProps} />}
         </DialogFooter>
-      </Dialog>
+      </FluentDialog>
     );
   }
 }

src/Explorer/Controls/DialogReactComponent/DialogComponentAdapter.tsx

@@ -1,16 +0,0 @@
-/**
- * This adapter is responsible to render the Dialog React component
- * If the component signals a change through the callback passed in the properties, it must render the React component when appropriate
- * and update any knockout observables passed from the parent.
- */
-import * as React from "react";
-import { DialogComponent, DialogProps } from "./DialogComponent";
-import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
-
-export class DialogComponentAdapter implements ReactAdapter {
-  public parameters: ko.Observable<DialogProps>;
-
-  public renderComponent(): JSX.Element {
-    return <DialogComponent {...this.parameters()} />;
-  }
-}

src/Explorer/Controls/FeaturePanel/FeaturePanelComponent.tsx

@@ -47,13 +47,7 @@ export const FeaturePanelComponent: React.FunctionComponent = () => {
     { key: "feature.dataexplorerexecutesproc", label: "Execute stored procedure", value: "true" },
     { key: "feature.hosteddataexplorerenabled", label: "Hosted Data Explorer (deprecated?)", value: "true" },
     { key: "feature.enablettl", label: "Enable TTL", value: "true" },
-    { key: "feature.enablegallerypublish", label: "Enable Notebook Gallery Publishing", value: "true" },
     { key: "feature.selfServeType", label: "Self serve feature", value: "sample" },
-    {
-      key: "feature.enableLinkInjection",
-      label: "Enable Injecting Notebook Viewer Link into the first cell",
-      value: "true",
-    },
     { key: "feature.canexceedmaximumvalue", label: "Can exceed max value", value: "true" },
     {
       key: "feature.enablefixedcollectionwithsharedthroughput",

src/Explorer/Controls/FeaturePanel/__snapshots__/FeaturePanelComponent.test.tsx.snap

@@ -149,12 +149,6 @@ exports[`Feature panel renders all flags 1`] = `
           label="Enable TTL"
           onChange={[Function]}
         />
-        <StyledCheckboxBase
-          checked={false}
-          key="feature.enablegallerypublish"
-          label="Enable Notebook Gallery Publishing"
-          onChange={[Function]}
-        />
         <StyledCheckboxBase
           checked={false}
           key="feature.selfServeType"
@@ -163,8 +157,8 @@ exports[`Feature panel renders all flags 1`] = `
         />
         <StyledCheckboxBase
           checked={false}
-          key="feature.enableLinkInjection"
-          label="Enable Injecting Notebook Viewer Link into the first cell"
+          key="feature.canexceedmaximumvalue"
+          label="Can exceed max value"
           onChange={[Function]}
         />
       </Stack>
@@ -172,12 +166,6 @@ exports[`Feature panel renders all flags 1`] = `
         className="checkboxRow"
         horizontalAlign="space-between"
       >
-        <StyledCheckboxBase
-          checked={false}
-          key="feature.canexceedmaximumvalue"
-          label="Can exceed max value"
-          onChange={[Function]}
-        />
         <StyledCheckboxBase
           checked={false}
           key="feature.enablefixedcollectionwithsharedthroughput"

src/Explorer/Controls/NotebookGallery/GalleryAndNotebookViewerComponent.tsx

@@ -7,7 +7,6 @@ import Explorer from "../../Explorer";
 
 export interface GalleryAndNotebookViewerComponentProps {
   container?: Explorer;
-  isGalleryPublishEnabled: boolean;
   junoClient: JunoClient;
   notebookUrl?: string;
   galleryItem?: IGalleryItem;
@@ -61,7 +60,6 @@ export class GalleryAndNotebookViewerComponent extends React.Component<
 
     const props: GalleryViewerComponentProps = {
       container: this.props.container,
-      isGalleryPublishEnabled: this.props.isGalleryPublishEnabled,
       junoClient: this.props.junoClient,
       selectedTab: this.state.selectedTab,
       sortBy: this.state.sortBy,

src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.test.tsx

@@ -5,7 +5,6 @@ import { GalleryViewerComponent, GalleryViewerComponentProps, GalleryTab, SortBy
 describe("GalleryViewerComponent", () => {
   it("renders", () => {
     const props: GalleryViewerComponentProps = {
-      isGalleryPublishEnabled: false,
       junoClient: undefined,
       selectedTab: GalleryTab.OfficialSamples,
       sortBy: SortBy.MostViewed,

src/Explorer/Controls/NotebookGallery/GalleryViewerComponent.tsx

@@ -23,7 +23,7 @@ import {
 import * as React from "react";
 import { IGalleryItem, IJunoResponse, IPublicGalleryData, JunoClient } from "../../../Juno/JunoClient";
 import * as GalleryUtils from "../../../Utils/GalleryUtils";
-import { DialogComponent, DialogProps } from "../DialogReactComponent/DialogComponent";
+import { Dialog, DialogProps } from "../Dialog";
 import { GalleryCardComponent, GalleryCardComponentProps } from "./Cards/GalleryCardComponent";
 import "./GalleryViewerComponent.less";
 import { HttpStatusCodes } from "../../../Common/Constants";
@@ -36,7 +36,6 @@ import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryCons
 
 export interface GalleryViewerComponentProps {
   container?: Explorer;
-  isGalleryPublishEnabled: boolean;
   junoClient: JunoClient;
   selectedTab: GalleryTab;
   sortBy: SortBy;
@@ -140,17 +139,13 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
         text: GalleryViewerComponent.mostRecentText,
       },
     ];
-    if (this.props.container?.isGalleryPublishEnabled()) {
-      this.sortingOptions.push({
-        key: SortBy.MostFavorited,
-        text: GalleryViewerComponent.mostFavoritedText,
-      });
-    }
+    this.sortingOptions.push({
+      key: SortBy.MostFavorited,
+      text: GalleryViewerComponent.mostFavoritedText,
+    });
 
     this.loadTabContent(this.state.selectedTab, this.state.searchText, this.state.sortBy, false);
-    if (this.props.container?.isGalleryPublishEnabled()) {
-      this.loadFavoriteNotebooks(this.state.searchText, this.state.sortBy, false); // Need this to show correct favorite button state
-    }
+    this.loadFavoriteNotebooks(this.state.searchText, this.state.sortBy, false); // Need this to show correct favorite button state
   }
 
   public render(): JSX.Element {
@@ -158,20 +153,16 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
 
     const tabs: GalleryTabInfo[] = [this.createSamplesTab(GalleryTab.OfficialSamples, this.state.sampleNotebooks)];
 
-    if (this.props.isGalleryPublishEnabled) {
-      tabs.push(
-        this.createPublicGalleryTab(
-          GalleryTab.PublicGallery,
-          this.state.publicNotebooks,
-          this.state.isCodeOfConductAccepted
-        )
-      );
-    }
+    tabs.push(
+      this.createPublicGalleryTab(
+        GalleryTab.PublicGallery,
+        this.state.publicNotebooks,
+        this.state.isCodeOfConductAccepted
+      )
+    );
 
-    if (this.props.container?.isGalleryPublishEnabled()) {
-      tabs.push(this.createFavoritesTab(GalleryTab.Favorites, this.state.favoriteNotebooks));
-      tabs.push(this.createPublishedNotebooksTab(GalleryTab.Published, this.state.publishedNotebooks));
-    }
+    tabs.push(this.createFavoritesTab(GalleryTab.Favorites, this.state.favoriteNotebooks));
+    tabs.push(this.createPublishedNotebooksTab(GalleryTab.Published, this.state.publishedNotebooks));
 
     const pivotProps: IPivotProps = {
       onLinkClick: this.onPivotChange,
@@ -196,7 +187,7 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
       <div className="galleryContainer">
         <Pivot {...pivotProps}>{pivotItems}</Pivot>
 
-        {this.state.dialogProps && <DialogComponent {...this.state.dialogProps} />}
+        {this.state.dialogProps && <Dialog {...this.state.dialogProps} />}
       </div>
     );
   }
@@ -406,11 +397,9 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
           <Stack.Item styles={{ root: { minWidth: 200 } }}>
             <Dropdown options={this.sortingOptions} selectedKey={this.state.sortBy} onChange={this.onDropdownChange} />
           </Stack.Item>
-          {this.props.isGalleryPublishEnabled && (
-            <Stack.Item>
-              <InfoComponent />
-            </Stack.Item>
-          )}
+          <Stack.Item>
+            <InfoComponent />
+          </Stack.Item>
         </Stack>
         <Stack.Item>{content}</Stack.Item>
       </Stack>
@@ -664,10 +653,7 @@ export class GalleryViewerComponent extends React.Component<GalleryViewerCompone
   };
 
   private onRenderCell = (data?: IGalleryItem): JSX.Element => {
-    let isFavorite: boolean;
-    if (this.props.container?.isGalleryPublishEnabled()) {
-      isFavorite = this.favoriteNotebooks?.find((item) => item.id === data.id) !== undefined;
-    }
+    const isFavorite = this.favoriteNotebooks?.find((item) => item.id === data.id) !== undefined;
     const props: GalleryCardComponentProps = {
       data,
       isFavorite,

src/Explorer/Controls/NotebookGallery/__snapshots__/GalleryViewerComponent.test.tsx.snap

@@ -72,11 +72,18 @@ exports[`GalleryViewerComponent renders 1`] = `
                     "key": 3,
                     "text": "Most recent",
                   },
+                  Object {
+                    "key": 2,
+                    "text": "Most favorited",
+                  },
                 ]
               }
               selectedKey={0}
             />
           </StackItem>
+          <StackItem>
+            <InfoComponent />
+          </StackItem>
         </Stack>
         <StackItem>
           <StyledSpinnerBase
@@ -85,6 +92,122 @@ exports[`GalleryViewerComponent renders 1`] = `
         </StackItem>
       </Stack>
     </PivotItem>
+    <PivotItem
+      headerText="Public gallery"
+      itemKey="PublicGallery"
+      key="PublicGallery"
+      style={
+        Object {
+          "marginTop": 20,
+        }
+      }
+    >
+      <div
+        className="publicGalleryTabContainer"
+      >
+        <Stack
+          tokens={
+            Object {
+              "childrenGap": 10,
+            }
+          }
+        >
+          <Stack
+            horizontal={true}
+            tokens={
+              Object {
+                "childrenGap": 20,
+                "padding": 10,
+              }
+            }
+          >
+            <StackItem
+              grow={true}
+            >
+              <StyledSearchBoxBase
+                onChange={[Function]}
+                placeholder="Search"
+              />
+            </StackItem>
+            <StackItem>
+              <StyledLabelBase>
+                Sort by
+              </StyledLabelBase>
+            </StackItem>
+            <StackItem
+              styles={
+                Object {
+                  "root": Object {
+                    "minWidth": 200,
+                  },
+                }
+              }
+            >
+              <StyledWithResponsiveMode
+                onChange={[Function]}
+                options={
+                  Array [
+                    Object {
+                      "key": 0,
+                      "text": "Most viewed",
+                    },
+                    Object {
+                      "key": 1,
+                      "text": "Most downloaded",
+                    },
+                    Object {
+                      "key": 3,
+                      "text": "Most recent",
+                    },
+                    Object {
+                      "key": 2,
+                      "text": "Most favorited",
+                    },
+                  ]
+                }
+                selectedKey={0}
+              />
+            </StackItem>
+            <StackItem>
+              <InfoComponent />
+            </StackItem>
+          </Stack>
+          <StackItem>
+            <StyledSpinnerBase
+              size={3}
+            />
+          </StackItem>
+        </Stack>
+      </div>
+    </PivotItem>
+    <PivotItem
+      headerText="My favorites"
+      itemKey="Favorites"
+      key="Favorites"
+      style={
+        Object {
+          "marginTop": 20,
+        }
+      }
+    >
+      <StyledSpinnerBase
+        size={3}
+      />
+    </PivotItem>
+    <PivotItem
+      headerText="My published work"
+      itemKey="Published"
+      key="Published"
+      style={
+        Object {
+          "marginTop": 20,
+        }
+      }
+    >
+      <StyledSpinnerBase
+        size={3}
+      />
+    </PivotItem>
   </StyledPivotBase>
 </div>
 `;

src/Explorer/Controls/NotebookViewer/NotebookViewerComponent.tsx

@@ -11,7 +11,7 @@ import * as GalleryUtils from "../../../Utils/GalleryUtils";
 import { NotebookClientV2 } from "../../Notebook/NotebookClientV2";
 import { NotebookComponentBootstrapper } from "../../Notebook/NotebookComponent/NotebookComponentBootstrapper";
 import NotebookReadOnlyRenderer from "../../Notebook/NotebookRenderer/NotebookReadOnlyRenderer";
-import { DialogComponent, DialogProps, TextFieldProps } from "../DialogReactComponent/DialogComponent";
+import { Dialog, DialogProps, TextFieldProps } from "../Dialog";
 import { NotebookMetadataComponent } from "./NotebookMetadataComponent";
 import "./NotebookViewerComponent.less";
 import Explorer from "../../Explorer";
@@ -179,7 +179,7 @@ export class NotebookViewerComponent
           hidePrompts: this.props.hidePrompts,
         })}
 
-        {this.state.dialogProps && <DialogComponent {...this.state.dialogProps} />}
+        {this.state.dialogProps && <Dialog {...this.state.dialogProps} />}
       </div>
     );
   }

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -44,7 +44,6 @@ import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/genera
 import { readMongoDBCollectionThroughRP } from "../../../Common/dataAccess/readMongoDBCollection";
 import { getIndexTransformationProgress } from "../../../Common/dataAccess/getIndexTransformationProgress";
 import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils";
-import { isEmpty } from "underscore";
 
 interface SettingsV2TabInfo {
   tab: SettingsV2TabTypes;
@@ -1004,16 +1003,16 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         content: <IndexingPolicyComponent {...indexingPolicyComponentProps} />,
       });
     } else if (this.container.isPreferredApiMongoDB()) {
-      if (isEmpty(this.container.features())) {
-        tabs.push({
-          tab: SettingsV2TabTypes.IndexingPolicyTab,
-          content: mongoIndexingPolicyAADError,
-        });
-      } else if (this.container.isEnableMongoCapabilityPresent()) {
+      if (this.container.isEnableMongoCapabilityPresent()) {
         tabs.push({
           tab: SettingsV2TabTypes.IndexingPolicyTab,
           content: <MongoIndexingPolicyComponent {...mongoIndexingPolicyComponentProps} />,
         });
+      } else {
+        tabs.push({
+          tab: SettingsV2TabTypes.IndexingPolicyTab,
+          content: mongoIndexingPolicyAADError,
+        });
       }
     }
 

src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap

@@ -28,16 +28,11 @@ exports[`SettingsComponent renders 1`] = `
               "changeFeedPolicy": [Function],
               "conflictResolutionPolicy": [Function],
               "container": Explorer {
-                "_addSynapseLinkDialogProps": [Function],
                 "_closeModalDialog": [Function],
                 "_closeSynapseLinkModalDialog": [Function],
-                "_dialogProps": [Function],
-                "_importExplorerConfigComplete": false,
                 "_isAfecFeatureRegistered": [Function],
                 "_isInitializingNotebooks": false,
-                "_isInitializingSparkConnectionInfo": false,
                 "_isSystemDatabasePredicate": [Function],
-                "_openShareDialog": [Function],
                 "_panes": Array [
                   AddDatabasePane {
                     "autoPilotUsageCost": [Function],
@@ -440,22 +435,6 @@ exports[`SettingsComponent renders 1`] = `
                     "validPartitionKeyValue": [Function],
                     "visible": [Function],
                   },
-                  RenewAdHocAccessPane {
-                    "_renewShareAccess": [Function],
-                    "accessKey": [Function],
-                    "container": [Circular],
-                    "firstFieldHasFocus": [Function],
-                    "formErrors": [Function],
-                    "formErrorsDetails": [Function],
-                    "id": "renewadhocaccesspane",
-                    "isExecuting": [Function],
-                    "isHelperImageVisible": [Function],
-                    "isTemplateReady": [Function],
-                    "onShowHelperImageClick": [Function],
-                    "onShowHelperImageKeyPress": [Function],
-                    "title": [Function],
-                    "visible": [Function],
-                  },
                   UploadItemsPane {
                     "container": [Circular],
                     "fileUploadSummaryText": [Function],
@@ -695,9 +674,6 @@ exports[`SettingsComponent renders 1`] = `
                   "visible": [Function],
                 },
                 "addDatabaseText": [Function],
-                "addSynapseLinkDialog": DialogComponentAdapter {
-                  "parameters": [Function],
-                },
                 "addTableEntityPane": AddTableEntityPane {
                   "addButtonLabel": "Add Property",
                   "attributeNameLabel": "Property Name",
@@ -804,6 +780,7 @@ exports[`SettingsComponent renders 1`] = `
                 },
                 "clickHostedAccountSwitch": [Function],
                 "clickHostedDirectorySwitch": [Function],
+                "closeDialog": undefined,
                 "closeSidePanel": undefined,
                 "collapsedResourceTreeWidth": 36,
                 "collectionCreationDefaults": Object {
@@ -859,9 +836,6 @@ exports[`SettingsComponent renders 1`] = `
                   "visible": [Function],
                 },
                 "deleteDatabaseText": [Function],
-                "dialogComponentAdapter": DialogComponentAdapter {
-                  "parameters": [Function],
-                },
                 "editTableEntityPane": EditTableEntityPane {
                   "addButtonLabel": "Add Property",
                   "attributeNameLabel": "Property Name",
@@ -951,11 +925,9 @@ exports[`SettingsComponent renders 1`] = `
                 "isCopyNotebookPaneEnabled": [Function],
                 "isEnableMongoCapabilityPresent": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
-                "isGalleryPublishEnabled": [Function],
                 "isGitHubPaneEnabled": [Function],
                 "isHostedDataExplorerEnabled": [Function],
                 "isLeftPaneExpanded": [Function],
-                "isLinkInjectionEnabled": [Function],
                 "isMongoIndexingEnabled": [Function],
                 "isNotebookEnabled": [Function],
                 "isNotebooksEnabledForAccount": [Function],
@@ -965,8 +937,6 @@ exports[`SettingsComponent renders 1`] = `
                 "isPreferredApiMongoDB": [Function],
                 "isPreferredApiTable": [Function],
                 "isPublishNotebookPaneEnabled": [Function],
-                "isReadToggled": [Function],
-                "isReadWriteToggled": [Function],
                 "isRefreshingExplorer": [Function],
                 "isResourceTokenCollectionNodeSelected": [Function],
                 "isRightPanelV2Enabled": [Function],
@@ -1021,7 +991,7 @@ exports[`SettingsComponent renders 1`] = `
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
                 "onSwitchToConnectionString": [Function],
-                "onToggleKeyDown": [Function],
+                "openDialog": undefined,
                 "openSidePanel": undefined,
                 "provideFeedbackEmail": [Function],
                 "queriesClient": QueriesClient {
@@ -1051,24 +1021,6 @@ exports[`SettingsComponent renders 1`] = `
                 "refreshDatabaseAccount": [Function],
                 "refreshNotebookList": [Function],
                 "refreshTreeTitle": [Function],
-                "renewAdHocAccessPane": RenewAdHocAccessPane {
-                  "_renewShareAccess": [Function],
-                  "accessKey": [Function],
-                  "container": [Circular],
-                  "firstFieldHasFocus": [Function],
-                  "formErrors": [Function],
-                  "formErrorsDetails": [Function],
-                  "id": "renewadhocaccesspane",
-                  "isExecuting": [Function],
-                  "isHelperImageVisible": [Function],
-                  "isTemplateReady": [Function],
-                  "onShowHelperImageClick": [Function],
-                  "onShowHelperImageKeyPress": [Function],
-                  "title": [Function],
-                  "visible": [Function],
-                },
-                "renewToken": [Function],
-                "renewTokenError": [Function],
                 "resourceTokenCollection": [Function],
                 "resourceTokenCollectionId": [Function],
                 "resourceTokenDatabaseId": [Function],
@@ -1164,22 +1116,8 @@ exports[`SettingsComponent renders 1`] = `
                   "title": [Function],
                   "visible": [Function],
                 },
-                "shareAccessData": [Function],
-                "shareAccessToggleState": [Function],
-                "shareAccessUrl": [Function],
-                "shareTokenCopyHelperText": [Function],
-                "shareUrlCopyHelperText": [Function],
-                "shouldShowContextSwitchPrompt": [Function],
-                "shouldShowDataAccessExpiryDialog": [Function],
-                "shouldShowShareDialogContents": [Function],
                 "signInAad": [Function],
                 "sparkClusterConnectionInfo": [Function],
-                "splashScreenAdapter": SplashScreenComponentAdapter {
-                  "clearMostRecent": [Function],
-                  "container": [Circular],
-                  "forceRender": [Function],
-                  "parameters": [Function],
-                },
                 "splitter": Splitter {
                   "bounds": Object {
                     "max": 400,
@@ -1237,9 +1175,6 @@ exports[`SettingsComponent renders 1`] = `
                   "openedTabs": [Function],
                 },
                 "toggleLeftPaneExpandedKeyPress": [Function],
-                "toggleRead": [Function],
-                "toggleReadWrite": [Function],
-                "tokenForRenewal": [Function],
                 "uploadFilePane": UploadFilePane {
                   "container": [Circular],
                   "extensions": [Function],
@@ -1309,16 +1244,11 @@ exports[`SettingsComponent renders 1`] = `
           }
           container={
             Explorer {
-              "_addSynapseLinkDialogProps": [Function],
               "_closeModalDialog": [Function],
               "_closeSynapseLinkModalDialog": [Function],
-              "_dialogProps": [Function],
-              "_importExplorerConfigComplete": false,
               "_isAfecFeatureRegistered": [Function],
               "_isInitializingNotebooks": false,
-              "_isInitializingSparkConnectionInfo": false,
               "_isSystemDatabasePredicate": [Function],
-              "_openShareDialog": [Function],
               "_panes": Array [
                 AddDatabasePane {
                   "autoPilotUsageCost": [Function],
@@ -1721,22 +1651,6 @@ exports[`SettingsComponent renders 1`] = `
                   "validPartitionKeyValue": [Function],
                   "visible": [Function],
                 },
-                RenewAdHocAccessPane {
-                  "_renewShareAccess": [Function],
-                  "accessKey": [Function],
-                  "container": [Circular],
-                  "firstFieldHasFocus": [Function],
-                  "formErrors": [Function],
-                  "formErrorsDetails": [Function],
-                  "id": "renewadhocaccesspane",
-                  "isExecuting": [Function],
-                  "isHelperImageVisible": [Function],
-                  "isTemplateReady": [Function],
-                  "onShowHelperImageClick": [Function],
-                  "onShowHelperImageKeyPress": [Function],
-                  "title": [Function],
-                  "visible": [Function],
-                },
                 UploadItemsPane {
                   "container": [Circular],
                   "fileUploadSummaryText": [Function],
@@ -1976,9 +1890,6 @@ exports[`SettingsComponent renders 1`] = `
                 "visible": [Function],
               },
               "addDatabaseText": [Function],
-              "addSynapseLinkDialog": DialogComponentAdapter {
-                "parameters": [Function],
-              },
               "addTableEntityPane": AddTableEntityPane {
                 "addButtonLabel": "Add Property",
                 "attributeNameLabel": "Property Name",
@@ -2085,6 +1996,7 @@ exports[`SettingsComponent renders 1`] = `
               },
               "clickHostedAccountSwitch": [Function],
               "clickHostedDirectorySwitch": [Function],
+              "closeDialog": undefined,
               "closeSidePanel": undefined,
               "collapsedResourceTreeWidth": 36,
               "collectionCreationDefaults": Object {
@@ -2140,9 +2052,6 @@ exports[`SettingsComponent renders 1`] = `
                 "visible": [Function],
               },
               "deleteDatabaseText": [Function],
-              "dialogComponentAdapter": DialogComponentAdapter {
-                "parameters": [Function],
-              },
               "editTableEntityPane": EditTableEntityPane {
                 "addButtonLabel": "Add Property",
                 "attributeNameLabel": "Property Name",
@@ -2232,11 +2141,9 @@ exports[`SettingsComponent renders 1`] = `
               "isCopyNotebookPaneEnabled": [Function],
               "isEnableMongoCapabilityPresent": [Function],
               "isFixedCollectionWithSharedThroughputSupported": [Function],
-              "isGalleryPublishEnabled": [Function],
               "isGitHubPaneEnabled": [Function],
               "isHostedDataExplorerEnabled": [Function],
               "isLeftPaneExpanded": [Function],
-              "isLinkInjectionEnabled": [Function],
               "isMongoIndexingEnabled": [Function],
               "isNotebookEnabled": [Function],
               "isNotebooksEnabledForAccount": [Function],
@@ -2246,8 +2153,6 @@ exports[`SettingsComponent renders 1`] = `
               "isPreferredApiMongoDB": [Function],
               "isPreferredApiTable": [Function],
               "isPublishNotebookPaneEnabled": [Function],
-              "isReadToggled": [Function],
-              "isReadWriteToggled": [Function],
               "isRefreshingExplorer": [Function],
               "isResourceTokenCollectionNodeSelected": [Function],
               "isRightPanelV2Enabled": [Function],
@@ -2302,7 +2207,7 @@ exports[`SettingsComponent renders 1`] = `
               "onRefreshDatabasesKeyPress": [Function],
               "onRefreshResourcesClick": [Function],
               "onSwitchToConnectionString": [Function],
-              "onToggleKeyDown": [Function],
+              "openDialog": undefined,
               "openSidePanel": undefined,
               "provideFeedbackEmail": [Function],
               "queriesClient": QueriesClient {
@@ -2332,24 +2237,6 @@ exports[`SettingsComponent renders 1`] = `
               "refreshDatabaseAccount": [Function],
               "refreshNotebookList": [Function],
               "refreshTreeTitle": [Function],
-              "renewAdHocAccessPane": RenewAdHocAccessPane {
-                "_renewShareAccess": [Function],
-                "accessKey": [Function],
-                "container": [Circular],
-                "firstFieldHasFocus": [Function],
-                "formErrors": [Function],
-                "formErrorsDetails": [Function],
-                "id": "renewadhocaccesspane",
-                "isExecuting": [Function],
-                "isHelperImageVisible": [Function],
-                "isTemplateReady": [Function],
-                "onShowHelperImageClick": [Function],
-                "onShowHelperImageKeyPress": [Function],
-                "title": [Function],
-                "visible": [Function],
-              },
-              "renewToken": [Function],
-              "renewTokenError": [Function],
               "resourceTokenCollection": [Function],
               "resourceTokenCollectionId": [Function],
               "resourceTokenDatabaseId": [Function],
@@ -2445,22 +2332,8 @@ exports[`SettingsComponent renders 1`] = `
                 "title": [Function],
                 "visible": [Function],
               },
-              "shareAccessData": [Function],
-              "shareAccessToggleState": [Function],
-              "shareAccessUrl": [Function],
-              "shareTokenCopyHelperText": [Function],
-              "shareUrlCopyHelperText": [Function],
-              "shouldShowContextSwitchPrompt": [Function],
-              "shouldShowDataAccessExpiryDialog": [Function],
-              "shouldShowShareDialogContents": [Function],
               "signInAad": [Function],
               "sparkClusterConnectionInfo": [Function],
-              "splashScreenAdapter": SplashScreenComponentAdapter {
-                "clearMostRecent": [Function],
-                "container": [Circular],
-                "forceRender": [Function],
-                "parameters": [Function],
-              },
               "splitter": Splitter {
                 "bounds": Object {
                   "max": 400,
@@ -2518,9 +2391,6 @@ exports[`SettingsComponent renders 1`] = `
                 "openedTabs": [Function],
               },
               "toggleLeftPaneExpandedKeyPress": [Function],
-              "toggleRead": [Function],
-              "toggleReadWrite": [Function],
-              "tokenForRenewal": [Function],
               "uploadFilePane": UploadFilePane {
                 "container": [Circular],
                 "extensions": [Function],
@@ -2603,16 +2473,11 @@ exports[`SettingsComponent renders 1`] = `
               "changeFeedPolicy": [Function],
               "conflictResolutionPolicy": [Function],
               "container": Explorer {
-                "_addSynapseLinkDialogProps": [Function],
                 "_closeModalDialog": [Function],
                 "_closeSynapseLinkModalDialog": [Function],
-                "_dialogProps": [Function],
-                "_importExplorerConfigComplete": false,
                 "_isAfecFeatureRegistered": [Function],
                 "_isInitializingNotebooks": false,
-                "_isInitializingSparkConnectionInfo": false,
                 "_isSystemDatabasePredicate": [Function],
-                "_openShareDialog": [Function],
                 "_panes": Array [
                   AddDatabasePane {
                     "autoPilotUsageCost": [Function],
@@ -3015,22 +2880,6 @@ exports[`SettingsComponent renders 1`] = `
                     "validPartitionKeyValue": [Function],
                     "visible": [Function],
                   },
-                  RenewAdHocAccessPane {
-                    "_renewShareAccess": [Function],
-                    "accessKey": [Function],
-                    "container": [Circular],
-                    "firstFieldHasFocus": [Function],
-                    "formErrors": [Function],
-                    "formErrorsDetails": [Function],
-                    "id": "renewadhocaccesspane",
-                    "isExecuting": [Function],
-                    "isHelperImageVisible": [Function],
-                    "isTemplateReady": [Function],
-                    "onShowHelperImageClick": [Function],
-                    "onShowHelperImageKeyPress": [Function],
-                    "title": [Function],
-                    "visible": [Function],
-                  },
                   UploadItemsPane {
                     "container": [Circular],
                     "fileUploadSummaryText": [Function],
@@ -3270,9 +3119,6 @@ exports[`SettingsComponent renders 1`] = `
                   "visible": [Function],
                 },
                 "addDatabaseText": [Function],
-                "addSynapseLinkDialog": DialogComponentAdapter {
-                  "parameters": [Function],
-                },
                 "addTableEntityPane": AddTableEntityPane {
                   "addButtonLabel": "Add Property",
                   "attributeNameLabel": "Property Name",
@@ -3379,6 +3225,7 @@ exports[`SettingsComponent renders 1`] = `
                 },
                 "clickHostedAccountSwitch": [Function],
                 "clickHostedDirectorySwitch": [Function],
+                "closeDialog": undefined,
                 "closeSidePanel": undefined,
                 "collapsedResourceTreeWidth": 36,
                 "collectionCreationDefaults": Object {
@@ -3434,9 +3281,6 @@ exports[`SettingsComponent renders 1`] = `
                   "visible": [Function],
                 },
                 "deleteDatabaseText": [Function],
-                "dialogComponentAdapter": DialogComponentAdapter {
-                  "parameters": [Function],
-                },
                 "editTableEntityPane": EditTableEntityPane {
                   "addButtonLabel": "Add Property",
                   "attributeNameLabel": "Property Name",
@@ -3526,11 +3370,9 @@ exports[`SettingsComponent renders 1`] = `
                 "isCopyNotebookPaneEnabled": [Function],
                 "isEnableMongoCapabilityPresent": [Function],
                 "isFixedCollectionWithSharedThroughputSupported": [Function],
-                "isGalleryPublishEnabled": [Function],
                 "isGitHubPaneEnabled": [Function],
                 "isHostedDataExplorerEnabled": [Function],
                 "isLeftPaneExpanded": [Function],
-                "isLinkInjectionEnabled": [Function],
                 "isMongoIndexingEnabled": [Function],
                 "isNotebookEnabled": [Function],
                 "isNotebooksEnabledForAccount": [Function],
@@ -3540,8 +3382,6 @@ exports[`SettingsComponent renders 1`] = `
                 "isPreferredApiMongoDB": [Function],
                 "isPreferredApiTable": [Function],
                 "isPublishNotebookPaneEnabled": [Function],
-                "isReadToggled": [Function],
-                "isReadWriteToggled": [Function],
                 "isRefreshingExplorer": [Function],
                 "isResourceTokenCollectionNodeSelected": [Function],
                 "isRightPanelV2Enabled": [Function],
@@ -3596,7 +3436,7 @@ exports[`SettingsComponent renders 1`] = `
                 "onRefreshDatabasesKeyPress": [Function],
                 "onRefreshResourcesClick": [Function],
                 "onSwitchToConnectionString": [Function],
-                "onToggleKeyDown": [Function],
+                "openDialog": undefined,
                 "openSidePanel": undefined,
                 "provideFeedbackEmail": [Function],
                 "queriesClient": QueriesClient {
@@ -3626,24 +3466,6 @@ exports[`SettingsComponent renders 1`] = `
                 "refreshDatabaseAccount": [Function],
                 "refreshNotebookList": [Function],
                 "refreshTreeTitle": [Function],
-                "renewAdHocAccessPane": RenewAdHocAccessPane {
-                  "_renewShareAccess": [Function],
-                  "accessKey": [Function],
-                  "container": [Circular],
-                  "firstFieldHasFocus": [Function],
-                  "formErrors": [Function],
-                  "formErrorsDetails": [Function],
-                  "id": "renewadhocaccesspane",
-                  "isExecuting": [Function],
-                  "isHelperImageVisible": [Function],
-                  "isTemplateReady": [Function],
-                  "onShowHelperImageClick": [Function],
-                  "onShowHelperImageKeyPress": [Function],
-                  "title": [Function],
-                  "visible": [Function],
-                },
-                "renewToken": [Function],
-                "renewTokenError": [Function],
                 "resourceTokenCollection": [Function],
                 "resourceTokenCollectionId": [Function],
                 "resourceTokenDatabaseId": [Function],
@@ -3739,22 +3561,8 @@ exports[`SettingsComponent renders 1`] = `
                   "title": [Function],
                   "visible": [Function],
                 },
-                "shareAccessData": [Function],
-                "shareAccessToggleState": [Function],
-                "shareAccessUrl": [Function],
-                "shareTokenCopyHelperText": [Function],
-                "shareUrlCopyHelperText": [Function],
-                "shouldShowContextSwitchPrompt": [Function],
-                "shouldShowDataAccessExpiryDialog": [Function],
-                "shouldShowShareDialogContents": [Function],
                 "signInAad": [Function],
                 "sparkClusterConnectionInfo": [Function],
-                "splashScreenAdapter": SplashScreenComponentAdapter {
-                  "clearMostRecent": [Function],
-                  "container": [Circular],
-                  "forceRender": [Function],
-                  "parameters": [Function],
-                },
                 "splitter": Splitter {
                   "bounds": Object {
                     "max": 400,
@@ -3812,9 +3620,6 @@ exports[`SettingsComponent renders 1`] = `
                   "openedTabs": [Function],
                 },
                 "toggleLeftPaneExpandedKeyPress": [Function],
-                "toggleRead": [Function],
-                "toggleReadWrite": [Function],
-                "tokenForRenewal": [Function],
                 "uploadFilePane": UploadFilePane {
                   "container": [Circular],
                   "extensions": [Function],
@@ -3884,16 +3689,11 @@ exports[`SettingsComponent renders 1`] = `
           }
           container={
             Explorer {
-              "_addSynapseLinkDialogProps": [Function],
               "_closeModalDialog": [Function],
               "_closeSynapseLinkModalDialog": [Function],
-              "_dialogProps": [Function],
-              "_importExplorerConfigComplete": false,
               "_isAfecFeatureRegistered": [Function],
               "_isInitializingNotebooks": false,
-              "_isInitializingSparkConnectionInfo": false,
               "_isSystemDatabasePredicate": [Function],
-              "_openShareDialog": [Function],
               "_panes": Array [
                 AddDatabasePane {
                   "autoPilotUsageCost": [Function],
@@ -4296,22 +4096,6 @@ exports[`SettingsComponent renders 1`] = `
                   "validPartitionKeyValue": [Function],
                   "visible": [Function],
                 },
-                RenewAdHocAccessPane {
-                  "_renewShareAccess": [Function],
-                  "accessKey": [Function],
-                  "container": [Circular],
-                  "firstFieldHasFocus": [Function],
-                  "formErrors": [Function],
-                  "formErrorsDetails": [Function],
-                  "id": "renewadhocaccesspane",
-                  "isExecuting": [Function],
-                  "isHelperImageVisible": [Function],
-                  "isTemplateReady": [Function],
-                  "onShowHelperImageClick": [Function],
-                  "onShowHelperImageKeyPress": [Function],
-                  "title": [Function],
-                  "visible": [Function],
-                },
                 UploadItemsPane {
                   "container": [Circular],
                   "fileUploadSummaryText": [Function],
@@ -4551,9 +4335,6 @@ exports[`SettingsComponent renders 1`] = `
                 "visible": [Function],
               },
               "addDatabaseText": [Function],
-              "addSynapseLinkDialog": DialogComponentAdapter {
-                "parameters": [Function],
-              },
               "addTableEntityPane": AddTableEntityPane {
                 "addButtonLabel": "Add Property",
                 "attributeNameLabel": "Property Name",
@@ -4660,6 +4441,7 @@ exports[`SettingsComponent renders 1`] = `
               },
               "clickHostedAccountSwitch": [Function],
               "clickHostedDirectorySwitch": [Function],
+              "closeDialog": undefined,
               "closeSidePanel": undefined,
               "collapsedResourceTreeWidth": 36,
               "collectionCreationDefaults": Object {
@@ -4715,9 +4497,6 @@ exports[`SettingsComponent renders 1`] = `
                 "visible": [Function],
               },
               "deleteDatabaseText": [Function],
-              "dialogComponentAdapter": DialogComponentAdapter {
-                "parameters": [Function],
-              },
               "editTableEntityPane": EditTableEntityPane {
                 "addButtonLabel": "Add Property",
                 "attributeNameLabel": "Property Name",
@@ -4807,11 +4586,9 @@ exports[`SettingsComponent renders 1`] = `
               "isCopyNotebookPaneEnabled": [Function],
               "isEnableMongoCapabilityPresent": [Function],
               "isFixedCollectionWithSharedThroughputSupported": [Function],
-              "isGalleryPublishEnabled": [Function],
               "isGitHubPaneEnabled": [Function],
               "isHostedDataExplorerEnabled": [Function],
               "isLeftPaneExpanded": [Function],
-              "isLinkInjectionEnabled": [Function],
               "isMongoIndexingEnabled": [Function],
               "isNotebookEnabled": [Function],
               "isNotebooksEnabledForAccount": [Function],
@@ -4821,8 +4598,6 @@ exports[`SettingsComponent renders 1`] = `
               "isPreferredApiMongoDB": [Function],
               "isPreferredApiTable": [Function],
               "isPublishNotebookPaneEnabled": [Function],
-              "isReadToggled": [Function],
-              "isReadWriteToggled": [Function],
               "isRefreshingExplorer": [Function],
               "isResourceTokenCollectionNodeSelected": [Function],
               "isRightPanelV2Enabled": [Function],
@@ -4877,7 +4652,7 @@ exports[`SettingsComponent renders 1`] = `
               "onRefreshDatabasesKeyPress": [Function],
               "onRefreshResourcesClick": [Function],
               "onSwitchToConnectionString": [Function],
-              "onToggleKeyDown": [Function],
+              "openDialog": undefined,
               "openSidePanel": undefined,
               "provideFeedbackEmail": [Function],
               "queriesClient": QueriesClient {
@@ -4907,24 +4682,6 @@ exports[`SettingsComponent renders 1`] = `
               "refreshDatabaseAccount": [Function],
               "refreshNotebookList": [Function],
               "refreshTreeTitle": [Function],
-              "renewAdHocAccessPane": RenewAdHocAccessPane {
-                "_renewShareAccess": [Function],
-                "accessKey": [Function],
-                "container": [Circular],
-                "firstFieldHasFocus": [Function],
-                "formErrors": [Function],
-                "formErrorsDetails": [Function],
-                "id": "renewadhocaccesspane",
-                "isExecuting": [Function],
-                "isHelperImageVisible": [Function],
-                "isTemplateReady": [Function],
-                "onShowHelperImageClick": [Function],
-                "onShowHelperImageKeyPress": [Function],
-                "title": [Function],
-                "visible": [Function],
-              },
-              "renewToken": [Function],
-              "renewTokenError": [Function],
               "resourceTokenCollection": [Function],
               "resourceTokenCollectionId": [Function],
               "resourceTokenDatabaseId": [Function],
@@ -5020,22 +4777,8 @@ exports[`SettingsComponent renders 1`] = `
                 "title": [Function],
                 "visible": [Function],
               },
-              "shareAccessData": [Function],
-              "shareAccessToggleState": [Function],
-              "shareAccessUrl": [Function],
-              "shareTokenCopyHelperText": [Function],
-              "shareUrlCopyHelperText": [Function],
-              "shouldShowContextSwitchPrompt": [Function],
-              "shouldShowDataAccessExpiryDialog": [Function],
-              "shouldShowShareDialogContents": [Function],
               "signInAad": [Function],
               "sparkClusterConnectionInfo": [Function],
-              "splashScreenAdapter": SplashScreenComponentAdapter {
-                "clearMostRecent": [Function],
-                "container": [Circular],
-                "forceRender": [Function],
-                "parameters": [Function],
-              },
               "splitter": Splitter {
                 "bounds": Object {
                   "max": 400,
@@ -5093,9 +4836,6 @@ exports[`SettingsComponent renders 1`] = `
                 "openedTabs": [Function],
               },
               "toggleLeftPaneExpandedKeyPress": [Function],
-              "toggleRead": [Function],
-              "toggleReadWrite": [Function],
-              "tokenForRenewal": [Function],
               "uploadFilePane": UploadFilePane {
                 "container": [Circular],
                 "extensions": [Function],

src/Explorer/Explorer.tsx

@@ -21,7 +21,6 @@ import { readDatabases } from "../Common/dataAccess/readDatabases";
 import EditTableEntityPane from "./Panes/Tables/EditTableEntityPane";
 import { normalizeArmEndpoint } from "../Common/EnvironmentUtility";
 import GraphStylingPane from "./Panes/GraphStylingPane";
-import hasher from "hasher";
 import NewVertexPane from "./Panes/NewVertexPane";
 import NotebookV2Tab, { NotebookTabOptions } from "./Tabs/NotebookV2Tab";
 import Q from "q";
@@ -29,7 +28,7 @@ import ResourceTokenCollection from "./Tree/ResourceTokenCollection";
 import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 import TerminalTab from "./Tabs/TerminalTab";
 import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
-import { ActionContracts, MessageTypes } from "../Contracts/ExplorerContracts";
+import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { ArcadiaResourceManager } from "../SparkClusterManager/ArcadiaResourceManager";
 import { ArcadiaWorkspaceItem } from "./Controls/Arcadia/ArcadiaMenuPicker";
 import { AuthType } from "../AuthType";
@@ -41,24 +40,21 @@ import { configContext, Platform, updateConfigContext } from "../ConfigContext";
 import { ConsoleData, ConsoleDataType } from "./Menus/NotificationConsole/NotificationConsoleComponent";
 import { decryptJWTToken, getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 import { DefaultExperienceUtility } from "../Shared/DefaultExperienceUtility";
-import { DialogComponentAdapter } from "./Controls/DialogReactComponent/DialogComponentAdapter";
-import { DialogProps, TextFieldProps } from "./Controls/DialogReactComponent/DialogComponent";
+import { DialogProps, TextFieldProps } from "./Controls/Dialog";
 import { ExecuteSprocParamsPane } from "./Panes/ExecuteSprocParamsPane";
 import { ExplorerMetrics } from "../Common/Constants";
 import { ExplorerSettings } from "../Shared/ExplorerSettings";
 import { FileSystemUtil } from "./Notebook/FileSystemUtil";
-import { handleOpenAction } from "./OpenActions";
 import { IGalleryItem } from "../Juno/JunoClient";
 import { LoadQueryPane } from "./Panes/LoadQueryPane";
 import * as Logger from "../Common/Logger";
-import { sendMessage, sendCachedDataMessage, handleCachedDataMessage } from "../Common/MessageHandler";
+import { sendMessage, sendCachedDataMessage } from "../Common/MessageHandler";
 import { NotebookContentItem, NotebookContentItemType } from "./Notebook/NotebookContentItem";
 import { NotebookUtil } from "./Notebook/NotebookUtil";
 import { NotebookWorkspaceManager } from "../NotebookWorkspaceManager/NotebookWorkspaceManager";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { QueriesClient } from "../Common/QueriesClient";
 import { QuerySelectPane } from "./Panes/Tables/QuerySelectPane";
-import { RenewAdHocAccessPane } from "./Panes/RenewAdHocAccessPane";
 import { ResourceProviderClientFactory } from "../ResourceProvider/ResourceProviderClientFactory";
 import { ResourceTreeAdapter } from "./Tree/ResourceTreeAdapter";
 import { ResourceTreeAdapterForResourceToken } from "./Tree/ResourceTreeAdapterForResourceToken";
@@ -66,7 +62,7 @@ import { RouteHandler } from "../RouteHandlers/RouteHandler";
 import { SaveQueryPane } from "./Panes/SaveQueryPane";
 import { SettingsPane } from "./Panes/SettingsPane";
 import { SetupNotebooksPane } from "./Panes/SetupNotebooksPane";
-import { SplashScreenComponentAdapter } from "./SplashScreen/SplashScreenComponentApdapter";
+import { SplashScreen } from "./SplashScreen/SplashScreen";
 import { Splitter, SplitterBounds, SplitterDirection } from "../Common/Splitter";
 import { StringInputPane } from "./Panes/StringInputPane";
 import { TableColumnOptionsPane } from "./Panes/Tables/TableColumnOptionsPane";
@@ -98,22 +94,14 @@ BindingHandlersRegisterer.registerBindingHandlers();
 // Hold a reference to ComponentRegisterer to prevent transpiler to ignore import
 var tmp = ComponentRegisterer;
 
-enum ShareAccessToggleState {
-  ReadWrite,
-  Read,
-}
-
-interface AdHocAccessData {
-  readWriteUrl: string;
-  readUrl: string;
-}
-
 export interface ExplorerParams {
   setIsNotificationConsoleExpanded: (isExpanded: boolean) => void;
   setNotificationConsoleData: (consoleData: ConsoleData) => void;
   setInProgressConsoleDataIdToBeDeleted: (id: string) => void;
   openSidePanel: (headerText: string, panelContent: JSX.Element) => void;
   closeSidePanel: () => void;
+  closeDialog: () => void;
+  openDialog: (props: DialogProps) => void;
 }
 
 export default class Explorer {
@@ -161,8 +149,8 @@ export default class Explorer {
 
   // Panes
   public contextPanes: ContextualPaneBase[];
-  private openSidePanel: (headerText: string, panelContent: JSX.Element) => void;
-  private closeSidePanel: () => void;
+  public openSidePanel: (headerText: string, panelContent: JSX.Element) => void;
+  public closeSidePanel: () => void;
 
   // Resource Tree
   public databases: ko.ObservableArray<ViewModels.Database>;
@@ -204,7 +192,6 @@ export default class Explorer {
   public cassandraAddCollectionPane: CassandraAddCollectionPane;
   public settingsPane: SettingsPane;
   public executeSprocParamsPane: ExecuteSprocParamsPane;
-  public renewAdHocAccessPane: RenewAdHocAccessPane;
   public uploadItemsPane: UploadItemsPane;
   public uploadItemsPaneAdapter: UploadItemsPaneAdapter;
   public loadQueryPane: LoadQueryPane;
@@ -218,8 +205,6 @@ export default class Explorer {
   public copyNotebookPaneAdapter: ReactAdapter;
 
   // features
-  public isGalleryPublishEnabled: ko.Computed<boolean>;
-  public isLinkInjectionEnabled: ko.Computed<boolean>;
   public isGitHubPaneEnabled: ko.Observable<boolean>;
   public isPublishNotebookPaneEnabled: ko.Observable<boolean>;
   public isCopyNotebookPaneEnabled: ko.Observable<boolean>;
@@ -229,17 +214,6 @@ export default class Explorer {
   public canExceedMaximumValue: ko.Computed<boolean>;
   public isAutoscaleDefaultEnabled: ko.Observable<boolean>;
 
-  public shouldShowShareDialogContents: ko.Observable<boolean>;
-  public shareAccessData: ko.Observable<AdHocAccessData>;
-  public renewExplorerShareAccess: (explorer: Explorer, token: string) => Q.Promise<void>;
-  public renewTokenError: ko.Observable<string>;
-  public tokenForRenewal: ko.Observable<string>;
-  public shareAccessToggleState: ko.Observable<ShareAccessToggleState>;
-  public shareAccessUrl: ko.Observable<string>;
-  public shareUrlCopyHelperText: ko.Observable<string>;
-  public shareTokenCopyHelperText: ko.Observable<string>;
-  public shouldShowDataAccessExpiryDialog: ko.Observable<boolean>;
-  public shouldShowContextSwitchPrompt: ko.Observable<boolean>;
   public isSchemaEnabled: ko.Computed<boolean>;
 
   // Notebooks
@@ -256,12 +230,12 @@ export default class Explorer {
   public isSynapseLinkUpdating: ko.Observable<boolean>;
   public memoryUsageInfo: ko.Observable<DataModels.MemoryUsageInfo>;
   public notebookManager?: any; // This is dynamically loaded
+  public openDialog: ExplorerParams["openDialog"];
+  public closeDialog: ExplorerParams["closeDialog"];
 
   private _panes: ContextualPaneBase[] = [];
-  private _importExplorerConfigComplete: boolean = false;
   private _isSystemDatabasePredicate: (database: ViewModels.Database) => boolean = (database) => false;
   private _isInitializingNotebooks: boolean;
-  private _isInitializingSparkConnectionInfo: boolean;
   private notebookBasePath: ko.Observable<string>;
   private _arcadiaManager: ArcadiaResourceManager;
   private notebookToImport: {
@@ -271,11 +245,6 @@ export default class Explorer {
 
   // React adapters
   private commandBarComponentAdapter: CommandBarComponentAdapter;
-  private splashScreenAdapter: SplashScreenComponentAdapter;
-  private dialogComponentAdapter: DialogComponentAdapter;
-  private _dialogProps: ko.Observable<DialogProps>;
-  private addSynapseLinkDialog: DialogComponentAdapter;
-  private _addSynapseLinkDialogProps: ko.Observable<DialogProps>;
   private selfServeLoadingComponentAdapter: SelfServeLoadingComponentAdapter;
 
   private static readonly MaxNbDatabasesToAutoExpand = 5;
@@ -286,6 +255,8 @@ export default class Explorer {
     this.setInProgressConsoleDataIdToBeDeleted = params?.setInProgressConsoleDataIdToBeDeleted;
     this.openSidePanel = params?.openSidePanel;
     this.closeSidePanel = params?.closeSidePanel;
+    this.closeDialog = params?.closeDialog;
+    this.openDialog = params?.openDialog;
 
     const startKey: number = TelemetryProcessor.traceStart(Action.InitializeDataExplorer, {
       dataExplorerArea: Constants.Areas.ResourceTree,
@@ -320,7 +291,6 @@ export default class Explorer {
     this.isAccountReady = ko.observable<boolean>(false);
     this.selfServeType = ko.observable<SelfServeType>(undefined);
     this._isInitializingNotebooks = false;
-    this._isInitializingSparkConnectionInfo = false;
     this.arcadiaToken = ko.observable<string>();
     this.arcadiaToken.subscribe((token: string) => {
       if (token) {
@@ -410,33 +380,6 @@ export default class Explorer {
     this.resourceTokenCollection = ko.observable<ViewModels.CollectionBase>();
     this.resourceTokenPartitionKey = ko.observable<string>();
     this.isAuthWithResourceToken = ko.observable<boolean>(false);
-
-    this.shareAccessData = ko.observable<AdHocAccessData>({
-      readWriteUrl: undefined,
-      readUrl: undefined,
-    });
-    this.tokenForRenewal = ko.observable<string>("");
-    this.renewTokenError = ko.observable<string>("");
-    this.shareAccessUrl = ko.observable<string>();
-    this.shareUrlCopyHelperText = ko.observable<string>("Click to copy");
-    this.shareTokenCopyHelperText = ko.observable<string>("Click to copy");
-    this.shareAccessToggleState = ko.observable<ShareAccessToggleState>(ShareAccessToggleState.ReadWrite);
-    this.shareAccessToggleState.subscribe((toggleState: ShareAccessToggleState) => {
-      if (toggleState === ShareAccessToggleState.ReadWrite) {
-        this.shareAccessUrl(this.shareAccessData && this.shareAccessData().readWriteUrl);
-      } else {
-        this.shareAccessUrl(this.shareAccessData && this.shareAccessData().readUrl);
-      }
-    });
-    this.shouldShowShareDialogContents = ko.observable<boolean>(false);
-    this.shouldShowDataAccessExpiryDialog = ko.observable<boolean>(false);
-    this.shouldShowContextSwitchPrompt = ko.observable<boolean>(false);
-    this.isGalleryPublishEnabled = ko.computed<boolean>(
-      () => configContext.ENABLE_GALLERY_PUBLISH || this.isFeatureEnabled(Constants.Features.enableGalleryPublish)
-    );
-    this.isLinkInjectionEnabled = ko.computed<boolean>(() =>
-      this.isFeatureEnabled(Constants.Features.enableLinkInjection)
-    );
     this.isGitHubPaneEnabled = ko.observable<boolean>(false);
     this.isMongoIndexingEnabled = ko.observable<boolean>(false);
     this.isPublishNotebookPaneEnabled = ko.observable<boolean>(false);
@@ -715,13 +658,6 @@ export default class Explorer {
       container: this,
     });
 
-    this.renewAdHocAccessPane = new RenewAdHocAccessPane({
-      id: "renewadhocaccesspane",
-      visible: ko.observable<boolean>(false),
-
-      container: this,
-    });
-
     this.uploadItemsPane = new UploadItemsPane({
       id: "uploaditemspane",
       visible: ko.observable<boolean>(false),
@@ -790,7 +726,6 @@ export default class Explorer {
       this.cassandraAddCollectionPane,
       this.settingsPane,
       this.executeSprocParamsPane,
-      this.renewAdHocAccessPane,
       this.uploadItemsPane,
       this.loadQueryPane,
       this.saveQueryPane,
@@ -925,7 +860,6 @@ export default class Explorer {
         this.notebookManager = new notebookManagerModule.default();
         this.notebookManager.initialize({
           container: this,
-          dialogProps: this._dialogProps,
           notebookBasePath: this.notebookBasePath,
           resourceTree: this.resourceTree,
           refreshCommandBarButtons: () => this.refreshCommandBarButtons(),
@@ -993,33 +927,7 @@ export default class Explorer {
       featureSubcription.dispose();
     });
 
-    this._dialogProps = ko.observable<DialogProps>({
-      isModal: false,
-      visible: false,
-      title: undefined,
-      subText: undefined,
-      primaryButtonText: undefined,
-      secondaryButtonText: undefined,
-      onPrimaryButtonClick: undefined,
-      onSecondaryButtonClick: undefined,
-    });
-    this.dialogComponentAdapter = new DialogComponentAdapter();
-    this.dialogComponentAdapter.parameters = this._dialogProps;
-    this.splashScreenAdapter = new SplashScreenComponentAdapter(this);
     this.mostRecentActivity = new MostRecentActivity.MostRecentActivity(this);
-
-    this._addSynapseLinkDialogProps = ko.observable<DialogProps>({
-      isModal: false,
-      visible: false,
-      title: undefined,
-      subText: undefined,
-      primaryButtonText: undefined,
-      secondaryButtonText: undefined,
-      onPrimaryButtonClick: undefined,
-      onSecondaryButtonClick: undefined,
-    });
-    this.addSynapseLinkDialog = new DialogComponentAdapter();
-    this.addSynapseLinkDialog.parameters = this._addSynapseLinkDialogProps;
   }
 
   public openEnableSynapseLinkDialog(): void {
@@ -1081,257 +989,12 @@ export default class Explorer {
         TelemetryProcessor.traceCancel(Action.EnableAzureSynapseLink);
       },
     };
-    this._addSynapseLinkDialogProps(addSynapseLinkDialogProps);
+    this.openDialog(addSynapseLinkDialogProps);
     TelemetryProcessor.traceStart(Action.EnableAzureSynapseLink);
 
     // TODO: return result
   }
 
-  public copyUrlLink(src: any, event: MouseEvent): void {
-    const urlLinkInput: HTMLInputElement = document.getElementById("shareUrlLink") as HTMLInputElement;
-    urlLinkInput && urlLinkInput.select();
-    document.execCommand("copy");
-    this.shareUrlCopyHelperText("Copied");
-    setTimeout(() => this.shareUrlCopyHelperText("Click to copy"), Constants.ClientDefaults.copyHelperTimeoutMs);
-
-    TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
-      description: "Copy full screen URL",
-      databaseAccountName: this.databaseAccount() && this.databaseAccount().name,
-      defaultExperience: this.defaultExperience && this.defaultExperience(),
-      dataExplorerArea: Constants.Areas.ShareDialog,
-    });
-  }
-
-  public onCopyUrlLinkKeyPress(src: any, event: KeyboardEvent): boolean {
-    if (event.keyCode === Constants.KeyCodes.Enter || event.keyCode === Constants.KeyCodes.Space) {
-      this.copyUrlLink(src, null);
-      return false;
-    }
-
-    return true;
-  }
-
-  public copyToken(src: any, event: MouseEvent): void {
-    const tokenInput: HTMLInputElement = document.getElementById("shareToken") as HTMLInputElement;
-    tokenInput && tokenInput.select();
-    document.execCommand("copy");
-    this.shareTokenCopyHelperText("Copied");
-    setTimeout(() => this.shareTokenCopyHelperText("Click to copy"), Constants.ClientDefaults.copyHelperTimeoutMs);
-  }
-
-  public onCopyTokenKeyPress(src: any, event: KeyboardEvent): boolean {
-    if (event.keyCode === Constants.KeyCodes.Enter || event.keyCode === Constants.KeyCodes.Space) {
-      this.copyToken(src, null);
-      return false;
-    }
-
-    return true;
-  }
-
-  public renewToken = (): void => {
-    TelemetryProcessor.trace(Action.ConnectEncryptionToken);
-    this.renewTokenError("");
-    const id: string = NotificationConsoleUtils.logConsoleMessage(
-      ConsoleDataType.InProgress,
-      "Initiating connection to account"
-    );
-    this.renewExplorerShareAccess(this, this.tokenForRenewal())
-      .fail((error: any) => {
-        const stringifiedError: string = getErrorMessage(error);
-        this.renewTokenError("Invalid connection string specified");
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to initiate connection to account: ${stringifiedError}`
-        );
-      })
-      .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id));
-  };
-
-  public generateSharedAccessData(): void {
-    const id: string = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, "Generating share url");
-    AuthHeadersUtil.generateEncryptedToken().then(
-      (tokenResponse: DataModels.GenerateTokenResponse) => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(id);
-        NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Info, "Successfully generated share url");
-        this.shareAccessData({
-          readWriteUrl: this._getShareAccessUrlForToken(tokenResponse.readWrite),
-          readUrl: this._getShareAccessUrlForToken(tokenResponse.read),
-        });
-        !this.shareAccessData().readWriteUrl && this.shareAccessToggleState(ShareAccessToggleState.Read); // select read toggle by default for readers
-        this.shareAccessToggleState.valueHasMutated(); // to set initial url and token state
-        this.shareAccessData.valueHasMutated();
-        this._openShareDialog();
-      },
-      (error: any) => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(id);
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to generate share url: ${getErrorMessage(error)}`
-        );
-        console.error(error);
-      }
-    );
-  }
-
-  public renewShareAccess(token: string): Q.Promise<void> {
-    if (!this.renewExplorerShareAccess) {
-      return Q.reject("Not implemented");
-    }
-
-    const deferred: Q.Deferred<void> = Q.defer<void>();
-    const id: string = NotificationConsoleUtils.logConsoleMessage(
-      ConsoleDataType.InProgress,
-      "Initiating connection to account"
-    );
-    this.renewExplorerShareAccess(this, token)
-      .then(
-        () => {
-          NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Info, "Connection successful");
-          this.renewAdHocAccessPane && this.renewAdHocAccessPane.close();
-          deferred.resolve();
-        },
-        (error: any) => {
-          NotificationConsoleUtils.logConsoleMessage(
-            ConsoleDataType.Error,
-            `Failed to connect: ${getErrorMessage(error)}`
-          );
-          deferred.reject(error);
-        }
-      )
-      .finally(() => {
-        NotificationConsoleUtils.clearInProgressMessageWithId(id);
-      });
-
-    return deferred.promise;
-  }
-
-  public displayGuestAccessTokenRenewalPrompt(): void {
-    if (!$("#dataAccessTokenModal").dialog("instance")) {
-      const connectButton = {
-        text: "Connect",
-        class: "connectDialogButtons connectButton connectOkBtns",
-        click: () => {
-          this.renewAdHocAccessPane.open();
-          $("#dataAccessTokenModal").dialog("close");
-        },
-      };
-      const cancelButton = {
-        text: "Cancel",
-        class: "connectDialogButtons cancelBtn",
-        click: () => {
-          $("#dataAccessTokenModal").dialog("close");
-        },
-      };
-
-      $("#dataAccessTokenModal").dialog({
-        autoOpen: false,
-        buttons: [connectButton, cancelButton],
-        closeOnEscape: false,
-        draggable: false,
-        dialogClass: "no-close",
-        height: 180,
-        modal: true,
-        position: { my: "center center", at: "center center", of: window },
-        resizable: false,
-        title: "Temporary access expired",
-        width: 435,
-        close: (event: Event, ui: JQueryUI.DialogUIParams) => this.shouldShowDataAccessExpiryDialog(false),
-      });
-      $("#dataAccessTokenModal").dialog("option", "classes", {
-        "ui-dialog-titlebar": "connectTitlebar",
-      });
-    }
-    this.shouldShowDataAccessExpiryDialog(true);
-    $("#dataAccessTokenModal").dialog("open");
-  }
-
-  public isConnectExplorerVisible(): boolean {
-    return $("#connectExplorer").is(":visible") || false;
-  }
-
-  public displayContextSwitchPromptForConnectionString(connectionString: string): void {
-    const yesButton = {
-      text: "OK",
-      class: "connectDialogButtons okBtn connectOkBtns",
-      click: () => {
-        $("#contextSwitchPrompt").dialog("close");
-        this.tabsManager.closeTabs(); // clear all tabs so we dont leave any tabs from previous session open
-        this.renewShareAccess(connectionString);
-      },
-    };
-    const noButton = {
-      text: "Cancel",
-      class: "connectDialogButtons cancelBtn",
-      click: () => {
-        $("#contextSwitchPrompt").dialog("close");
-      },
-    };
-
-    if (!$("#contextSwitchPrompt").dialog("instance")) {
-      $("#contextSwitchPrompt").dialog({
-        autoOpen: false,
-        buttons: [yesButton, noButton],
-        closeOnEscape: false,
-        draggable: false,
-        dialogClass: "no-close",
-        height: 255,
-        modal: true,
-        position: { my: "center center", at: "center center", of: window },
-        resizable: false,
-        title: "Switch account",
-        width: 440,
-        close: (event: Event, ui: JQueryUI.DialogUIParams) => this.shouldShowDataAccessExpiryDialog(false),
-      });
-      $("#contextSwitchPrompt").dialog("option", "classes", {
-        "ui-dialog-titlebar": "connectTitlebar",
-      });
-      $("#contextSwitchPrompt").dialog("option", "open", (event: Event, ui: JQueryUI.DialogUIParams) => {
-        $(".ui-dialog ").css("z-index", 1001);
-        $("#contextSwitchPrompt").parent().siblings(".ui-widget-overlay").css("z-index", 1000);
-      });
-    }
-    $("#contextSwitchPrompt").dialog("option", "buttons", [yesButton, noButton]); // rebind buttons so callbacks accept current connection string
-    this.shouldShowContextSwitchPrompt(true);
-    $("#contextSwitchPrompt").dialog("open");
-  }
-
-  public displayConnectExplorerForm(): void {
-    $("#divExplorer").hide();
-    $("#connectExplorer").css("display", "flex");
-  }
-
-  public hideConnectExplorerForm(): void {
-    $("#connectExplorer").hide();
-    $("#divExplorer").show();
-  }
-
-  public isReadWriteToggled: () => boolean = (): boolean => {
-    return this.shareAccessToggleState() === ShareAccessToggleState.ReadWrite;
-  };
-
-  public isReadToggled: () => boolean = (): boolean => {
-    return this.shareAccessToggleState() === ShareAccessToggleState.Read;
-  };
-
-  public toggleReadWrite: (src: any, event: MouseEvent) => void = (src: any, event: MouseEvent) => {
-    this.shareAccessToggleState(ShareAccessToggleState.ReadWrite);
-  };
-
-  public toggleRead: (src: any, event: MouseEvent) => void = (src: any, event: MouseEvent) => {
-    this.shareAccessToggleState(ShareAccessToggleState.Read);
-  };
-
-  public onToggleKeyDown: (src: any, event: KeyboardEvent) => boolean = (src: any, event: KeyboardEvent) => {
-    if (event.keyCode === Constants.KeyCodes.LeftArrow) {
-      this.toggleReadWrite(src, null);
-      return false;
-    } else if (event.keyCode === Constants.KeyCodes.RightArrow) {
-      this.toggleRead(src, null);
-      return false;
-    }
-    return true;
-  };
-
   public isDatabaseNodeOrNoneSelected(): boolean {
     return this.isNoneSelected() || this.isDatabaseNodeSelected();
   }
@@ -1645,6 +1308,7 @@ export default class Explorer {
       );
       return;
     }
+
     const resetConfirmationDialogProps: DialogProps = {
       isModal: true,
       visible: true,
@@ -1655,7 +1319,7 @@ export default class Explorer {
       onPrimaryButtonClick: this._resetNotebookWorkspace,
       onSecondaryButtonClick: this._closeModalDialog,
     };
-    this._dialogProps(resetConfirmationDialogProps);
+    this.openDialog(resetConfirmationDialogProps);
   }
 
   private async _containsDefaultNotebookWorkspace(databaseAccount: DataModels.DatabaseAccount): Promise<boolean> {
@@ -1719,69 +1383,13 @@ export default class Explorer {
   };
 
   private _closeModalDialog = () => {
-    this._dialogProps().visible = false;
-    this._dialogProps.valueHasMutated();
+    this.closeDialog();
   };
 
   private _closeSynapseLinkModalDialog = () => {
-    this._addSynapseLinkDialogProps().visible = false;
-    this._addSynapseLinkDialogProps.valueHasMutated();
+    this.closeDialog();
   };
 
-  public handleMessage(message: any) {
-    const openAction: ActionContracts.DataExplorerAction = message.openAction;
-    if (!!openAction) {
-      if (this.isRefreshingExplorer()) {
-        const subscription = this.databases.subscribe((databases: ViewModels.Database[]) => {
-          handleOpenAction(openAction, this.nonSystemDatabases(), this);
-          subscription.dispose();
-        });
-      } else {
-        handleOpenAction(openAction, this.nonSystemDatabases(), this);
-      }
-    }
-    if (message.actionType === ActionContracts.ActionType.TransmitCachedData) {
-      handleCachedDataMessage(message);
-      return;
-    }
-    if (message.type) {
-      switch (message.type) {
-        case MessageTypes.UpdateLocationHash:
-          if (!message.locationHash) {
-            break;
-          }
-          hasher.replaceHash(message.locationHash);
-          RouteHandler.getInstance().parseHash(message.locationHash);
-          break;
-        case MessageTypes.SendNotification:
-          if (!message.message) {
-            break;
-          }
-          NotificationConsoleUtils.logConsoleMessage(
-            message.consoleDataType || ConsoleDataType.Info,
-            message.message,
-            message.id
-          );
-          break;
-        case MessageTypes.ClearNotification:
-          if (!message.id) {
-            break;
-          }
-          NotificationConsoleUtils.clearInProgressMessageWithId(message.id);
-          break;
-        case MessageTypes.LoadingStatus:
-          if (!message.text) {
-            break;
-          }
-          this._setLoadingStatusText(message.text, message.title);
-          break;
-      }
-      return;
-    }
-
-    this.splashScreenAdapter.forceRender();
-  }
-
   public findSelectedDatabase(): ViewModels.Database {
     if (!this.selectedNode()) {
       return null;
@@ -1848,19 +1456,20 @@ export default class Explorer {
         this.collectionCreationDefaults = inputs.defaultCollectionThroughput;
       }
       this.features(inputs.features);
-      this.serverId(inputs.serverId);
+      this.serverId(inputs.serverId ?? Constants.ServerIds.productionPortal);
       this.databaseAccount(databaseAccount);
-      this.subscriptionType(inputs.subscriptionType);
-      this.hasWriteAccess(inputs.hasWriteAccess);
-      this.flight(inputs.addCollectionDefaultFlight);
-      this.isTryCosmosDBSubscription(inputs.isTryCosmosDBSubscription);
-      this.isAuthWithResourceToken(inputs.isAuthWithresourceToken);
+      this.subscriptionType(inputs.subscriptionType ?? SharedConstants.CollectionCreation.DefaultSubscriptionType);
+      this.hasWriteAccess(inputs.hasWriteAccess ?? true);
+      if (inputs.addCollectionDefaultFlight) {
+        this.flight(inputs.addCollectionDefaultFlight);
+      }
+      this.isTryCosmosDBSubscription(inputs.isTryCosmosDBSubscription ?? false);
+      this.isAuthWithResourceToken(inputs.isAuthWithresourceToken ?? false);
       this.setFeatureFlagsFromFlights(inputs.flights);
       this.setSelfServeType(inputs);
-      this._importExplorerConfigComplete = true;
 
       updateConfigContext({
-        BACKEND_ENDPOINT: inputs.extensionEndpoint || "",
+        BACKEND_ENDPOINT: inputs.extensionEndpoint || configContext.BACKEND_ENDPOINT,
         ARM_ENDPOINT: normalizeArmEndpoint(inputs.csmEndpoint || configContext.ARM_ENDPOINT),
       });
 
@@ -1897,9 +1506,6 @@ export default class Explorer {
     if (flights.indexOf(Constants.Flights.MongoIndexing) !== -1) {
       this.isMongoIndexingEnabled(true);
     }
-    if (flights.indexOf(Constants.Flights.GalleryPublish) !== -1) {
-      this.isGalleryPublishEnabled = ko.computed<boolean>(() => true);
-    }
   }
 
   public findSelectedCollection(): ViewModels.Collection {
@@ -2052,83 +1658,6 @@ export default class Explorer {
     return deferred.promise;
   }
 
-  // TODO: Abstract this elsewhere
-  private _openShareDialog: () => void = (): void => {
-    if (!$("#shareDataAccessFlyout").dialog("instance")) {
-      const accountMetadataInfo = {
-        databaseAccountName: this.databaseAccount() && this.databaseAccount().name,
-        defaultExperience: this.defaultExperience && this.defaultExperience(),
-        dataExplorerArea: Constants.Areas.ShareDialog,
-      };
-      const openFullscreenButton = {
-        text: "Open",
-        class: "openFullScreenBtn openFullScreenCancelBtn",
-        click: () => {
-          TelemetryProcessor.trace(
-            Action.SelectItem,
-            ActionModifiers.Mark,
-            _.extend({}, { description: "Open full screen" }, accountMetadataInfo)
-          );
-
-          const hiddenAnchorElement: HTMLAnchorElement = document.createElement("a");
-          hiddenAnchorElement.href = this.shareAccessUrl();
-          hiddenAnchorElement.target = "_blank";
-          $("#shareDataAccessFlyout").dialog("close");
-          hiddenAnchorElement.click();
-        },
-      };
-      const cancelButton = {
-        text: "Cancel",
-        class: "shareCancelButton openFullScreenCancelBtn",
-        click: () => {
-          TelemetryProcessor.trace(
-            Action.SelectItem,
-            ActionModifiers.Mark,
-            _.extend({}, { description: "Cancel open full screen" }, accountMetadataInfo)
-          );
-          $("#shareDataAccessFlyout").dialog("close");
-        },
-      };
-      $("#shareDataAccessFlyout").dialog({
-        autoOpen: false,
-        buttons: [openFullscreenButton, cancelButton],
-        closeOnEscape: true,
-        draggable: false,
-        dialogClass: "no-close",
-        position: { my: "right top", at: "right bottom", of: $(".OpenFullScreen") },
-        resizable: false,
-        title: "Open Full Screen",
-        width: 400,
-        close: (event: Event, ui: JQueryUI.DialogUIParams) => this.shouldShowShareDialogContents(false),
-      });
-      $("#shareDataAccessFlyout").dialog("option", "classes", {
-        "ui-widget-content": "shareUrlDialog",
-        "ui-widget-header": "shareUrlTitle",
-        "ui-dialog-titlebar-close": "shareClose",
-        "ui-button": "shareCloseIcon",
-        "ui-button-icon": "cancelIcon",
-        "ui-icon": "",
-      });
-      $("#shareDataAccessFlyout").dialog("option", "open", (event: Event, ui: JQueryUI.DialogUIParams) =>
-        $(".openFullScreenBtn").focus()
-      );
-    }
-    $("#shareDataAccessFlyout").dialog("close");
-    this.shouldShowShareDialogContents(true);
-    $("#shareDataAccessFlyout").dialog("open");
-  };
-
-  private _getShareAccessUrlForToken(token: string): string {
-    if (!token) {
-      return undefined;
-    }
-
-    const urlPrefixWithKeyParam: string = `${configContext.hostedExplorerURL}?key=`;
-    const currentActiveTab = this.tabsManager.activeTab();
-
-    return `${urlPrefixWithKeyParam}${token}#/${(currentActiveTab && currentActiveTab.hashLocation()) || ""}`;
-  }
-
   private _initSettings() {
     if (!ExplorerSettings.hasSettingsDefined()) {
       ExplorerSettings.createDefaultSettings();
@@ -2262,12 +1791,7 @@ export default class Explorer {
 
   public async publishNotebook(name: string, content: string | unknown, parentDomElement?: HTMLElement): Promise<void> {
     if (this.notebookManager) {
-      await this.notebookManager.openPublishNotebookPane(
-        name,
-        content,
-        parentDomElement,
-        this.isLinkInjectionEnabled()
-      );
+      await this.notebookManager.openPublishNotebookPane(name, content, parentDomElement);
       this.publishNotebookPaneAdapter = this.notebookManager.publishNotebookPaneAdapter;
       this.isPublishNotebookPaneEnabled(true);
     }
@@ -2282,7 +1806,7 @@ export default class Explorer {
   }
 
   public showOkModalDialog(title: string, msg: string): void {
-    this._dialogProps({
+    this.openDialog({
       isModal: true,
       visible: true,
       title,
@@ -2305,7 +1829,7 @@ export default class Explorer {
     textFieldProps?: TextFieldProps,
     isPrimaryButtonDisabled?: boolean
   ): void {
-    this._dialogProps({
+    this.openDialog({
       isModal: true,
       visible: true,
       title,
@@ -2508,7 +2032,7 @@ export default class Explorer {
   }
 
   private async _refreshNotebooksEnabledStateForAccount(): Promise<void> {
-    const authType = window.authType as AuthType;
+    const authType = userContext.authType;
     if (
       authType === AuthType.EncryptedToken ||
       authType === AuthType.ResourceToken ||
@@ -2557,7 +2081,7 @@ export default class Explorer {
   public _refreshSparkEnabledStateForAccount = async (): Promise<void> => {
     const subscriptionId = userContext.subscriptionId;
     const armEndpoint = configContext.ARM_ENDPOINT;
-    const authType = window.authType as AuthType;
+    const authType = userContext.authType;
     if (!subscriptionId || !armEndpoint || authType === AuthType.EncryptedToken) {
       // explorer is not aware of the database account yet
       this.isSparkEnabledForAccount(false);
@@ -2586,7 +2110,7 @@ export default class Explorer {
   public _isAfecFeatureRegistered = async (featureName: string): Promise<boolean> => {
     const subscriptionId = userContext.subscriptionId;
     const armEndpoint = configContext.ARM_ENDPOINT;
-    const authType = window.authType as AuthType;
+    const authType = userContext.authType;
     if (!featureName || !subscriptionId || !armEndpoint || authType === AuthType.EncryptedToken) {
       // explorer is not aware of the database account yet
       return false;
@@ -2639,7 +2163,7 @@ export default class Explorer {
     }
 
     if (item.type === NotebookContentItemType.Directory && item.children && item.children.length > 0) {
-      this._dialogProps({
+      this.openDialog({
         isModal: true,
         visible: true,
         title: "Unable to delete file",

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -7,7 +7,7 @@ import * as ko from "knockout";
 import * as React from "react";
 import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
 import * as ViewModels from "../../../Contracts/ViewModels";
-import { CommandBarComponentButtonFactory } from "./CommandBarComponentButtonFactory";
+import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 import { CommandBar, ICommandBarItemProps } from "office-ui-fabric-react/lib/CommandBar";
 import { StyleConstants } from "../../../Common/Constants";
 import * as CommandBarUtil from "./CommandBarUtil";

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts

@@ -1,5 +1,5 @@
 import * as ko from "knockout";
-import { CommandBarComponentButtonFactory } from "./CommandBarComponentButtonFactory";
+import * as CommandBarComponentButtonFactory from "./CommandBarComponentButtonFactory";
 import { GitHubOAuthService } from "../../../GitHub/GitHubOAuthService";
 import NotebookManager from "../../Notebook/NotebookManager";
 import Explorer from "../../Explorer";
@@ -19,7 +19,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
       mockExplorer.isPreferredApiCassandra = ko.computed<boolean>(() => false);
       mockExplorer.isSparkEnabled = ko.observable(true);
       mockExplorer.isSynapseLinkUpdating = ko.observable(false);
-      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
 
       mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
       mockExplorer.isNotebookEnabled = ko.observable(false);
@@ -61,7 +60,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
       mockExplorer.isSynapseLinkUpdating = ko.observable(false);
       mockExplorer.isSparkEnabled = ko.observable(true);
       mockExplorer.isSynapseLinkUpdating = ko.observable(false);
-      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
 
       mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
       mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
@@ -125,7 +123,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
       mockExplorer.isPreferredApiCassandra = ko.computed<boolean>(() => false);
       mockExplorer.isSparkEnabled = ko.observable(true);
       mockExplorer.isSynapseLinkUpdating = ko.observable(false);
-      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
 
       mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
       mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
@@ -207,7 +204,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
       mockExplorer.isPreferredApiMongoDB = ko.computed<boolean>(() => false);
       mockExplorer.isSynapseLinkUpdating = ko.observable(false);
       mockExplorer.isSparkEnabled = ko.observable(true);
-      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
 
       mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
       mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);
@@ -295,7 +291,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
       mockExplorer.isDatabaseNodeOrNoneSelected = () => true;
       mockExplorer.isNotebooksEnabledForAccount = ko.observable(false);
       mockExplorer.isRunningOnNationalCloud = ko.observable(false);
-      mockExplorer.isGalleryPublishEnabled = ko.computed<boolean>(() => false);
       mockExplorer.notebookManager = new NotebookManager();
       mockExplorer.notebookManager.gitHubOAuthService = new GitHubOAuthService(undefined);
       mockExplorer.isServerlessEnabled = ko.computed<boolean>(() => false);

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts

@@ -1,616 +0,0 @@
-import * as ViewModels from "../../../Contracts/ViewModels";
-import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
-import { Areas } from "../../../Common/Constants";
-import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
-
-import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
-import AddCollectionIcon from "../../../../images/AddCollection.svg";
-import AddSqlQueryIcon from "../../../../images/AddSqlQuery_16x16.svg";
-import BrowseQueriesIcon from "../../../../images/BrowseQuery.svg";
-import * as Constants from "../../../Common/Constants";
-import OpenInTabIcon from "../../../../images/open-in-tab.svg";
-import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
-import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
-import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
-import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
-import SettingsIcon from "../../../../images/settings_15x15.svg";
-import AddUdfIcon from "../../../../images/AddUdf.svg";
-import AddTriggerIcon from "../../../../images/AddTrigger.svg";
-import ScaleIcon from "../../../../images/Scale_15x15.svg";
-import FeedbackIcon from "../../../../images/Feedback-Command.svg";
-import EnableNotebooksIcon from "../../../../images/notebook/Notebook-enable.svg";
-import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
-import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
-import GitHubIcon from "../../../../images/github.svg";
-import SynapseIcon from "../../../../images/synapse-link.svg";
-import { configContext, Platform } from "../../../ConfigContext";
-import Explorer from "../../Explorer";
-import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-
-export class CommandBarComponentButtonFactory {
-  private static counter: number = 0;
-
-  public static createStaticCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
-    if (container.isAuthWithResourceToken()) {
-      return CommandBarComponentButtonFactory.createStaticCommandBarButtonsForResourceToken(container);
-    }
-
-    const newCollectionBtn = CommandBarComponentButtonFactory.createNewCollectionGroup(container);
-    const buttons: CommandButtonComponentProps[] = [];
-
-    if (container.isFeatureEnabled && container.isFeatureEnabled("regionselectbutton")) {
-      const regions = [{ name: "West US" }, { name: "East US" }, { name: "North Europe" }];
-      buttons.push({
-        iconSrc: null,
-        onCommandClick: () => {},
-        commandButtonLabel: null,
-        hasPopup: false,
-        isDropdown: true,
-        dropdownPlaceholder: "West US",
-        dropdownSelectedKey: "West US",
-        dropdownWidth: 100,
-        children: regions.map(
-          (region) =>
-            ({
-              iconSrc: null,
-              onCommandClick: () => {},
-              commandButtonLabel: region.name,
-              dropdownItemKey: region.name,
-              hasPopup: false,
-              disabled: false,
-              ariaLabel: "",
-            } as CommandButtonComponentProps)
-        ),
-        ariaLabel: "",
-      });
-    }
-
-    buttons.push(newCollectionBtn);
-
-    const addSynapseLink = CommandBarComponentButtonFactory.createOpenSynapseLinkDialogButton(container);
-    if (addSynapseLink) {
-      buttons.push(CommandBarComponentButtonFactory.createDivider());
-      buttons.push(addSynapseLink);
-    }
-
-    if (!container.isPreferredApiTable()) {
-      newCollectionBtn.children = [CommandBarComponentButtonFactory.createNewCollectionGroup(container)];
-      const newDatabaseBtn = CommandBarComponentButtonFactory.createNewDatabase(container);
-      newCollectionBtn.children.push(newDatabaseBtn);
-    }
-
-    buttons.push(CommandBarComponentButtonFactory.createDivider());
-
-    if (container.isNotebookEnabled()) {
-      const newNotebookButton = CommandBarComponentButtonFactory.createNewNotebookButton(container);
-      newNotebookButton.children = [
-        CommandBarComponentButtonFactory.createNewNotebookButton(container),
-        CommandBarComponentButtonFactory.createuploadNotebookButton(container),
-      ];
-      buttons.push(newNotebookButton);
-
-      if (container.notebookManager?.gitHubOAuthService) {
-        buttons.push(CommandBarComponentButtonFactory.createManageGitHubAccountButton(container));
-      }
-    }
-
-    if (!container.isRunningOnNationalCloud()) {
-      if (!container.isNotebookEnabled()) {
-        buttons.push(CommandBarComponentButtonFactory.createEnableNotebooksButton(container));
-      }
-
-      if (container.isPreferredApiMongoDB()) {
-        buttons.push(CommandBarComponentButtonFactory.createOpenMongoTerminalButton(container));
-      }
-
-      if (container.isPreferredApiCassandra()) {
-        buttons.push(CommandBarComponentButtonFactory.createOpenCassandraTerminalButton(container));
-      }
-    }
-
-    if (container.isNotebookEnabled()) {
-      buttons.push(CommandBarComponentButtonFactory.createOpenTerminalButton(container));
-
-      buttons.push(CommandBarComponentButtonFactory.createNotebookWorkspaceResetButton(container));
-    }
-
-    if (!container.isDatabaseNodeOrNoneSelected()) {
-      if (container.isNotebookEnabled()) {
-        buttons.push(CommandBarComponentButtonFactory.createDivider());
-      }
-
-      const isSqlQuerySupported = container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
-      if (isSqlQuerySupported) {
-        const newSqlQueryBtn = CommandBarComponentButtonFactory.createNewSQLQueryButton(container);
-        buttons.push(newSqlQueryBtn);
-      }
-
-      const isSupportedOpenQueryApi =
-        container.isPreferredApiDocumentDB() || container.isPreferredApiMongoDB() || container.isPreferredApiGraph();
-      const isSupportedOpenQueryFromDiskApi = container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
-      if (isSupportedOpenQueryApi && container.selectedNode() && container.findSelectedCollection()) {
-        const openQueryBtn = CommandBarComponentButtonFactory.createOpenQueryButton(container);
-        openQueryBtn.children = [
-          CommandBarComponentButtonFactory.createOpenQueryButton(container),
-          CommandBarComponentButtonFactory.createOpenQueryFromDiskButton(container),
-        ];
-        buttons.push(openQueryBtn);
-      } else if (isSupportedOpenQueryFromDiskApi && container.selectedNode() && container.findSelectedCollection()) {
-        buttons.push(CommandBarComponentButtonFactory.createOpenQueryFromDiskButton(container));
-      }
-
-      if (CommandBarComponentButtonFactory.areScriptsSupported(container)) {
-        const label = "New Stored Procedure";
-        const newStoredProcedureBtn: CommandButtonComponentProps = {
-          iconSrc: AddStoredProcedureIcon,
-          iconAlt: label,
-          onCommandClick: () => {
-            const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-            selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, null);
-          },
-          commandButtonLabel: label,
-          ariaLabel: label,
-          hasPopup: true,
-          disabled: container.isDatabaseNodeOrNoneSelected(),
-        };
-
-        newStoredProcedureBtn.children = CommandBarComponentButtonFactory.createScriptCommandButtons(container);
-        buttons.push(newStoredProcedureBtn);
-      }
-    }
-
-    return buttons;
-  }
-
-  public static createContextCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
-
-    if (!container.isDatabaseNodeOrNoneSelected() && container.isPreferredApiMongoDB()) {
-      const label = "New Shell";
-      const newMongoShellBtn: CommandButtonComponentProps = {
-        iconSrc: HostedTerminalIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-          selectedCollection && (<any>selectedCollection).onNewMongoShellClick();
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: container.isDatabaseNodeOrNoneSelected() && container.isPreferredApiMongoDB(),
-      };
-      buttons.push(newMongoShellBtn);
-    }
-
-    return buttons;
-  }
-
-  public static createControlCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
-    if (configContext.platform === Platform.Hosted) {
-      return buttons;
-    }
-
-    if (!container.isPreferredApiCassandra()) {
-      const label = "Settings";
-      const settingsPaneButton: CommandButtonComponentProps = {
-        iconSrc: SettingsIcon,
-        iconAlt: label,
-        onCommandClick: () => container.settingsPane.open(),
-        commandButtonLabel: null,
-        ariaLabel: label,
-        tooltipText: label,
-        hasPopup: true,
-        disabled: false,
-      };
-      buttons.push(settingsPaneButton);
-    }
-
-    if (container.isHostedDataExplorerEnabled()) {
-      const label = "Open Full Screen";
-      const fullScreenButton: CommandButtonComponentProps = {
-        iconSrc: OpenInTabIcon,
-        iconAlt: label,
-        onCommandClick: () => container.generateSharedAccessData(),
-        commandButtonLabel: null,
-        ariaLabel: label,
-        tooltipText: label,
-        hasPopup: false,
-        disabled: !container.isHostedDataExplorerEnabled(),
-        className: "OpenFullScreen",
-      };
-      buttons.push(fullScreenButton);
-    }
-
-    if (configContext.platform !== Platform.Emulator) {
-      const label = "Feedback";
-      const feedbackButtonOptions: CommandButtonComponentProps = {
-        iconSrc: FeedbackIcon,
-        iconAlt: label,
-        onCommandClick: () => container.provideFeedbackEmail(),
-        commandButtonLabel: null,
-        ariaLabel: label,
-        tooltipText: label,
-        hasPopup: false,
-        disabled: false,
-      };
-      buttons.push(feedbackButtonOptions);
-    }
-
-    return buttons;
-  }
-
-  public static createDivider(): CommandButtonComponentProps {
-    const label = `divider${CommandBarComponentButtonFactory.counter++}`;
-    return {
-      isDivider: true,
-      commandButtonLabel: label,
-      hasPopup: false,
-      iconSrc: null,
-      iconAlt: null,
-      onCommandClick: null,
-      ariaLabel: label,
-    };
-  }
-
-  private static areScriptsSupported(container: Explorer): boolean {
-    return container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
-  }
-
-  private static createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {
-    const label = container.addCollectionText();
-    return {
-      iconSrc: AddCollectionIcon,
-      iconAlt: label,
-      onCommandClick: () => container.onNewCollectionClicked(),
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      id: "createNewContainerCommandButton",
-    };
-  }
-
-  private static createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonComponentProps {
-    if (configContext.platform === Platform.Emulator) {
-      return null;
-    }
-
-    if (container.isServerlessEnabled()) {
-      return null;
-    }
-
-    if (
-      container.databaseAccount &&
-      container.databaseAccount() &&
-      container.databaseAccount().properties &&
-      container.databaseAccount().properties.enableAnalyticalStorage
-    ) {
-      return null;
-    }
-
-    const capabilities =
-      (container.databaseAccount &&
-        container.databaseAccount() &&
-        container.databaseAccount().properties &&
-        container.databaseAccount().properties.capabilities) ||
-      [];
-    if (capabilities.some((capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics)) {
-      return null;
-    }
-
-    const label = "Enable Azure Synapse Link";
-    return {
-      iconSrc: SynapseIcon,
-      iconAlt: label,
-      onCommandClick: () => container.openEnableSynapseLinkDialog(),
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: container.isSynapseLinkUpdating(),
-      ariaLabel: label,
-    };
-  }
-
-  private static createNewDatabase(container: Explorer): CommandButtonComponentProps {
-    const label = container.addDatabaseText();
-    return {
-      iconSrc: AddDatabaseIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        container.addDatabasePane.open();
-        document.getElementById("linkAddDatabase").focus();
-      },
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-    };
-  }
-
-  private static createNewSQLQueryButton(container: Explorer): CommandButtonComponentProps {
-    if (container.isPreferredApiDocumentDB() || container.isPreferredApiGraph()) {
-      const label = "New SQL Query";
-      return {
-        iconSrc: AddSqlQueryIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewQueryClick(selectedCollection, null);
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: container.isDatabaseNodeOrNoneSelected(),
-      };
-    } else if (container.isPreferredApiMongoDB()) {
-      const label = "New Query";
-      return {
-        iconSrc: AddSqlQueryIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-          selectedCollection && (<any>selectedCollection).onNewMongoQueryClick(selectedCollection, null);
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: container.isDatabaseNodeOrNoneSelected(),
-      };
-    }
-
-    return null;
-  }
-
-  public static createScriptCommandButtons(container: Explorer): CommandButtonComponentProps[] {
-    const buttons: CommandButtonComponentProps[] = [];
-
-    const shouldEnableScriptsCommands: boolean =
-      !container.isDatabaseNodeOrNoneSelected() && CommandBarComponentButtonFactory.areScriptsSupported(container);
-
-    if (shouldEnableScriptsCommands) {
-      const label = "New Stored Procedure";
-      const newStoredProcedureBtn: CommandButtonComponentProps = {
-        iconSrc: AddStoredProcedureIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection, null);
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: container.isDatabaseNodeOrNoneSelected(),
-      };
-      buttons.push(newStoredProcedureBtn);
-    }
-
-    if (shouldEnableScriptsCommands) {
-      const label = "New UDF";
-      const newUserDefinedFunctionBtn: CommandButtonComponentProps = {
-        iconSrc: AddUdfIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection, null);
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: container.isDatabaseNodeOrNoneSelected(),
-      };
-      buttons.push(newUserDefinedFunctionBtn);
-    }
-
-    if (shouldEnableScriptsCommands) {
-      const label = "New Trigger";
-      const newTriggerBtn: CommandButtonComponentProps = {
-        iconSrc: AddTriggerIcon,
-        iconAlt: label,
-        onCommandClick: () => {
-          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
-          selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection, null);
-        },
-        commandButtonLabel: label,
-        ariaLabel: label,
-        hasPopup: true,
-        disabled: container.isDatabaseNodeOrNoneSelected(),
-      };
-      buttons.push(newTriggerBtn);
-    }
-
-    return buttons;
-  }
-
-  private static createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
-    const label = "New Notebook";
-    return {
-      iconSrc: NewNotebookIcon,
-      iconAlt: label,
-      onCommandClick: () => container.onNewNotebookClicked(),
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: false,
-      ariaLabel: label,
-    };
-  }
-
-  private static createuploadNotebookButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Upload to Notebook Server";
-    return {
-      iconSrc: NewNotebookIcon,
-      iconAlt: label,
-      onCommandClick: () => container.onUploadToNotebookServerClicked(),
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: false,
-      ariaLabel: label,
-    };
-  }
-
-  private static createOpenQueryButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Open Query";
-    return {
-      iconSrc: BrowseQueriesIcon,
-      iconAlt: label,
-      onCommandClick: () => container.browseQueriesPane.open(),
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled: false,
-    };
-  }
-
-  private static createOpenQueryFromDiskButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Open Query From Disk";
-    return {
-      iconSrc: OpenQueryFromDiskIcon,
-      iconAlt: label,
-      onCommandClick: () => container.loadQueryPane.open(),
-      commandButtonLabel: label,
-      ariaLabel: label,
-      hasPopup: true,
-      disabled: false,
-    };
-  }
-
-  private static createEnableNotebooksButton(container: Explorer): CommandButtonComponentProps {
-    if (configContext.platform === Platform.Emulator) {
-      return null;
-    }
-    const label = "Enable Notebooks (Preview)";
-    const tooltip =
-      "Notebooks are not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
-    const description =
-      "Looks like you have not yet created a notebooks workspace for this account. To proceed and start using notebooks, we'll need to create a default notebooks workspace in this account.";
-    return {
-      iconSrc: EnableNotebooksIcon,
-      iconAlt: label,
-      onCommandClick: () => container.setupNotebooksPane.openWithTitleAndDescription(label, description),
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: !container.isNotebooksEnabledForAccount(),
-      ariaLabel: label,
-      tooltipText: container.isNotebooksEnabledForAccount() ? "" : tooltip,
-    };
-  }
-
-  private static createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Open Terminal";
-    return {
-      iconSrc: CosmosTerminalIcon,
-      iconAlt: label,
-      onCommandClick: () => container.openNotebookTerminal(ViewModels.TerminalKind.Default),
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: false,
-      ariaLabel: label,
-    };
-  }
-
-  private static createOpenMongoTerminalButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Open Mongo Shell";
-    const tooltip =
-      "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
-    const title = "Set up workspace";
-    const description =
-      "Looks like you have not created a workspace for this account. To proceed and start using features including mongo shell and notebook, we will need to create a default workspace in this account.";
-    const disableButton = !container.isNotebooksEnabledForAccount() && !container.isNotebookEnabled();
-    return {
-      iconSrc: HostedTerminalIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        if (container.isNotebookEnabled()) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
-        } else {
-          container.setupNotebooksPane.openWithTitleAndDescription(title, description);
-        }
-      },
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: disableButton,
-      ariaLabel: label,
-      tooltipText: !disableButton ? "" : tooltip,
-    };
-  }
-
-  private static createOpenCassandraTerminalButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Open Cassandra Shell";
-    const tooltip =
-      "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
-    const title = "Set up workspace";
-    const description =
-      "Looks like you have not created a workspace for this account. To proceed and start using features including cassandra shell and notebook, we will need to create a default workspace in this account.";
-    const disableButton = !container.isNotebooksEnabledForAccount() && !container.isNotebookEnabled();
-    return {
-      iconSrc: HostedTerminalIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        if (container.isNotebookEnabled()) {
-          container.openNotebookTerminal(ViewModels.TerminalKind.Cassandra);
-        } else {
-          container.setupNotebooksPane.openWithTitleAndDescription(title, description);
-        }
-      },
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: disableButton,
-      ariaLabel: label,
-      tooltipText: !disableButton ? "" : tooltip,
-    };
-  }
-
-  private static createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
-    const label = "Reset Workspace";
-    return {
-      iconSrc: ResetWorkspaceIcon,
-      iconAlt: label,
-      onCommandClick: () => container.resetNotebookWorkspace(),
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: false,
-      ariaLabel: label,
-    };
-  }
-
-  private static createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
-    let connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
-    const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
-    return {
-      iconSrc: GitHubIcon,
-      iconAlt: label,
-      onCommandClick: () => {
-        if (!connectedToGitHub) {
-          TelemetryProcessor.trace(Action.NotebooksGitHubConnect, ActionModifiers.Mark, {
-            databaseAccountName: container.databaseAccount() && container.databaseAccount().name,
-            defaultExperience: container.defaultExperience && container.defaultExperience(),
-            dataExplorerArea: Areas.Notebook,
-          });
-        }
-        container.gitHubReposPane.open();
-      },
-      commandButtonLabel: label,
-      hasPopup: false,
-      disabled: false,
-      ariaLabel: label,
-    };
-  }
-
-  private static createStaticCommandBarButtonsForResourceToken(container: Explorer): CommandButtonComponentProps[] {
-    const newSqlQueryBtn = CommandBarComponentButtonFactory.createNewSQLQueryButton(container);
-    const openQueryBtn = CommandBarComponentButtonFactory.createOpenQueryButton(container);
-
-    newSqlQueryBtn.disabled = !container.isResourceTokenCollectionNodeSelected();
-    newSqlQueryBtn.onCommandClick = () => {
-      const resourceTokenCollection: ViewModels.CollectionBase = container.resourceTokenCollection();
-      resourceTokenCollection && resourceTokenCollection.onNewQueryClick(resourceTokenCollection, undefined);
-    };
-
-    openQueryBtn.disabled = !container.isResourceTokenCollectionNodeSelected();
-    if (!openQueryBtn.disabled) {
-      openQueryBtn.children = [
-        CommandBarComponentButtonFactory.createOpenQueryButton(container),
-        CommandBarComponentButtonFactory.createOpenQueryFromDiskButton(container),
-      ];
-    }
-
-    return [newSqlQueryBtn, openQueryBtn];
-  }
-}

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -0,0 +1,581 @@
+import * as ViewModels from "../../../Contracts/ViewModels";
+import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryConstants";
+import { Areas } from "../../../Common/Constants";
+import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor";
+
+import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
+import AddCollectionIcon from "../../../../images/AddCollection.svg";
+import AddSqlQueryIcon from "../../../../images/AddSqlQuery_16x16.svg";
+import BrowseQueriesIcon from "../../../../images/BrowseQuery.svg";
+import * as Constants from "../../../Common/Constants";
+import OpenInTabIcon from "../../../../images/open-in-tab.svg";
+import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
+import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
+import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
+import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
+import SettingsIcon from "../../../../images/settings_15x15.svg";
+import AddUdfIcon from "../../../../images/AddUdf.svg";
+import AddTriggerIcon from "../../../../images/AddTrigger.svg";
+import FeedbackIcon from "../../../../images/Feedback-Command.svg";
+import EnableNotebooksIcon from "../../../../images/notebook/Notebook-enable.svg";
+import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
+import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
+import GitHubIcon from "../../../../images/github.svg";
+import SynapseIcon from "../../../../images/synapse-link.svg";
+import { configContext, Platform } from "../../../ConfigContext";
+import Explorer from "../../Explorer";
+import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
+import * as React from "react";
+import { OpenFullScreen } from "../../OpenFullScreen";
+
+let counter = 0;
+
+export function createStaticCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
+  if (container.isAuthWithResourceToken()) {
+    return createStaticCommandBarButtonsForResourceToken(container);
+  }
+
+  const newCollectionBtn = createNewCollectionGroup(container);
+  const buttons: CommandButtonComponentProps[] = [];
+
+  buttons.push(newCollectionBtn);
+
+  const addSynapseLink = createOpenSynapseLinkDialogButton(container);
+  if (addSynapseLink) {
+    buttons.push(createDivider());
+    buttons.push(addSynapseLink);
+  }
+
+  if (!container.isPreferredApiTable()) {
+    newCollectionBtn.children = [createNewCollectionGroup(container)];
+    const newDatabaseBtn = createNewDatabase(container);
+    newCollectionBtn.children.push(newDatabaseBtn);
+  }
+
+  buttons.push(createDivider());
+
+  if (container.isNotebookEnabled()) {
+    const newNotebookButton = createNewNotebookButton(container);
+    newNotebookButton.children = [createNewNotebookButton(container), createuploadNotebookButton(container)];
+    buttons.push(newNotebookButton);
+
+    if (container.notebookManager?.gitHubOAuthService) {
+      buttons.push(createManageGitHubAccountButton(container));
+    }
+  }
+
+  if (!container.isRunningOnNationalCloud()) {
+    if (!container.isNotebookEnabled()) {
+      buttons.push(createEnableNotebooksButton(container));
+    }
+
+    if (container.isPreferredApiMongoDB()) {
+      buttons.push(createOpenMongoTerminalButton(container));
+    }
+
+    if (container.isPreferredApiCassandra()) {
+      buttons.push(createOpenCassandraTerminalButton(container));
+    }
+  }
+
+  if (container.isNotebookEnabled()) {
+    buttons.push(createOpenTerminalButton(container));
+
+    buttons.push(createNotebookWorkspaceResetButton(container));
+  }
+
+  if (!container.isDatabaseNodeOrNoneSelected()) {
+    if (container.isNotebookEnabled()) {
+      buttons.push(createDivider());
+    }
+
+    const isSqlQuerySupported = container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
+    if (isSqlQuerySupported) {
+      const newSqlQueryBtn = createNewSQLQueryButton(container);
+      buttons.push(newSqlQueryBtn);
+    }
+
+    const isSupportedOpenQueryApi =
+      container.isPreferredApiDocumentDB() || container.isPreferredApiMongoDB() || container.isPreferredApiGraph();
+    const isSupportedOpenQueryFromDiskApi = container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
+    if (isSupportedOpenQueryApi && container.selectedNode() && container.findSelectedCollection()) {
+      const openQueryBtn = createOpenQueryButton(container);
+      openQueryBtn.children = [createOpenQueryButton(container), createOpenQueryFromDiskButton(container)];
+      buttons.push(openQueryBtn);
+    } else if (isSupportedOpenQueryFromDiskApi && container.selectedNode() && container.findSelectedCollection()) {
+      buttons.push(createOpenQueryFromDiskButton(container));
+    }
+
+    if (areScriptsSupported(container)) {
+      const label = "New Stored Procedure";
+      const newStoredProcedureBtn: CommandButtonComponentProps = {
+        iconSrc: AddStoredProcedureIcon,
+        iconAlt: label,
+        onCommandClick: () => {
+          const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+          selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
+        },
+        commandButtonLabel: label,
+        ariaLabel: label,
+        hasPopup: true,
+        disabled: container.isDatabaseNodeOrNoneSelected(),
+      };
+
+      newStoredProcedureBtn.children = createScriptCommandButtons(container);
+      buttons.push(newStoredProcedureBtn);
+    }
+  }
+
+  return buttons;
+}
+
+export function createContextCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
+  const buttons: CommandButtonComponentProps[] = [];
+
+  if (!container.isDatabaseNodeOrNoneSelected() && container.isPreferredApiMongoDB()) {
+    const label = "New Shell";
+    const newMongoShellBtn: CommandButtonComponentProps = {
+      iconSrc: HostedTerminalIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewMongoShellClick();
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: container.isDatabaseNodeOrNoneSelected() && container.isPreferredApiMongoDB(),
+    };
+    buttons.push(newMongoShellBtn);
+  }
+
+  return buttons;
+}
+
+export function createControlCommandBarButtons(container: Explorer): CommandButtonComponentProps[] {
+  const buttons: CommandButtonComponentProps[] = [];
+  if (configContext.platform === Platform.Hosted) {
+    return buttons;
+  }
+
+  if (!container.isPreferredApiCassandra()) {
+    const label = "Settings";
+    const settingsPaneButton: CommandButtonComponentProps = {
+      iconSrc: SettingsIcon,
+      iconAlt: label,
+      onCommandClick: () => container.settingsPane.open(),
+      commandButtonLabel: undefined,
+      ariaLabel: label,
+      tooltipText: label,
+      hasPopup: true,
+      disabled: false,
+    };
+    buttons.push(settingsPaneButton);
+  }
+
+  if (container.isHostedDataExplorerEnabled()) {
+    const label = "Open Full Screen";
+    const fullScreenButton: CommandButtonComponentProps = {
+      iconSrc: OpenInTabIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        container.openSidePanel("Open Full Screen", <OpenFullScreen />);
+      },
+      commandButtonLabel: undefined,
+      ariaLabel: label,
+      tooltipText: label,
+      hasPopup: false,
+      disabled: !container.isHostedDataExplorerEnabled(),
+      className: "OpenFullScreen",
+    };
+    buttons.push(fullScreenButton);
+  }
+
+  if (configContext.platform !== Platform.Emulator) {
+    const label = "Feedback";
+    const feedbackButtonOptions: CommandButtonComponentProps = {
+      iconSrc: FeedbackIcon,
+      iconAlt: label,
+      onCommandClick: () => container.provideFeedbackEmail(),
+      commandButtonLabel: undefined,
+      ariaLabel: label,
+      tooltipText: label,
+      hasPopup: false,
+      disabled: false,
+    };
+    buttons.push(feedbackButtonOptions);
+  }
+
+  return buttons;
+}
+
+export function createDivider(): CommandButtonComponentProps {
+  const label = `divider${counter++}`;
+  return {
+    isDivider: true,
+    commandButtonLabel: label,
+    hasPopup: false,
+    iconSrc: undefined,
+    iconAlt: undefined,
+    onCommandClick: undefined,
+    ariaLabel: label,
+  };
+}
+
+function areScriptsSupported(container: Explorer): boolean {
+  return container.isPreferredApiDocumentDB() || container.isPreferredApiGraph();
+}
+
+function createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {
+  const label = container.addCollectionText();
+  return {
+    iconSrc: AddCollectionIcon,
+    iconAlt: label,
+    onCommandClick: () => container.onNewCollectionClicked(),
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    id: "createNewContainerCommandButton",
+  };
+}
+
+function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonComponentProps {
+  if (configContext.platform === Platform.Emulator) {
+    return undefined;
+  }
+
+  if (container.isServerlessEnabled()) {
+    return undefined;
+  }
+
+  if (
+    container.databaseAccount &&
+    container.databaseAccount() &&
+    container.databaseAccount().properties &&
+    container.databaseAccount().properties.enableAnalyticalStorage
+  ) {
+    return undefined;
+  }
+
+  const capabilities =
+    (container.databaseAccount &&
+      container.databaseAccount() &&
+      container.databaseAccount().properties &&
+      container.databaseAccount().properties.capabilities) ||
+    [];
+  if (capabilities.some((capability) => capability.name === Constants.CapabilityNames.EnableStorageAnalytics)) {
+    return undefined;
+  }
+
+  const label = "Enable Azure Synapse Link";
+  return {
+    iconSrc: SynapseIcon,
+    iconAlt: label,
+    onCommandClick: () => container.openEnableSynapseLinkDialog(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: container.isSynapseLinkUpdating(),
+    ariaLabel: label,
+  };
+}
+
+function createNewDatabase(container: Explorer): CommandButtonComponentProps {
+  const label = container.addDatabaseText();
+  return {
+    iconSrc: AddDatabaseIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      container.addDatabasePane.open();
+      document.getElementById("linkAddDatabase").focus();
+    },
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+  };
+}
+
+function createNewSQLQueryButton(container: Explorer): CommandButtonComponentProps {
+  if (container.isPreferredApiDocumentDB() || container.isPreferredApiGraph()) {
+    const label = "New SQL Query";
+    return {
+      iconSrc: AddSqlQueryIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: container.isDatabaseNodeOrNoneSelected(),
+    };
+  } else if (container.isPreferredApiMongoDB()) {
+    const label = "New Query";
+    return {
+      iconSrc: AddSqlQueryIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: container.isDatabaseNodeOrNoneSelected(),
+    };
+  }
+
+  return undefined;
+}
+
+export function createScriptCommandButtons(container: Explorer): CommandButtonComponentProps[] {
+  const buttons: CommandButtonComponentProps[] = [];
+
+  const shouldEnableScriptsCommands: boolean =
+    !container.isDatabaseNodeOrNoneSelected() && areScriptsSupported(container);
+
+  if (shouldEnableScriptsCommands) {
+    const label = "New Stored Procedure";
+    const newStoredProcedureBtn: CommandButtonComponentProps = {
+      iconSrc: AddStoredProcedureIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: container.isDatabaseNodeOrNoneSelected(),
+    };
+    buttons.push(newStoredProcedureBtn);
+  }
+
+  if (shouldEnableScriptsCommands) {
+    const label = "New UDF";
+    const newUserDefinedFunctionBtn: CommandButtonComponentProps = {
+      iconSrc: AddUdfIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: container.isDatabaseNodeOrNoneSelected(),
+    };
+    buttons.push(newUserDefinedFunctionBtn);
+  }
+
+  if (shouldEnableScriptsCommands) {
+    const label = "New Trigger";
+    const newTriggerBtn: CommandButtonComponentProps = {
+      iconSrc: AddTriggerIcon,
+      iconAlt: label,
+      onCommandClick: () => {
+        const selectedCollection: ViewModels.Collection = container.findSelectedCollection();
+        selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection);
+      },
+      commandButtonLabel: label,
+      ariaLabel: label,
+      hasPopup: true,
+      disabled: container.isDatabaseNodeOrNoneSelected(),
+    };
+    buttons.push(newTriggerBtn);
+  }
+
+  return buttons;
+}
+
+function createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
+  const label = "New Notebook";
+  return {
+    iconSrc: NewNotebookIcon,
+    iconAlt: label,
+    onCommandClick: () => container.onNewNotebookClicked(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: false,
+    ariaLabel: label,
+  };
+}
+
+function createuploadNotebookButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Upload to Notebook Server";
+  return {
+    iconSrc: NewNotebookIcon,
+    iconAlt: label,
+    onCommandClick: () => container.onUploadToNotebookServerClicked(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: false,
+    ariaLabel: label,
+  };
+}
+
+function createOpenQueryButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Query";
+  return {
+    iconSrc: BrowseQueriesIcon,
+    iconAlt: label,
+    onCommandClick: () => container.browseQueriesPane.open(),
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    disabled: false,
+  };
+}
+
+function createOpenQueryFromDiskButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Query From Disk";
+  return {
+    iconSrc: OpenQueryFromDiskIcon,
+    iconAlt: label,
+    onCommandClick: () => container.loadQueryPane.open(),
+    commandButtonLabel: label,
+    ariaLabel: label,
+    hasPopup: true,
+    disabled: false,
+  };
+}
+
+function createEnableNotebooksButton(container: Explorer): CommandButtonComponentProps {
+  if (configContext.platform === Platform.Emulator) {
+    return undefined;
+  }
+  const label = "Enable Notebooks (Preview)";
+  const tooltip =
+    "Notebooks are not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
+  const description =
+    "Looks like you have not yet created a notebooks workspace for this account. To proceed and start using notebooks, we'll need to create a default notebooks workspace in this account.";
+  return {
+    iconSrc: EnableNotebooksIcon,
+    iconAlt: label,
+    onCommandClick: () => container.setupNotebooksPane.openWithTitleAndDescription(label, description),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: !container.isNotebooksEnabledForAccount(),
+    ariaLabel: label,
+    tooltipText: container.isNotebooksEnabledForAccount() ? "" : tooltip,
+  };
+}
+
+function createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Terminal";
+  return {
+    iconSrc: CosmosTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => container.openNotebookTerminal(ViewModels.TerminalKind.Default),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: false,
+    ariaLabel: label,
+  };
+}
+
+function createOpenMongoTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Mongo Shell";
+  const tooltip =
+    "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
+  const title = "Set up workspace";
+  const description =
+    "Looks like you have not created a workspace for this account. To proceed and start using features including mongo shell and notebook, we will need to create a default workspace in this account.";
+  const disableButton = !container.isNotebooksEnabledForAccount() && !container.isNotebookEnabled();
+  return {
+    iconSrc: HostedTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      if (container.isNotebookEnabled()) {
+        container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
+      } else {
+        container.setupNotebooksPane.openWithTitleAndDescription(title, description);
+      }
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: disableButton,
+    ariaLabel: label,
+    tooltipText: !disableButton ? "" : tooltip,
+  };
+}
+
+function createOpenCassandraTerminalButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Open Cassandra Shell";
+  const tooltip =
+    "This feature is not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks.";
+  const title = "Set up workspace";
+  const description =
+    "Looks like you have not created a workspace for this account. To proceed and start using features including cassandra shell and notebook, we will need to create a default workspace in this account.";
+  const disableButton = !container.isNotebooksEnabledForAccount() && !container.isNotebookEnabled();
+  return {
+    iconSrc: HostedTerminalIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      if (container.isNotebookEnabled()) {
+        container.openNotebookTerminal(ViewModels.TerminalKind.Cassandra);
+      } else {
+        container.setupNotebooksPane.openWithTitleAndDescription(title, description);
+      }
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: disableButton,
+    ariaLabel: label,
+    tooltipText: !disableButton ? "" : tooltip,
+  };
+}
+
+function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
+  const label = "Reset Workspace";
+  return {
+    iconSrc: ResetWorkspaceIcon,
+    iconAlt: label,
+    onCommandClick: () => container.resetNotebookWorkspace(),
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: false,
+    ariaLabel: label,
+  };
+}
+
+function createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
+  const connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
+  const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
+  return {
+    iconSrc: GitHubIcon,
+    iconAlt: label,
+    onCommandClick: () => {
+      if (!connectedToGitHub) {
+        TelemetryProcessor.trace(Action.NotebooksGitHubConnect, ActionModifiers.Mark, {
+          databaseAccountName: container.databaseAccount() && container.databaseAccount().name,
+          defaultExperience: container.defaultExperience && container.defaultExperience(),
+          dataExplorerArea: Areas.Notebook,
+        });
+      }
+      container.gitHubReposPane.open();
+    },
+    commandButtonLabel: label,
+    hasPopup: false,
+    disabled: false,
+    ariaLabel: label,
+  };
+}
+
+function createStaticCommandBarButtonsForResourceToken(container: Explorer): CommandButtonComponentProps[] {
+  const newSqlQueryBtn = createNewSQLQueryButton(container);
+  const openQueryBtn = createOpenQueryButton(container);
+
+  newSqlQueryBtn.disabled = !container.isResourceTokenCollectionNodeSelected();
+  newSqlQueryBtn.onCommandClick = () => {
+    const resourceTokenCollection: ViewModels.CollectionBase = container.resourceTokenCollection();
+    resourceTokenCollection && resourceTokenCollection.onNewQueryClick(resourceTokenCollection, undefined);
+  };
+
+  openQueryBtn.disabled = !container.isResourceTokenCollectionNodeSelected();
+  if (!openQueryBtn.disabled) {
+    openQueryBtn.children = [createOpenQueryButton(container), createOpenQueryFromDiskButton(container)];
+  }
+
+  return [newSqlQueryBtn, openQueryBtn];
+}

src/Explorer/Notebook/NotebookManager.ts

@@ -18,7 +18,6 @@ import { contents } from "rx-jupyter";
 import { NotebookContainerClient } from "./NotebookContainerClient";
 import { MemoryUsageInfo } from "../../Contracts/DataModels";
 import { NotebookContentClient } from "./NotebookContentClient";
-import { DialogProps } from "../Controls/DialogReactComponent/DialogComponent";
 import { ResourceTreeAdapter } from "../Tree/ResourceTreeAdapter";
 import { PublishNotebookPaneAdapter } from "../Panes/PublishNotebookPaneAdapter";
 import { getFullName } from "../../Utils/UserUtils";
@@ -31,7 +30,6 @@ import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
 export interface NotebookManagerOptions {
   container: Explorer;
   notebookBasePath: ko.Observable<string>;
-  dialogProps: ko.Observable<DialogProps>;
   resourceTree: ResourceTreeAdapter;
   refreshCommandBarButtons: () => void;
   refreshNotebookList: () => void;
@@ -89,9 +87,7 @@ export default class NotebookManager {
       this.notebookContentProvider
     );
 
-    if (this.params.container.isGalleryPublishEnabled()) {
-      this.publishNotebookPaneAdapter = new PublishNotebookPaneAdapter(this.params.container, this.junoClient);
-    }
+    this.publishNotebookPaneAdapter = new PublishNotebookPaneAdapter(this.params.container, this.junoClient);
 
     this.copyNotebookPaneAdapter = new CopyNotebookPaneAdapter(
       this.params.container,
@@ -127,10 +123,9 @@ export default class NotebookManager {
   public async openPublishNotebookPane(
     name: string,
     content: string | ImmutableNotebook,
-    parentDomElement: HTMLElement,
-    isLinkInjectionEnabled: boolean
+    parentDomElement: HTMLElement
   ): Promise<void> {
-    await this.publishNotebookPaneAdapter.open(name, getFullName(), content, parentDomElement, isLinkInjectionEnabled);
+    await this.publishNotebookPaneAdapter.open(name, getFullName(), content, parentDomElement);
   }
 
   public openCopyNotebookPane(name: string, content: string): void {
@@ -181,10 +176,8 @@ export default class NotebookManager {
           multiline: true,
           defaultValue: commitMsg,
           rows: 3,
-          onChange: (_, newValue: string) => {
+          onChange: (_: unknown, newValue: string) => {
             commitMsg = newValue;
-            this.params.dialogProps().primaryButtonDisabled = !commitMsg;
-            this.params.dialogProps.valueHasMutated();
           },
         },
         !commitMsg

src/Explorer/OpenActions.test.ts

@@ -20,7 +20,6 @@ describe("OpenActions", () => {
       explorer.cassandraAddCollectionPane = {} as CassandraAddCollectionPane;
       explorer.cassandraAddCollectionPane.open = jest.fn();
       explorer.closeAllPanes = () => {};
-      explorer.isConnectExplorerVisible = () => false;
 
       database = {
         id: ko.observable("db"),

src/Explorer/OpenActions.ts

@@ -133,25 +133,19 @@ function openPane(action: ActionContracts.OpenPane, explorer: Explorer) {
     (<any>action).paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.AddCollection]
   ) {
     explorer.closeAllPanes();
-    !explorer.isConnectExplorerVisible() && explorer.addCollectionPane.open();
+    explorer.addCollectionPane.open();
   } else if (
     action.paneKind === ActionContracts.PaneKind.CassandraAddCollection ||
     (<any>action).paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.CassandraAddCollection]
   ) {
     explorer.closeAllPanes();
-    !explorer.isConnectExplorerVisible() && explorer.cassandraAddCollectionPane.open();
+    explorer.cassandraAddCollectionPane.open();
   } else if (
     action.paneKind === ActionContracts.PaneKind.GlobalSettings ||
     (<any>action).paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.GlobalSettings]
   ) {
     explorer.closeAllPanes();
-    !explorer.isConnectExplorerVisible() && explorer.settingsPane.open();
-  } else if (
-    action.paneKind === ActionContracts.PaneKind.AdHocAccess ||
-    (<any>action).paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.AdHocAccess]
-  ) {
-    explorer.closeAllPanes();
-    !explorer.isConnectExplorerVisible() && explorer.renewAdHocAccessPane.open();
+    explorer.settingsPane.open();
   }
 }
 

src/Explorer/OpenFullScreen.test.tsx

@@ -0,0 +1,17 @@
+jest.mock("../hooks/useFullScreenURLs");
+import "@testing-library/jest-dom";
+import { render, screen } from "@testing-library/react";
+import React from "react";
+import { useFullScreenURLs } from "../hooks/useFullScreenURLs";
+import { OpenFullScreen } from "./OpenFullScreen";
+
+it("renders the correct URLs", () => {
+  (useFullScreenURLs as jest.Mock).mockReturnValue({
+    readWrite: "read and write url",
+    read: "read only url",
+  });
+
+  render(<OpenFullScreen />);
+  expect(screen.getByLabelText("Read and Write")).toHaveValue("https://cosmos.azure.com/?key=read and write url");
+  expect(screen.getByLabelText("Read Only")).toHaveValue("https://cosmos.azure.com/?key=read only url");
+});

src/Explorer/OpenFullScreen.tsx

@@ -0,0 +1,61 @@
+import { Spinner, Stack, Text, TextField } from "office-ui-fabric-react";
+import { DefaultButton, PrimaryButton } from "office-ui-fabric-react/lib/Button";
+import * as React from "react";
+import { useFullScreenURLs } from "../hooks/useFullScreenURLs";
+import copyToClipboard from "clipboard-copy";
+
+export const OpenFullScreen: React.FunctionComponent = () => {
+  const result = useFullScreenURLs();
+  if (!result) {
+    return <Spinner label="Generating URLs..." ariaLive="assertive" labelPosition="right" />;
+  }
+
+  const readWriteUrl = `https://cosmos.azure.com/?key=${result.readWrite}`;
+  const readUrl = `https://cosmos.azure.com/?key=${result.read}`;
+
+  return (
+    <>
+      <Stack tokens={{ childrenGap: 10 }}>
+        <Text>
+          Open this database account in a new browser tab with Cosmos DB Explorer. Or copy the read-write or read only
+          access urls below to share with others. For security purposes, the URLs grant time-bound access to the
+          account. When access expires, you can reconnect, using a valid connection string for the account.
+        </Text>
+        <TextField label="Read and Write" readOnly defaultValue={readWriteUrl} />
+        <Stack horizontal tokens={{ childrenGap: 10 }}>
+          <DefaultButton
+            onClick={() => {
+              copyToClipboard(readWriteUrl);
+            }}
+            text="Copy"
+            iconProps={{ iconName: "Copy" }}
+          />
+          <PrimaryButton
+            onClick={() => {
+              window.open(readWriteUrl, "_blank");
+            }}
+            text="Open"
+            iconProps={{ iconName: "OpenInNewWindow" }}
+          />
+        </Stack>
+        <TextField label="Read Only" readOnly defaultValue={readUrl} />
+        <Stack horizontal tokens={{ childrenGap: 10 }}>
+          <DefaultButton
+            onClick={() => {
+              copyToClipboard(readUrl);
+            }}
+            text="Copy"
+            iconProps={{ iconName: "Copy" }}
+          />
+          <PrimaryButton
+            onClick={() => {
+              window.open(readUrl, "_blank");
+            }}
+            text="Open"
+            iconProps={{ iconName: "OpenInNewWindow" }}
+          />
+        </Stack>
+      </Stack>
+    </>
+  );
+};

src/Explorer/Panes/AddCollectionPane.ts

@@ -680,6 +680,10 @@ export default class AddCollectionPane extends ContextualPaneBase {
     this.formWarnings("");
     this.databaseCreateNewShared(this.getSharedThroughputDefault());
     this.shouldCreateMongoWildcardIndex(this.container.isMongoIndexingEnabled());
+    if (!this.container.isServerlessEnabled()) {
+      this.isAutoPilotSelected(this.container.isAutoscaleDefaultEnabled());
+      this.isSharedAutoPilotSelected(this.container.isAutoscaleDefaultEnabled());
+    }
     if (this.isPreferredApiTable() && !databaseId) {
       databaseId = SharedConstants.CollectionCreation.TablesAPIDefaultDatabase;
     }

src/Explorer/Panes/CassandraAddCollectionPane.ts

@@ -289,6 +289,9 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase {
 
   public open() {
     super.open();
+    if (!this.container.isServerlessEnabled()) {
+      this.isAutoPilotSelected(this.container.isAutoscaleDefaultEnabled());
+    }
     const addCollectionPaneOpenMessage = {
       databaseAccountName: this.container.databaseAccount().name,
       defaultExperience: this.container.defaultExperience(),

src/Explorer/Panes/PaneComponents.ts

@@ -11,7 +11,6 @@ import TableQuerySelectPaneTemplate from "./Tables/TableQuerySelectPane.html";
 import CassandraAddCollectionPaneTemplate from "./CassandraAddCollectionPane.html";
 import SettingsPaneTemplate from "./SettingsPane.html";
 import ExecuteSprocParamsPaneTemplate from "./ExecuteSprocParamsPane.html";
-import RenewAdHocAccessPaneTemplate from "./RenewAdHocAccessPane.html";
 import UploadItemsPaneTemplate from "./UploadItemsPane.html";
 import LoadQueryPaneTemplate from "./LoadQueryPane.html";
 import SaveQueryPaneTemplate from "./SaveQueryPane.html";
@@ -144,15 +143,6 @@ export class ExecuteSprocParamsComponent {
   }
 }
 
-export class RenewAdHocAccessPane {
-  constructor() {
-    return {
-      viewModel: PaneComponent,
-      template: RenewAdHocAccessPaneTemplate,
-    };
-  }
-}
-
 export class UploadItemsPaneComponent {
   constructor() {
     return {

src/Explorer/Panes/PublishNotebookPaneAdapter.tsx

@@ -32,7 +32,6 @@ export class PublishNotebookPaneAdapter implements ReactAdapter {
   private notebookObject: ImmutableNotebook;
   private parentDomElement: HTMLElement;
   private isCodeOfConductAccepted: boolean;
-  private isLinkInjectionEnabled: boolean;
 
   constructor(private container: Explorer, private junoClient: JunoClient) {
     this.parameters = ko.observable(Date.now());
@@ -101,8 +100,7 @@ export class PublishNotebookPaneAdapter implements ReactAdapter {
     name: string,
     author: string,
     notebookContent: string | ImmutableNotebook,
-    parentDomElement: HTMLElement,
-    isLinkInjectionEnabled: boolean
+    parentDomElement: HTMLElement
   ): Promise<void> {
     try {
       const response = await this.junoClient.isCodeOfConductAccepted();
@@ -130,7 +128,6 @@ export class PublishNotebookPaneAdapter implements ReactAdapter {
     this.parentDomElement = parentDomElement;
 
     this.isOpened = true;
-    this.isLinkInjectionEnabled = isLinkInjectionEnabled;
     this.triggerRender();
   }
 
@@ -166,8 +163,7 @@ export class PublishNotebookPaneAdapter implements ReactAdapter {
         this.tags?.split(","),
         this.author,
         this.imageSrc,
-        this.content,
-        this.isLinkInjectionEnabled
+        this.content
       );
 
       const data = response.data;
@@ -248,6 +244,5 @@ export class PublishNotebookPaneAdapter implements ReactAdapter {
     this.notebookObject = undefined;
     this.parentDomElement = undefined;
     this.isCodeOfConductAccepted = undefined;
-    this.isLinkInjectionEnabled = undefined;
   };
 }

src/Explorer/Panes/RenewAdHocAccessPane.html

@@ -1,90 +0,0 @@
-<div data-bind="visible: visible, event: { keydown: onPaneKeyDown }">
-  <div
-    class="contextual-pane-out"
-    data-bind="
-                    click: cancel,
-                    clickBubble: false"
-  ></div>
-  <div class="contextual-pane" id="renewadhocaccesspane">
-    <!-- Renew ad-hoc access form - Start -->
-    <div class="contextual-pane-in">
-      <form class="paneContentContainer" data-bind="submit: submit">
-        <!-- Renew ad-hoc access header - Start -->
-        <div class="firstdivbg headerline">
-          <span role="heading" aria-level="2" data-bind="text: title"></span>
-          <div
-            class="closeImg"
-            role="button"
-            aria-label="Close pane"
-            tabindex="0"
-            data-bind="
-                                    click: cancel"
-          >
-            <img src="../../../images/close-black.svg" title="Close" alt="Close" />
-          </div>
-        </div>
-        <!-- Renew ad-hoc access header - End -->
-
-        <!-- Renew ad-hoc access errors - Start -->
-        <div
-          class="warningErrorContainer"
-          aria-live="assertive"
-          data-bind="visible: formErrors() && formErrors() !== ''"
-        >
-          <div class="warningErrorContent">
-            <span><img class="paneErrorIcon" src="/error_red.svg" alt="Error" /></span>
-            <span class="warningErrorDetailsLinkContainer">
-              <span class="formErrors" data-bind="text: formErrors, attr: { title: formErrors }"></span>
-              <a
-                class="errorLink"
-                role="link"
-                data-bind="
-                            visible: formErrorsDetails() && formErrorsDetails() !== '',
-                            click: showErrorDetails"
-                >More details</a
-              >
-            </span>
-          </div>
-        </div>
-        <!-- Renew ad-hoc access errors - End -->
-
-        <!-- Renew ad-hoc access inputs - Start -->
-        <div class="paneMainContent">
-          <div class="renewUploadItemsHeader">Provide a valid account connection string</div>
-          <input
-            class="accessKeyInput"
-            type="text"
-            placeholder="Enter a connection string"
-            required
-            data-bind="value: accessKey"
-          />
-          <div
-            class="renewAccessExpandCollapse"
-            data-bind="click: onShowHelperImageClick, event: { keypress: onShowHelperImageKeyPress }"
-          >
-            <img src="/Triangle-right.svg" alt="Show renew access image" data-bind="visible: !isHelperImageVisible()" />
-            <img src="/Triangle-down.svg" alt="Hide renew access image" data-bind="visible: isHelperImageVisible()" />
-            <span class="AccountNavigationText">Where do I find the Connection String?</span>
-          </div>
-          <div class="renewAccessImg" data-bind="visible: isHelperImageVisible()">
-            <span class="AccountNavigationText"
-              >To get the connection string, navigate to your Azure Cosmos DB account in Azure Portal, select Keys and
-              copy the connection string.</span
-            >
-            <img src="/ConnectionString_Artwork.png" />
-          </div>
-        </div>
-        <div class="paneFooter">
-          <div class="leftpanel-okbut"><input type="submit" value="Connect" class="btncreatecoll1" /></div>
-        </div>
-        <!-- Renew ad-hoc access - End -->
-      </form>
-    </div>
-    <!-- Renew ad-hoc access form  - Start -->
-    <!-- Loader - Start -->
-    <div class="dataExplorerLoaderContainer dataExplorerPaneLoaderContainer" data-bind="visible: isExecuting">
-      <img class="dataExplorerLoader" src="/LoadingIndicator_3Squares.gif" />
-    </div>
-    <!-- Loader - End -->
-  </div>
-</div>

src/Explorer/Panes/RenewAdHocAccessPane.ts

@@ -1,101 +0,0 @@
-import * as ko from "knockout";
-import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
-import * as ViewModels from "../../Contracts/ViewModels";
-import { parseConnectionString } from "../../Platform/Hosted/Helpers/ConnectionStringParser";
-import { ContextualPaneBase } from "./ContextualPaneBase";
-import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
-import { DefaultExperienceUtility } from "../../Shared/DefaultExperienceUtility";
-import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
-import { getErrorMessage } from "../../Common/ErrorHandlingUtils";
-
-export class RenewAdHocAccessPane extends ContextualPaneBase {
-  public accessKey: ko.Observable<string>;
-  public isHelperImageVisible: ko.Observable<boolean>;
-
-  constructor(options: ViewModels.PaneOptions) {
-    super(options);
-    this.title("Connect to Azure Cosmos DB");
-    this.accessKey = ko.observable<string>();
-    this.isHelperImageVisible = ko.observable<boolean>(false);
-  }
-
-  public submit(): void {
-    this.formErrors("");
-    this.formErrorsDetails("");
-
-    if (this._shouldShowContextSwitchPrompt()) {
-      this.container.displayContextSwitchPromptForConnectionString(this.accessKey());
-    } else if (!!this.formErrors()) {
-      return;
-    } else {
-      this.isExecuting(true);
-      this._renewShareAccess();
-    }
-  }
-
-  public onShowHelperImageClick = (src: any, event: MouseEvent): void => {
-    this.isHelperImageVisible(!this.isHelperImageVisible());
-  };
-
-  public onShowHelperImageKeyPress = (src: any, event: KeyboardEvent): boolean => {
-    if (event.keyCode === Constants.KeyCodes.Enter || event.keyCode === Constants.KeyCodes.Space) {
-      this.onShowHelperImageClick(src, null);
-      return false;
-    }
-
-    return true;
-  };
-
-  private _shouldShowContextSwitchPrompt(): boolean {
-    const inputMetadata: DataModels.AccessInputMetadata = parseConnectionString(this.accessKey());
-    const apiKind: DataModels.ApiKind =
-      this.container && DefaultExperienceUtility.getApiKindFromDefaultExperience(this.container.defaultExperience());
-    const hasOpenedTabs: boolean =
-      (this.container && this.container.tabsManager && this.container.tabsManager.openedTabs().length > 0) || false;
-
-    if (!inputMetadata || inputMetadata.apiKind == null || !inputMetadata.accountName) {
-      this.formErrors("Invalid connection string input");
-      this.formErrorsDetails("Please enter a valid connection string");
-    }
-
-    if (
-      !inputMetadata ||
-      this.formErrors() ||
-      !this.container ||
-      apiKind == null ||
-      !this.container.databaseAccount ||
-      !this.container.defaultExperience ||
-      !hasOpenedTabs ||
-      (this.container.databaseAccount().name === inputMetadata.accountName &&
-        apiKind === inputMetadata.apiKind &&
-        !hasOpenedTabs)
-    ) {
-      return false;
-    }
-
-    return true;
-  }
-
-  private _renewShareAccess = (): void => {
-    this.container
-      .renewShareAccess(this.accessKey())
-      .fail((error: any) => {
-        const errorMessage: string = getErrorMessage(error);
-        NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${errorMessage}`);
-        this.formErrors(errorMessage);
-        this.formErrorsDetails(errorMessage);
-      })
-      .finally(() => {
-        this.isExecuting(false);
-      });
-  };
-
-  public close(): void {
-    super.close();
-    this.isHelperImageVisible(false);
-    this.formErrors("");
-    this.formErrorsDetails("");
-    this.accessKey("");
-  }
-}

src/Explorer/SplashScreen/SplashScreen.test.ts

@@ -1,6 +1,6 @@
 import * as ko from "knockout";
 import { DataSamplesUtil } from "../DataSamples/DataSamplesUtil";
-import { SplashScreenComponentAdapter } from "./SplashScreenComponentApdapter";
+import { SplashScreen } from "./SplashScreen";
 import { TabsManager } from "../Tabs/TabsManager";
 import Explorer from "../Explorer";
 jest.mock("../Explorer");
@@ -14,7 +14,7 @@ const createExplorer = () => {
   return mock as jest.Mocked<Explorer>;
 };
 
-describe("SplashScreenComponentAdapter", () => {
+describe("SplashScreen", () => {
   it("allows sample collection creation for supported api's", () => {
     const explorer = createExplorer();
     const dataSampleUtil = new DataSamplesUtil(explorer);
@@ -25,9 +25,9 @@ describe("SplashScreenComponentAdapter", () => {
     // Sample is supported
     jest.spyOn(dataSampleUtil, "isSampleContainerCreationSupported").mockImplementation(() => true);
 
-    const splashScreenAdapter = new SplashScreenComponentAdapter(explorer);
-    jest.spyOn(splashScreenAdapter, "createDataSampleUtil").mockImplementation(() => dataSampleUtil);
-    const mainButtons = splashScreenAdapter.createMainItems();
+    const splashScreen = new SplashScreen({ explorer });
+    jest.spyOn(splashScreen, "createDataSampleUtil").mockImplementation(() => dataSampleUtil);
+    const mainButtons = splashScreen.createMainItems();
 
     // Press all buttons and make sure create gets called
     mainButtons.forEach((button) => {
@@ -50,9 +50,9 @@ describe("SplashScreenComponentAdapter", () => {
     // Sample is not supported
     jest.spyOn(dataSampleUtil, "isSampleContainerCreationSupported").mockImplementation(() => false);
 
-    const splashScreenAdapter = new SplashScreenComponentAdapter(explorerStub);
-    jest.spyOn(splashScreenAdapter, "createDataSampleUtil").mockImplementation(() => dataSampleUtil);
-    const mainButtons = splashScreenAdapter.createMainItems();
+    const splashScreen = new SplashScreen({ explorer: explorerStub });
+    jest.spyOn(splashScreen, "createDataSampleUtil").mockImplementation(() => dataSampleUtil);
+    const mainButtons = splashScreen.createMainItems();
 
     // Press all buttons and make sure create doesn't get called
     mainButtons.forEach((button) => {

src/Explorer/SplashScreen/SplashScreen.tsx

@@ -1,63 +1,161 @@
 /**
  * Accordion top class
  */
-import * as ko from "knockout";
 import * as React from "react";
-import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as ViewModels from "../../Contracts/ViewModels";
+import * as Constants from "../../Common/Constants";
+import { Link } from "office-ui-fabric-react/lib/Link";
 import NewContainerIcon from "../../../images/Hero-new-container.svg";
 import NewNotebookIcon from "../../../images/Hero-new-notebook.svg";
 import NewQueryIcon from "../../../images/AddSqlQuery_16x16.svg";
 import OpenQueryIcon from "../../../images/BrowseQuery.svg";
 import NewStoredProcedureIcon from "../../../images/AddStoredProcedure.svg";
 import ScaleAndSettingsIcon from "../../../images/Scale_15x15.svg";
-import { SplashScreenComponent, SplashScreenItem } from "./SplashScreenComponent";
 import * as MostRecentActivity from "../MostRecentActivity/MostRecentActivity";
 import AddDatabaseIcon from "../../../images/AddDatabase.svg";
 import SampleIcon from "../../../images/Hero-sample.svg";
 import { DataSamplesUtil } from "../DataSamples/DataSamplesUtil";
 import Explorer from "../Explorer";
 import { userContext } from "../../UserContext";
+import { FeaturePanelLauncher } from "../Controls/FeaturePanel/FeaturePanelLauncher";
 
-/**
- * TODO Remove this when fully ported to ReactJS
- */
-export class SplashScreenComponentAdapter implements ReactAdapter {
+export interface SplashScreenItem {
+  iconSrc: string;
+  title: string;
+  info?: string;
+  description: string;
+  onClick: () => void;
+}
+
+export interface SplashScreenProps {
+  explorer: Explorer;
+}
+
+export class SplashScreen extends React.Component<SplashScreenProps> {
+  private static readonly seeMoreItemTitle: string = "See more Cosmos DB documentation";
+  private static readonly seeMoreItemUrl: string = "https://aka.ms/cosmosdbdocument";
   private static readonly dataModelingUrl = "https://docs.microsoft.com/azure/cosmos-db/modeling-data";
   private static readonly throughputEstimatorUrl = "https://cosmos.azure.com/capacitycalculator";
   private static readonly failoverUrl = "https://docs.microsoft.com/azure/cosmos-db/high-availability";
 
-  public parameters: ko.Observable<number>;
+  private readonly container: Explorer;
 
-  constructor(private container: Explorer) {
-    this.parameters = ko.observable<number>(Date.now());
-    this.container.tabsManager.openedTabs.subscribe((tabs) => {
-      if (tabs.length === 0) {
-        this.forceRender();
-      }
-    });
-    this.container.selectedNode.subscribe(this.forceRender);
-    this.container.isNotebookEnabled.subscribe(this.forceRender);
+  constructor(props: SplashScreenProps) {
+    super(props);
+    this.container = props.explorer;
+    this.container.tabsManager.openedTabs.subscribe(() => this.setState({}));
+    this.container.selectedNode.subscribe(() => this.setState({}));
+    this.container.isNotebookEnabled.subscribe(() => this.setState({}));
   }
 
-  public forceRender = (): void => {
-    window.requestAnimationFrame(() => this.parameters(Date.now()));
-  };
+  public shouldComponentUpdate() {
+    return this.container.tabsManager.openedTabs.length === 0;
+  }
 
   private clearMostRecent = (): void => {
     this.container.mostRecentActivity.clear(userContext.databaseAccount?.id);
-    this.forceRender();
+    this.setState({});
   };
 
-  public renderComponent(): JSX.Element {
+  public render(): JSX.Element {
+    const mainItems = this.createMainItems();
+    const commonTaskItems = this.createCommonTaskItems();
+    const recentItems = this.createRecentItems();
+    const tipsItems = this.createTipsItems();
+    const onClearRecent = this.clearMostRecent;
+
     return (
-      <SplashScreenComponent
-        mainItems={this.createMainItems()}
-        commonTaskItems={this.createCommonTaskItems()}
-        recentItems={this.createRecentItems()}
-        tipsItems={this.createTipsItems()}
-        onClearRecent={this.clearMostRecent}
-      />
+      <div className="splashScreenContainer">
+        <div className="splashScreen">
+          <div className="title">
+            Welcome to Cosmos DB
+            <FeaturePanelLauncher />
+          </div>
+          <div className="subtitle">Globally distributed, multi-model database service for any scale</div>
+          <div className="mainButtonsContainer">
+            {mainItems.map((item) => (
+              <div
+                className="mainButton focusable"
+                key={`${item.title}`}
+                onClick={item.onClick}
+                onKeyPress={(event: React.KeyboardEvent) => this.onSplashScreenItemKeyPress(event, item.onClick)}
+                tabIndex={0}
+                role="button"
+              >
+                <img src={item.iconSrc} alt="" />
+                <div className="legendContainer">
+                  <div className="legend">{item.title}</div>
+                  <div className="description">{item.description}</div>
+                </div>
+              </div>
+            ))}
+          </div>
+          <div className="moreStuffContainer">
+            <div className="moreStuffColumn commonTasks">
+              <div className="title">Common Tasks</div>
+              <ul>
+                {commonTaskItems.map((item) => (
+                  <li
+                    className="focusable"
+                    key={`${item.title}${item.description}`}
+                    onClick={item.onClick}
+                    onKeyPress={(event: React.KeyboardEvent) => this.onSplashScreenItemKeyPress(event, item.onClick)}
+                    tabIndex={0}
+                    role="button"
+                  >
+                    <img src={item.iconSrc} alt="" />
+                    <span className="oneLineContent" title={item.info}>
+                      {item.title}
+                    </span>
+                  </li>
+                ))}
+              </ul>
+            </div>
+            <div className="moreStuffColumn">
+              <div className="title">Recents</div>
+              <ul>
+                {recentItems.map((item, index) => (
+                  <li key={`${item.title}${item.description}${index}`}>
+                    <img src={item.iconSrc} alt="" />
+                    <span className="twoLineContent">
+                      <Link onClick={item.onClick} title={item.info}>
+                        {item.title}
+                      </Link>
+                      <div className="description">{item.description}</div>
+                    </span>
+                  </li>
+                ))}
+              </ul>
+              {recentItems.length > 0 && <Link onClick={() => onClearRecent()}>Clear Recents</Link>}
+            </div>
+            <div className="moreStuffColumn tipsContainer">
+              <div className="title">Tips</div>
+              <ul>
+                {tipsItems.map((item) => (
+                  <li
+                    className="tipContainer focusable"
+                    key={`${item.title}${item.description}`}
+                    onClick={item.onClick}
+                    onKeyPress={(event: React.KeyboardEvent) => this.onSplashScreenItemKeyPress(event, item.onClick)}
+                    tabIndex={0}
+                    role="link"
+                  >
+                    <div className="title" title={item.info}>
+                      {item.title}
+                    </div>
+                    <div className="description">{item.description}</div>
+                  </li>
+                ))}
+                <li>
+                  <a role="link" href={SplashScreen.seeMoreItemUrl} target="_blank" tabIndex={0}>
+                    {SplashScreen.seeMoreItemTitle}
+                  </a>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+      </div>
     );
   }
 
@@ -198,7 +296,7 @@ export class SplashScreenComponentAdapter implements ReactAdapter {
       iconSrc: MostRecentActivity.MostRecentActivity.getItemIcon(item),
       title: item.title,
       description: item.description,
-      info: SplashScreenComponentAdapter.getInfo(item),
+      info: SplashScreen.getInfo(item),
       onClick: () => this.container.mostRecentActivity.onItemClicked(item),
     }));
   }
@@ -209,20 +307,27 @@ export class SplashScreenComponentAdapter implements ReactAdapter {
         iconSrc: null,
         title: "Data Modeling",
         description: "Learn more about modeling",
-        onClick: () => window.open(SplashScreenComponentAdapter.dataModelingUrl),
+        onClick: () => window.open(SplashScreen.dataModelingUrl),
       },
       {
         iconSrc: null,
         title: "Cost & Throughput Calculation",
         description: "Learn more about cost calculation",
-        onClick: () => window.open(SplashScreenComponentAdapter.throughputEstimatorUrl),
+        onClick: () => window.open(SplashScreen.throughputEstimatorUrl),
       },
       {
         iconSrc: null,
         title: "Configure automatic failover",
         description: "Learn more about Cosmos DB high-availability",
-        onClick: () => window.open(SplashScreenComponentAdapter.failoverUrl),
+        onClick: () => window.open(SplashScreen.failoverUrl),
       },
     ];
   }
+
+  private onSplashScreenItemKeyPress(event: React.KeyboardEvent, callback: () => void) {
+    if (event.charCode === Constants.KeyCodes.Space || event.charCode === Constants.KeyCodes.Enter) {
+      callback();
+      event.stopPropagation();
+    }
+  }
 }

src/Explorer/SplashScreen/SplashScreenComponent.tsx

@@ -1,133 +0,0 @@
-/**
- * Accordion top class
- */
-
-import * as React from "react";
-import * as Constants from "../../Common/Constants";
-import { Link } from "office-ui-fabric-react/lib/Link";
-import { FeaturePanelLauncher } from "../Controls/FeaturePanel/FeaturePanelLauncher";
-
-export interface SplashScreenItem {
-  iconSrc: string;
-  title: string;
-  info?: string;
-  description: string;
-  onClick: () => void;
-}
-export interface SplashScreenComponentProps {
-  mainItems: SplashScreenItem[];
-  commonTaskItems: SplashScreenItem[];
-  recentItems: SplashScreenItem[];
-  tipsItems: SplashScreenItem[];
-  onClearRecent: () => void;
-}
-
-export class SplashScreenComponent extends React.Component<SplashScreenComponentProps> {
-  private static readonly seeMoreItemTitle: string = "See more Cosmos DB documentation";
-  private static readonly seeMoreItemUrl: string = "https://aka.ms/cosmosdbdocument";
-
-  public render(): JSX.Element {
-    return (
-      <div className="splashScreenContainer">
-        <div className="splashScreen">
-          <div className="title">
-            Welcome to Cosmos DB
-            <FeaturePanelLauncher />
-          </div>
-          <div className="subtitle">Globally distributed, multi-model database service for any scale</div>
-          <div className="mainButtonsContainer">
-            {this.props.mainItems.map((item: SplashScreenItem) => (
-              <div
-                className="mainButton focusable"
-                key={`${item.title}`}
-                onClick={item.onClick}
-                onKeyPress={(event: React.KeyboardEvent) => this.onSplashScreenItemKeyPress(event, item.onClick)}
-                tabIndex={0}
-                role="button"
-              >
-                <img src={item.iconSrc} alt="" />
-                <div className="legendContainer">
-                  <div className="legend">{item.title}</div>
-                  <div className="description">{item.description}</div>
-                </div>
-              </div>
-            ))}
-          </div>
-          <div className="moreStuffContainer">
-            <div className="moreStuffColumn commonTasks">
-              <div className="title">Common Tasks</div>
-              <ul>
-                {this.props.commonTaskItems.map((item: SplashScreenItem) => (
-                  <li
-                    className="focusable"
-                    key={`${item.title}${item.description}`}
-                    onClick={item.onClick}
-                    onKeyPress={(event: React.KeyboardEvent) => this.onSplashScreenItemKeyPress(event, item.onClick)}
-                    tabIndex={0}
-                    role="button"
-                  >
-                    <img src={item.iconSrc} alt="" />
-                    <span className="oneLineContent" title={item.info}>
-                      {item.title}
-                    </span>
-                  </li>
-                ))}
-              </ul>
-            </div>
-            <div className="moreStuffColumn">
-              <div className="title">Recents</div>
-              <ul>
-                {this.props.recentItems.map((item: SplashScreenItem, index: number) => (
-                  <li key={`${item.title}${item.description}${index}`}>
-                    <img src={item.iconSrc} alt="" />
-                    <span className="twoLineContent">
-                      <Link onClick={item.onClick} title={item.info}>
-                        {item.title}
-                      </Link>
-                      <div className="description">{item.description}</div>
-                    </span>
-                  </li>
-                ))}
-              </ul>
-              {this.props.recentItems.length > 0 && (
-                <Link onClick={() => this.props.onClearRecent()}>Clear Recents</Link>
-              )}
-            </div>
-            <div className="moreStuffColumn tipsContainer">
-              <div className="title">Tips</div>
-              <ul>
-                {this.props.tipsItems.map((item: SplashScreenItem) => (
-                  <li
-                    className="tipContainer focusable"
-                    key={`${item.title}${item.description}`}
-                    onClick={item.onClick}
-                    onKeyPress={(event: React.KeyboardEvent) => this.onSplashScreenItemKeyPress(event, item.onClick)}
-                    tabIndex={0}
-                    role="link"
-                  >
-                    <div className="title" title={item.info}>
-                      {item.title}
-                    </div>
-                    <div className="description">{item.description}</div>
-                  </li>
-                ))}
-                <li>
-                  <a role="link" href={SplashScreenComponent.seeMoreItemUrl} target="_blank" tabIndex={0}>
-                    {SplashScreenComponent.seeMoreItemTitle}
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-  private onSplashScreenItemKeyPress(event: React.KeyboardEvent, callback: () => void) {
-    if (event.charCode === Constants.KeyCodes.Space || event.charCode === Constants.KeyCodes.Enter) {
-      callback();
-      event.stopPropagation();
-    }
-  }
-}

src/Explorer/Tables/TableDataClient.ts

@@ -1,7 +1,7 @@
 import * as ko from "knockout";
 import Q from "q";
 
-import { displayTokenRenewalPromptForStatus, getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
+import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils";
 import { AuthType } from "../../AuthType";
 import { ConsoleDataType } from "../../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import { FeedOptions } from "@azure/cosmos";
@@ -261,7 +261,7 @@ export class CassandraAPIDataClient extends TableDataClient {
     const clearMessage =
       shouldNotify && NotificationConsoleUtils.logConsoleProgress(`Querying rows for table ${collection.id()}`);
     try {
-      const authType = window.authType;
+      const authType = userContext.authType;
       const apiEndpoint: string =
         authType === AuthType.EncryptedToken
           ? Constants.CassandraBackend.guestQueryApi
@@ -281,7 +281,6 @@ export class CassandraAPIDataClient extends TableDataClient {
           paginationToken,
         },
         beforeSend: this.setAuthorizationHeader,
-        error: this.handleAjaxError,
         cache: false,
       });
       shouldNotify &&
@@ -425,7 +424,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       ConsoleDataType.InProgress,
       `Fetching keys for table ${collection.id()}`
     );
-    const authType = window.authType;
+    const authType = userContext.authType;
     const apiEndpoint: string =
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestKeysApi
@@ -444,7 +443,6 @@ export class CassandraAPIDataClient extends TableDataClient {
         tableId: collection.id(),
       },
       beforeSend: this.setAuthorizationHeader,
-      error: this.handleAjaxError,
       cache: false,
     })
       .then(
@@ -475,7 +473,7 @@ export class CassandraAPIDataClient extends TableDataClient {
       ConsoleDataType.InProgress,
       `Fetching schema for table ${collection.id()}`
     );
-    const authType = window.authType;
+    const authType = userContext.authType;
     const apiEndpoint: string =
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestSchemaApi
@@ -494,7 +492,6 @@ export class CassandraAPIDataClient extends TableDataClient {
         tableId: collection.id(),
       },
       beforeSend: this.setAuthorizationHeader,
-      error: this.handleAjaxError,
       cache: false,
     })
       .then(
@@ -519,7 +516,7 @@ export class CassandraAPIDataClient extends TableDataClient {
 
   private createOrDeleteQuery(cassandraEndpoint: string, resourceId: string, query: string): Q.Promise<any> {
     const deferred = Q.defer();
-    const authType = window.authType;
+    const authType = userContext.authType;
     const apiEndpoint: string =
       authType === AuthType.EncryptedToken
         ? Constants.CassandraBackend.guestCreateOrDeleteApi
@@ -533,7 +530,6 @@ export class CassandraAPIDataClient extends TableDataClient {
         query: query,
       },
       beforeSend: this.setAuthorizationHeader,
-      error: this.handleAjaxError,
       cache: false,
     }).then(
       (data: any) => {
@@ -582,12 +578,4 @@ export class CassandraAPIDataClient extends TableDataClient {
   private getCassandraPartitionKeyProperty(collection: ViewModels.Collection): string {
     return collection.cassandraKeys.partitionKeys[0].property;
   }
-
-  private handleAjaxError = (xhrObj: XMLHttpRequest, textStatus: string, errorThrown: string): void => {
-    if (!xhrObj) {
-      return;
-    }
-
-    displayTokenRenewalPromptForStatus(xhrObj.status);
-  };
 }

src/Explorer/Tabs/GalleryTab.tsx

@@ -31,7 +31,6 @@ export default class GalleryTab extends TabsBase {
 
     this.galleryAndNotebookViewerComponentProps = {
       container: options.container,
-      isGalleryPublishEnabled: options.container.isGalleryPublishEnabled(),
       junoClient: options.junoClient,
       notebookUrl: options.notebookUrl,
       galleryItem: options.galleryItem,

src/Explorer/Tabs/NotebookV2Tab.ts

@@ -20,7 +20,7 @@ import KillKernelIcon from "../../../images/notebook/Notebook-stop.svg";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { Action, ActionModifiers, Source } from "../../Shared/Telemetry/TelemetryConstants";
 import { Areas, ArmApiVersions } from "../../Common/Constants";
-import { CommandBarComponentButtonFactory } from "../Menus/CommandBar/CommandBarComponentButtonFactory";
+import * as CommandBarComponentButtonFactory from "../Menus/CommandBar/CommandBarComponentButtonFactory";
 import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
 import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
 import { NotebookComponentAdapter } from "../Notebook/NotebookComponent/NotebookComponentAdapter";
@@ -162,16 +162,14 @@ export default class NotebookTabV2 extends TabsBase {
       });
     }
 
-    if (this.container.isGalleryPublishEnabled()) {
-      saveButtonChildren.push({
-        iconName: "PublishContent",
-        onCommandClick: async () => await this.publishToGallery(),
-        commandButtonLabel: publishLabel,
-        hasPopup: false,
-        disabled: false,
-        ariaLabel: publishLabel,
-      });
-    }
+    saveButtonChildren.push({
+      iconName: "PublishContent",
+      onCommandClick: async () => await this.publishToGallery(),
+      commandButtonLabel: publishLabel,
+      hasPopup: false,
+      disabled: false,
+      ariaLabel: publishLabel,
+    });
 
     let buttons: CommandButtonComponentProps[] = [
       {

src/Explorer/Tabs/SparkMasterTab.html

@@ -1,7 +0,0 @@
-<div style="width: 100%; height: 100%; margin-left: 3px" data-bind="attr: { id: tabId }">
-  <!-- This runs the NotebookApp hosted by DataExplorer -->
-  <iframe
-    style="width: 100%; height: 100%; border: none"
-    data-bind="setTemplateReady: true, attr: { src: sparkMasterSrc }, visible: !!sparkMasterSrc()"
-  ></iframe>
-</div>

src/Explorer/Tabs/SparkMasterTab.ts

@@ -1,35 +0,0 @@
-import * as ko from "knockout";
-import * as DataModels from "../../Contracts/DataModels";
-import * as ViewModels from "../../Contracts/ViewModels";
-import TabsBase from "./TabsBase";
-import Explorer from "../Explorer";
-
-interface SparkMasterTabOptions extends ViewModels.TabOptions {
-  clusterConnectionInfo: DataModels.SparkClusterConnectionInfo;
-  container: Explorer;
-}
-
-export default class SparkMasterTab extends TabsBase {
-  public sparkMasterSrc: ko.Observable<string>;
-
-  private _clusterConnectionInfo: DataModels.SparkClusterConnectionInfo;
-  private _container: Explorer;
-
-  constructor(options: SparkMasterTabOptions) {
-    super(options);
-    super.onActivate.bind(this);
-    this._container = options.container;
-    this._clusterConnectionInfo = options.clusterConnectionInfo;
-    const sparkMasterEndpoint =
-      this._clusterConnectionInfo &&
-      this._clusterConnectionInfo.endpoints &&
-      this._clusterConnectionInfo.endpoints.find(
-        (endpoint) => endpoint.kind === DataModels.SparkClusterEndpointKind.SparkUI
-      );
-    this.sparkMasterSrc = ko.observable<string>(sparkMasterEndpoint && sparkMasterEndpoint.endpoint);
-  }
-
-  public getContainer() {
-    return this._container;
-  }
-}

src/Explorer/Tabs/TabComponents.ts

@@ -1,7 +1,6 @@
 import DocumentsTabTemplate from "./DocumentsTab.html";
 import ConflictsTabTemplate from "./ConflictsTab.html";
 import GraphTabTemplate from "./GraphTab.html";
-import SparkMasterTabTemplate from "./SparkMasterTab.html";
 import NotebookV2TabTemplate from "./NotebookV2Tab.html";
 import TerminalTabTemplate from "./TerminalTab.html";
 import MongoDocumentsTabTemplate from "./MongoDocumentsTab.html";
@@ -60,15 +59,6 @@ export class GraphTab {
   }
 }
 
-export class SparkMasterTab {
-  constructor() {
-    return {
-      viewModel: TabComponent,
-      template: SparkMasterTabTemplate,
-    };
-  }
-}
-
 export class NotebookV2Tab {
   constructor() {
     return {

src/Explorer/Tree/Collection.ts

@@ -971,7 +971,7 @@ export default class Collection implements ViewModels.Collection {
 
   public uploadFiles = (fileList: FileList): Promise<UploadDetails> => {
     // TODO: right now web worker is not working with AAD flow. Use main thread for upload for now until we have backend upload capability
-    if (configContext.platform === Platform.Hosted && window.authType === AuthType.AAD) {
+    if (configContext.platform === Platform.Hosted && userContext.authType === AuthType.AAD) {
       return this._uploadFilesCors(fileList);
     }
     const documentUploader: Worker = new UploadWorker();

src/Explorer/Tree/Database.test.ts

@@ -69,11 +69,13 @@ describe("Add Schema", () => {
       subscriptionId: userContext.subscriptionId,
       resourceGroup: userContext.resourceGroup,
       accountName: userContext.databaseAccount.name,
-      resource: `dbs/${database.id}/colls/${collection.id}`,
+      resource: `dbs/${database.id()}/colls/${collection.id}`,
       status: "new",
     });
     expect(checkForSchema).not.toBeNull();
     expect(database.junoClient.getSchema).toBeCalledWith(
+      userContext.subscriptionId,
+      userContext.resourceGroup,
       userContext.databaseAccount.name,
       database.id(),
       collection.id

src/Explorer/Tree/Database.ts

@@ -329,11 +329,13 @@ export default class Database implements ViewModels.Database {
           subscriptionId: userContext.subscriptionId,
           resourceGroup: userContext.resourceGroup,
           accountName: userContext.databaseAccount.name,
-          resource: `dbs/${this.id}/colls/${collection.id}`,
+          resource: `dbs/${this.id()}/colls/${collection.id}`,
           status: "new",
         });
         checkForSchema = setInterval(async () => {
           const response: IJunoResponse<DataModels.ISchema> = await this.junoClient.getSchema(
+            userContext.subscriptionId,
+            userContext.resourceGroup,
             userContext.databaseAccount.name,
             this.id(),
             collection.id

src/Explorer/Tree/ResourceTreeAdapter.tsx

@@ -717,7 +717,7 @@ export class ResourceTreeAdapter implements ReactAdapter {
       },
     ];
 
-    if (this.container.isGalleryPublishEnabled() && item.type === NotebookContentItemType.Notebook) {
+    if (item.type === NotebookContentItemType.Notebook) {
       items.push({
         label: "Publish to gallery",
         iconSrc: PublishIcon,

src/GalleryViewer/GalleryViewer.tsx

@@ -25,7 +25,6 @@ const onInit = async () => {
   const galleryViewerProps = GalleryUtils.getGalleryViewerProps(window.location.search);
 
   const props: GalleryAndNotebookViewerComponentProps = {
-    isGalleryPublishEnabled: configContext.ENABLE_GALLERY_PUBLISH,
     junoClient: new JunoClient(),
     selectedTab: galleryViewerProps.selectedTab || GalleryTab.OfficialSamples,
     sortBy: galleryViewerProps.sortBy || SortBy.MostViewed,

src/Juno/JunoClient.test.ts

@@ -354,21 +354,13 @@ describe("Gallery", () => {
     const author = "author";
     const thumbnailUrl = "thumbnailUrl";
     const content = `{ "key": "value" }`;
-    const addLinkToNotebookViewer = false;
+    const addLinkToNotebookViewer = true;
     window.fetch = jest.fn().mockReturnValue({
       status: HttpStatusCodes.OK,
       json: () => undefined as any,
     });
 
-    const response = await junoClient.publishNotebook(
-      name,
-      description,
-      tags,
-      author,
-      thumbnailUrl,
-      content,
-      addLinkToNotebookViewer
-    );
+    const response = await junoClient.publishNotebook(name, description, tags, author, thumbnailUrl, content);
 
     const authorizationHeader = getAuthorizationHeader();
     expect(response.status).toBe(HttpStatusCodes.OK);

src/Juno/JunoClient.ts

@@ -362,8 +362,7 @@ export class JunoClient {
     tags: string[],
     author: string,
     thumbnailUrl: string,
-    content: string,
-    isLinkInjectionEnabled: boolean
+    content: string
   ): Promise<IJunoResponse<IGalleryItem>> {
     const response = await window.fetch(`${this.getNotebooksSubscriptionIdAccountUrl()}/gallery`, {
       method: "PUT",
@@ -375,7 +374,7 @@ export class JunoClient {
         author,
         thumbnailUrl,
         content: JSON.parse(content),
-        addLinkToNotebookViewer: isLinkInjectionEnabled,
+        addLinkToNotebookViewer: true,
       } as IPublishNotebookRequest),
     });
 
@@ -427,7 +426,7 @@ export class JunoClient {
   public async requestSchema(
     schemaRequest: DataModels.ISchemaRequest
   ): Promise<IJunoResponse<DataModels.ISchemaRequest>> {
-    const response = await window.fetch(`${this.getAnalyticsUrl()}/${schemaRequest.accountName}/schema/request`, {
+    const response = await window.fetch(`${this.getAnalyticsUrl()}/schema/request`, {
       method: "POST",
       body: JSON.stringify(schemaRequest),
       headers: JunoClient.getHeaders(),
@@ -445,12 +444,14 @@ export class JunoClient {
   }
 
   public async getSchema(
+    subscriptionId: string,
+    resourceGroup: string,
     accountName: string,
     databaseName: string,
     containerName: string
   ): Promise<IJunoResponse<DataModels.ISchema>> {
     const response = await window.fetch(
-      `${this.getAnalyticsUrl()}/${accountName}/schema/${databaseName}/${containerName}`,
+      `${this.getAnalyticsUrl()}/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/databaseAccounts/${accountName}/schema/${databaseName}/${containerName}`,
       {
         method: "GET",
         headers: JunoClient.getHeaders(),

src/Main.tsx

@@ -30,7 +30,7 @@ import "./Explorer/Panes/GraphNewVertexPane.less";
 import "./Explorer/Tabs/QueryTab.less";
 import "./Explorer/Controls/TreeComponent/treeComponent.less";
 import "./Explorer/Controls/Accordion/AccordionComponent.less";
-import "./Explorer/SplashScreen/SplashScreenComponent.less";
+import "./Explorer/SplashScreen/SplashScreen.less";
 import "./Explorer/Controls/Notebook/NotebookTerminalComponent.less";
 
 // Image Dependencies
@@ -58,7 +58,6 @@ import { initializeIcons } from "office-ui-fabric-react/lib/Icons";
 import { ExplorerParams } from "./Explorer/Explorer";
 import React, { useState } from "react";
 import ReactDOM from "react-dom";
-import copyImage from "../images/Copy.svg";
 import hdeConnectImage from "../images/HdeConnectCosmosDB.svg";
 import refreshImg from "../images/refresh-cosmos.svg";
 import arrowLeftImg from "../images/imgarrowlefticon.svg";
@@ -68,6 +67,8 @@ import { useKnockoutExplorer } from "./hooks/useKnockoutExplorer";
 import { useSidePanel } from "./hooks/useSidePanel";
 import { NotificationConsoleComponent } from "./Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import { PanelContainerComponent } from "./Explorer/Panes/PanelContainerComponent";
+import { SplashScreen } from "./Explorer/SplashScreen/SplashScreen";
+import { Dialog, DialogProps } from "./Explorer/Controls/Dialog";
 
 initializeIcons();
 
@@ -77,6 +78,17 @@ const App: React.FunctionComponent = () => {
   //TODO: Refactor so we don't need to pass the id to remove a console data
   const [inProgressConsoleDataIdToBeDeleted, setInProgressConsoleDataIdToBeDeleted] = useState("");
 
+  const [dialogProps, setDialogProps] = useState<DialogProps>();
+  const [showDialog, setShowDialog] = useState<boolean>(false);
+
+  const openDialog = (props: DialogProps) => {
+    setDialogProps(props);
+    setShowDialog(true);
+  };
+  const closeDialog = () => {
+    setShowDialog(false);
+  };
+
   const { isPanelOpen, panelContent, headerText, openSidePanel, closeSidePanel } = useSidePanel();
 
   const explorerParams: ExplorerParams = {
@@ -85,9 +97,11 @@ const App: React.FunctionComponent = () => {
     setInProgressConsoleDataIdToBeDeleted,
     openSidePanel,
     closeSidePanel,
+    openDialog,
+    closeDialog,
   };
   const config = useConfig();
-  useKnockoutExplorer(config, explorerParams);
+  const explorer = useKnockoutExplorer(config?.platform, explorerParams);
 
   return (
     <div className="flexContainer">
@@ -102,74 +116,7 @@ const App: React.FunctionComponent = () => {
         className="flexContainer hideOverflows"
         style={{ display: "none" }}
       >
-        {/* Main Command Bar - Start */}
         <div data-bind="react: commandBarComponentAdapter" />
-        {/* Main Command Bar - End */}
-        {/* Share url flyout - Start */}
-        <div
-          id="shareDataAccessFlyout"
-          className="shareDataAccessFlyout"
-          data-bind="visible: shouldShowShareDialogContents"
-        >
-          <div className="shareDataAccessFlyoutContent">
-            <div className="urlContainer">
-              <span className="urlContentText">
-                Open this database account in a new browser tab with Cosmos DB Explorer. Or copy the read-write or read
-                only access urls below to share with others. For security purposes, the URLs grant time-bound access to
-                the account. When access expires, you can reconnect, using a valid connection string for the account.
-              </span>
-              <br />
-              <div
-                className="toggles"
-                data-bind="event: { keydown: onToggleKeyDown }, visible: shareAccessData().readWriteUrl != null"
-                tabIndex={0}
-                aria-label="Read-Write and Read toggle"
-              >
-                <div className="tab">
-                  <input type="radio" className="radio" defaultValue="readwrite" />
-                  <span
-                    className="toggleSwitch"
-                    role="presentation"
-                    data-bind="click: toggleReadWrite, css:{ selectedToggle: isReadWriteToggled(), unselectedToggle: !isReadWriteToggled() }"
-                  >
-                    Read-Write
-                  </span>
-                </div>
-                <div className="tab">
-                  <input type="radio" className="radio" defaultValue="read" />
-                  <span
-                    className="toggleSwitch"
-                    role="presentation"
-                    data-bind="click: toggleRead, css:{ selectedToggle: isReadToggled(), unselectedToggle: !isReadToggled() }"
-                  >
-                    Read
-                  </span>
-                </div>
-              </div>
-              <div className="urlSpace">
-                <input
-                  id="shareUrlLink"
-                  aria-label="Share url link"
-                  className="shareLink"
-                  type="text"
-                  read-only={true}
-                  data-bind="value: shareAccessUrl"
-                />
-                <span
-                  className="urlTokenCopyInfoTooltip"
-                  data-bind="click: copyUrlLink, event: { keypress: onCopyUrlLinkKeyPress }"
-                  aria-label="Copy url link"
-                  role="button"
-                  tabIndex={0}
-                >
-                  <img src={copyImage} alt="Copy link" />
-                  <span className="urlTokenCopyTooltiptext" data-bind="text: shareUrlCopyHelperText" />
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        {/* Share url flyout - End */}
         {/* Collections Tree and Tabs - Begin */}
         <div className="resourceTreeAndTabs">
           {/* Collections Tree - Start */}
@@ -275,7 +222,7 @@ const App: React.FunctionComponent = () => {
             data-bind="visible: !isRefreshingExplorer() && tabsManager.openedTabs().length === 0"
           >
             <form className="connectExplorerFormContainer">
-              <div className="connectExplorer" data-bind="react: splashScreenAdapter" />
+              <SplashScreen explorer={explorer} />
             </form>
           </div>
           <div
@@ -340,7 +287,6 @@ const App: React.FunctionComponent = () => {
       <div data-bind='component: { name: "upload-items-pane", params: { data: uploadItemsPane} }' />
       <div data-bind='component: { name: "load-query-pane", params: { data: loadQueryPane} }' />
       <div data-bind='component: { name: "execute-sproc-params-pane", params: { data: executeSprocParamsPane} }' />
-      <div data-bind='component: { name: "renew-adhoc-access-pane", params: { data: renewAdHocAccessPane} }' />
       <div data-bind='component: { name: "save-query-pane", params: { data: saveQueryPane} }' />
       <div data-bind='component: { name: "browse-queries-pane", params: { data: browseQueriesPane} }' />
       <div data-bind='component: { name: "upload-file-pane", params: { data: uploadFilePane} }' />
@@ -355,35 +301,7 @@ const App: React.FunctionComponent = () => {
       <KOCommentIfStart if="isCopyNotebookPaneEnabled" />
       <div data-bind="react: copyNotebookPaneAdapter" />
       <KOCommentEnd />
-      {/* Global access token expiration dialog - Start */}
-      <div
-        id="dataAccessTokenModal"
-        className="dataAccessTokenModal"
-        style={{ display: "none" }}
-        data-bind="visible: shouldShowDataAccessExpiryDialog"
-      >
-        <div className="dataAccessTokenModalContent">
-          <p className="dataAccessTokenExpireText">Please reconnect to the account using the connection string.</p>
-        </div>
-      </div>
-      {/* Global access token expiration dialog - End */}
-      {/* Context switch prompt - Start */}
-      <div
-        id="contextSwitchPrompt"
-        className="dataAccessTokenModal"
-        style={{ display: "none" }}
-        data-bind="visible: shouldShowContextSwitchPrompt"
-      >
-        <div className="dataAccessTokenModalContent">
-          <p className="dataAccessTokenExpireText">
-            Please save your work before you switch! When you switch to a different Azure Cosmos DB account, current
-            Data Explorer tabs will be closed.
-          </p>
-          <p className="dataAccessTokenExpireText">Proceed anyway?</p>
-        </div>
-      </div>
-      <div data-bind="react: dialogComponentAdapter" />
-      <div data-bind="react: addSynapseLinkDialog" />
+      {showDialog && <Dialog {...dialogProps} />}
     </div>
   );
 };

src/Platform/Hosted/Authorization.ts

@@ -6,39 +6,15 @@ import { DefaultExperienceUtility } from "../../Shared/DefaultExperienceUtility"
 import { userContext } from "../../UserContext";
 
 export default class AuthHeadersUtil {
-  public static generateEncryptedToken(): Q.Promise<DataModels.GenerateTokenResponse> {
+  public static async generateEncryptedToken(readOnly: boolean = false): Promise<DataModels.GenerateTokenResponse> {
     const url = configContext.BACKEND_ENDPOINT + "/api/tokens/generateToken" + AuthHeadersUtil._generateResourceUrl();
-    const explorer = window.dataExplorer;
     const headers: any = { authorization: userContext.authorizationToken };
-    headers[Constants.HttpHeaders.getReadOnlyKey] = !explorer.hasWriteAccess();
+    headers[Constants.HttpHeaders.getReadOnlyKey] = readOnly;
 
-    return AuthHeadersUtil._initiateGenerateTokenRequest({
-      url: url,
-      type: "POST",
-      headers: headers,
-      contentType: "application/json",
-      cache: false,
-    });
-  }
-
-  public static generateUnauthenticatedEncryptedTokenForConnectionString(
-    connectionString: string
-  ): Q.Promise<DataModels.GenerateTokenResponse> {
-    if (!connectionString) {
-      return Q.reject("None or empty connection string specified");
-    }
-
-    const url = configContext.BACKEND_ENDPOINT + "/api/guest/tokens/generateToken";
-    const headers: any = {};
-    headers[Constants.HttpHeaders.connectionString] = connectionString;
-
-    return AuthHeadersUtil._initiateGenerateTokenRequest({
-      url: url,
-      type: "POST",
-      headers: headers,
-      contentType: "application/json",
-      cache: false,
-    });
+    const response = await fetch(url, { method: "POST", headers });
+    const result = await response.json();
+    // This API has a quirk where the response must be parsed to JSON twice
+    return JSON.parse(result);
   }
 
   private static _generateResourceUrl(): string {
@@ -56,25 +32,4 @@ export default class AuthHeadersUtil {
     const rtype = "";
     return `?resourceUrl=${resourceUrl}&rid=${rid}&rtype=${rtype}&sid=${sid}&rg=${rg}&dba=${dba}&api=${apiKind}`;
   }
-
-  private static _initiateGenerateTokenRequest(
-    requestSettings: JQueryAjaxSettings<any>
-  ): Q.Promise<DataModels.GenerateTokenResponse> {
-    const deferred: Q.Deferred<DataModels.GenerateTokenResponse> = Q.defer<DataModels.GenerateTokenResponse>();
-
-    $.ajax(requestSettings).then(
-      (data: string, textStatus: string, xhr: JQueryXHR<any>) => {
-        if (!data) {
-          deferred.reject("No token generated");
-        }
-
-        deferred.resolve(JSON.parse(data));
-      },
-      (xhr: JQueryXHR<any>, textStatus: string, error: any) => {
-        deferred.reject(xhr.responseText);
-      }
-    );
-
-    return deferred.promise.timeout(Constants.ClientDefaults.requestTimeoutMs);
-  }
 }

src/UserContext.ts

@@ -1,8 +1,10 @@
+import { AuthType } from "./AuthType";
 import { DatabaseAccount } from "./Contracts/DataModels";
 import { SubscriptionType } from "./Contracts/SubscriptionType";
 import { DefaultAccountExperienceType } from "./DefaultAccountExperienceType";
 
 interface UserContext {
+  authType?: AuthType;
   masterKey?: string;
   subscriptionId?: string;
   resourceGroup?: string;

src/Utils/AuthorizationUtils.test.ts

@@ -1,16 +1,14 @@
-import * as Constants from "../Common/Constants";
-import * as AuthorizationUtils from "./AuthorizationUtils";
 import { AuthType } from "../AuthType";
-import Explorer from "../Explorer/Explorer";
+import * as Constants from "../Common/Constants";
 import { updateUserContext } from "../UserContext";
-import { Platform, updateConfigContext } from "../ConfigContext";
+import * as AuthorizationUtils from "./AuthorizationUtils";
 jest.mock("../Explorer/Explorer");
 
 describe("AuthorizationUtils", () => {
   describe("getAuthorizationHeader()", () => {
     it("should return authorization header if authentication type is AAD", () => {
-      window.authType = AuthType.AAD;
       updateUserContext({
+        authType: AuthType.AAD,
         authorizationToken: "some-token",
       });
 
@@ -19,8 +17,8 @@ describe("AuthorizationUtils", () => {
     });
 
     it("should return guest access header if authentication type is EncryptedToken", () => {
-      window.authType = AuthType.EncryptedToken;
       updateUserContext({
+        authType: AuthType.EncryptedToken,
         accessToken: "some-token",
       });
 
@@ -58,48 +56,4 @@ describe("AuthorizationUtils", () => {
       ).toBeDefined();
     });
   });
-
-  describe("displayTokenRenewalPromptForStatus()", () => {
-    let explorer = new Explorer() as jest.Mocked<Explorer>;
-
-    beforeEach(() => {
-      jest.clearAllMocks();
-      window.dataExplorer = explorer;
-      updateConfigContext({
-        platform: Platform.Hosted,
-      });
-    });
-
-    afterEach(() => {
-      window.dataExplorer = undefined;
-    });
-
-    it("should not open token renewal prompt if status code is undefined", () => {
-      AuthorizationUtils.displayTokenRenewalPromptForStatus(undefined);
-      expect(explorer.displayGuestAccessTokenRenewalPrompt).not.toHaveBeenCalled();
-    });
-
-    it("should not open token renewal prompt if status code is null", () => {
-      AuthorizationUtils.displayTokenRenewalPromptForStatus(null);
-      expect(explorer.displayGuestAccessTokenRenewalPrompt).not.toHaveBeenCalled();
-    });
-
-    it("should not open token renewal prompt if status code is not 401", () => {
-      AuthorizationUtils.displayTokenRenewalPromptForStatus(Constants.HttpStatusCodes.Forbidden);
-      expect(explorer.displayGuestAccessTokenRenewalPrompt).not.toHaveBeenCalled();
-    });
-
-    it("should not open token renewal prompt if running on a different platform", () => {
-      updateConfigContext({
-        platform: Platform.Portal,
-      });
-      AuthorizationUtils.displayTokenRenewalPromptForStatus(Constants.HttpStatusCodes.Unauthorized);
-      expect(explorer.displayGuestAccessTokenRenewalPrompt).not.toHaveBeenCalled();
-    });
-
-    it("should open token renewal prompt if running on hosted platform and status code is 401", () => {
-      AuthorizationUtils.displayTokenRenewalPromptForStatus(Constants.HttpStatusCodes.Unauthorized);
-      expect(explorer.displayGuestAccessTokenRenewalPrompt).toHaveBeenCalled();
-    });
-  });
 });

src/Utils/AuthorizationUtils.ts

@@ -6,7 +6,7 @@ import * as ViewModels from "../Contracts/ViewModels";
 import { userContext } from "../UserContext";
 
 export function getAuthorizationHeader(): ViewModels.AuthorizationTokenHeaderMetadata {
-  if (window.authType === AuthType.EncryptedToken) {
+  if (userContext.authType === AuthType.EncryptedToken) {
     return {
       header: Constants.HttpHeaders.guestAccessToken,
       token: userContext.accessToken,
@@ -40,17 +40,3 @@ export function decryptJWTToken(token: string) {
 
   return JSON.parse(tokenPayload);
 }
-
-export function displayTokenRenewalPromptForStatus(httpStatusCode: number): void {
-  const explorer = window.dataExplorer;
-
-  if (
-    httpStatusCode == null ||
-    httpStatusCode != Constants.HttpStatusCodes.Unauthorized ||
-    configContext.platform !== Platform.Hosted
-  ) {
-    return;
-  }
-
-  explorer.displayGuestAccessTokenRenewalPrompt();
-}

src/Utils/GalleryUtils.ts

@@ -8,7 +8,7 @@ import {
 } from "../Explorer/Controls/NotebookGallery/GalleryViewerComponent";
 import Explorer from "../Explorer/Explorer";
 import { IChoiceGroupOption, IChoiceGroupProps, IProgressIndicatorProps } from "office-ui-fabric-react";
-import { TextFieldProps } from "../Explorer/Controls/DialogReactComponent/DialogComponent";
+import { TextFieldProps } from "../Explorer/Controls/Dialog";
 import { getErrorMessage, getErrorStack, handleError } from "../Common/ErrorHandlingUtils";
 import { HttpStatusCodes } from "../Common/Constants";
 import { trace, traceFailure, traceStart, traceSuccess } from "../Shared/Telemetry/TelemetryProcessor";

src/Utils/QueryUtils.ts

@@ -1,4 +1,3 @@
-import Q from "q";
 import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";