Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging the customImportMap and maps layer plugin into 1 single plugin. #166

Merged
merged 2 commits into from
Jan 6, 2023

Conversation

navneet1v
Copy link
Collaborator

@navneet1v navneet1v commented Jan 6, 2023

Merging the customImportMap and maps layer plugin into 1 single plugin.
Signed-off-by: Navneet Verma [email protected]

Description

Merging the customImportMap and maps layer plugin into 1 single plugin.

Given that both the plugins are part of maps enhancements we are doing on OSD. It make sense to merge both the plugins.

Currently we have done the file merge, but we will working on the repo to abstract the files in right folders. This is the first step towards merging the plugins. Improvement GH issue: #167

This merge has the code till this commit: 6dfdcbb

Next Steps:

  1. Fixing the cypress tests which are failing due to wrong path.

Issues Resolved

#95

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@navneet1v navneet1v requested a review from a team January 6, 2023 08:45
@@ -20,6 +28,39 @@ export class CustomImportMapPlugin
core: CoreSetup,
{ regionMap }: AppPluginSetupDependencies
): CustomImportMapPluginSetup {
// Register an application into the side navigation menu
core.application.register({
id: PLUGIN_ID,
Copy link
Member

@junqiu-lei junqiu-lei Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After change to customImportMap, I am not able to save map, but when I change back to maps-dashboards, it works on my local.

Also the id will determine URL path of Maps,
Example: http://localhost:5603/fol/app/customImportMap/create

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

} from './types';
import { PLUGIN_NAME, PLUGIN_ID, PLUGIN_NAVIGATION_BAR_TILE } from '../common';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is import from '../common/constants/shared'

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed this and I have added the export statement in the index.ts file in that folder. So we can use both ../common and ../common/constants/shared

junqiu-lei
junqiu-lei previously approved these changes Jan 6, 2023
@navneet1v navneet1v merged commit 7c2e618 into opensearch-project:main Jan 6, 2023
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-166-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7c2e618950e313e72be3cbd895147432cb7de3ed
# Push it to GitHub
git push --set-upstream origin backport/backport-166-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-166-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants