From b250cd8808ff7ead5dbad23ba0cc4f0a05115614 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Fri, 10 Nov 2023 10:44:47 +0100 Subject: [PATCH 01/10] Fix #13699 - Add separator for Storage Container manifest (#13924) * Fix #13699 - Add separator for Storage Container manifest * Fix #13906 - Fix add_mlmodel_lineage description field * Add separator * Add separator --- .../source/storage/storage_service.py | 2 ++ .../src/metadata/readers/dataframe/dsv.py | 8 ++++++-- .../src/metadata/readers/dataframe/models.py | 5 ++++- .../readers/dataframe/reader_factory.py | 17 +++++++++++++++-- .../metadata/utils/datalake/datalake_utils.py | 1 + .../tests/unit/readers/test_df_reader.py | 19 +++++++++++++++++++ .../datalake/transactions_separator.csv | 6 ++++++ .../v1.2/connectors/storage/manifest.md | 5 ++++- .../storage/containerMetadataConfig.json | 6 ++++++ .../storage/manifestMetadataConfig.json | 6 ++++++ 10 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 ingestion/tests/unit/resources/datalake/transactions_separator.csv diff --git a/ingestion/src/metadata/ingestion/source/storage/storage_service.py b/ingestion/src/metadata/ingestion/source/storage/storage_service.py index 9b4e624bf5de..64b28a91f6a1 100644 --- a/ingestion/src/metadata/ingestion/source/storage/storage_service.py +++ b/ingestion/src/metadata/ingestion/source/storage/storage_service.py @@ -190,6 +190,7 @@ def _manifest_entries_to_metadata_entries_by_container( structureFormat=entry.structureFormat, isPartitioned=entry.isPartitioned, partitionColumns=entry.partitionColumns, + separator=entry.separator, ) for entry in manifest.entries if entry.containerName == container_name @@ -222,6 +223,7 @@ def extract_column_definitions( key=sample_key, bucket_name=bucket_name, file_extension=SupportedTypes(metadata_entry.structureFormat), + separator=metadata_entry.separator, ), ) columns = [] diff --git a/ingestion/src/metadata/readers/dataframe/dsv.py b/ingestion/src/metadata/readers/dataframe/dsv.py index d030cce3ae1b..7d0236bf618c 100644 --- a/ingestion/src/metadata/readers/dataframe/dsv.py +++ b/ingestion/src/metadata/readers/dataframe/dsv.py @@ -114,5 +114,9 @@ def _read(self, *, key: str, bucket_name: str, **__) -> DatalakeColumnWrapper: ) -CSVDataFrameReader = functools.partial(DSVDataFrameReader, separator=CSV_SEPARATOR) -TSVDataFrameReader = functools.partial(DSVDataFrameReader, separator=TSV_SEPARATOR) +def get_dsv_reader_by_separator(separator: str) -> functools.partial: + return functools.partial(DSVDataFrameReader, separator=separator) + + +CSVDataFrameReader = get_dsv_reader_by_separator(separator=CSV_SEPARATOR) +TSVDataFrameReader = get_dsv_reader_by_separator(separator=TSV_SEPARATOR) diff --git a/ingestion/src/metadata/readers/dataframe/models.py b/ingestion/src/metadata/readers/dataframe/models.py index 8b908a01b509..765e6c1ae783 100644 --- a/ingestion/src/metadata/readers/dataframe/models.py +++ b/ingestion/src/metadata/readers/dataframe/models.py @@ -14,7 +14,7 @@ """ from typing import Any, List, Optional -from pydantic import BaseModel +from pydantic import BaseModel, Field from metadata.generated.schema.entity.data.table import Column @@ -39,6 +39,9 @@ class DatalakeTableSchemaWrapper(BaseModel): key: str bucket_name: str file_extension: Optional[Any] + separator: Optional[str] = Field( + None, description="Used for DSV readers to identify the separator" + ) class DatalakeTableMetadata(BaseModel): diff --git a/ingestion/src/metadata/readers/dataframe/reader_factory.py b/ingestion/src/metadata/readers/dataframe/reader_factory.py index b8c3f03190f2..7e698699364f 100644 --- a/ingestion/src/metadata/readers/dataframe/reader_factory.py +++ b/ingestion/src/metadata/readers/dataframe/reader_factory.py @@ -21,7 +21,11 @@ from metadata.readers.dataframe.avro import AvroDataFrameReader from metadata.readers.dataframe.base import DataFrameReader -from metadata.readers.dataframe.dsv import CSVDataFrameReader, TSVDataFrameReader +from metadata.readers.dataframe.dsv import ( + CSVDataFrameReader, + TSVDataFrameReader, + get_dsv_reader_by_separator, +) from metadata.readers.dataframe.json import JSONDataFrameReader from metadata.readers.dataframe.parquet import ParquetDataFrameReader from metadata.readers.models import ConfigSource @@ -52,11 +56,20 @@ class SupportedTypes(Enum): def get_df_reader( - type_: SupportedTypes, config_source: ConfigSource, client: Optional[Any] + type_: SupportedTypes, + config_source: ConfigSource, + client: Optional[Any], + separator: Optional[str] = None, ) -> DataFrameReader: """ Load the File Reader based on the Config Source """ + # If we have a DSV file, build a reader dynamically based on the received separator + if type_ in {SupportedTypes.CSV, SupportedTypes.TSV} and separator: + return get_dsv_reader_by_separator(separator=separator)( + config_source=config_source, client=client + ) + if type_.value in DF_READER_MAP: return DF_READER_MAP[type_.value](config_source=config_source, client=client) diff --git a/ingestion/src/metadata/utils/datalake/datalake_utils.py b/ingestion/src/metadata/utils/datalake/datalake_utils.py index c49193ce4e2c..a482f8bc0b9a 100644 --- a/ingestion/src/metadata/utils/datalake/datalake_utils.py +++ b/ingestion/src/metadata/utils/datalake/datalake_utils.py @@ -65,6 +65,7 @@ def fetch_dataframe( type_=file_extension, config_source=config_source, client=client, + separator=file_fqn.separator, ) try: df_wrapper: DatalakeColumnWrapper = df_reader.read( diff --git a/ingestion/tests/unit/readers/test_df_reader.py b/ingestion/tests/unit/readers/test_df_reader.py index 5ab68f75d9ce..f071ce0faf5e 100644 --- a/ingestion/tests/unit/readers/test_df_reader.py +++ b/ingestion/tests/unit/readers/test_df_reader.py @@ -67,6 +67,25 @@ def test_dsv_reader(self): list(df_list[0].columns), ["transaction_id", "transaction_value"] ) + def test_dsv_reader_with_separator(self): + key = ROOT_PATH / "transactions_separator.csv" + + df_list = fetch_dataframe( + config_source=LocalConfig(), + client=None, + file_fqn=DatalakeTableSchemaWrapper( + key=str(key), bucket_name="unused", separator=";" + ), + ) + + self.assertIsNotNone(df_list) + self.assertTrue(len(df_list)) + + self.assertEquals(df_list[0].shape, (5, 2)) + self.assertEquals( + list(df_list[0].columns), ["transaction_id", "transaction_value"] + ) + def test_json_reader(self): key = ROOT_PATH / "employees.json" diff --git a/ingestion/tests/unit/resources/datalake/transactions_separator.csv b/ingestion/tests/unit/resources/datalake/transactions_separator.csv new file mode 100644 index 000000000000..a99d886d6a0c --- /dev/null +++ b/ingestion/tests/unit/resources/datalake/transactions_separator.csv @@ -0,0 +1,6 @@ +transaction_id;transaction_value +1;100 +2;200 +3;300 +4;400 +5;500 diff --git a/openmetadata-docs/content/partials/v1.2/connectors/storage/manifest.md b/openmetadata-docs/content/partials/v1.2/connectors/storage/manifest.md index a4e86545b1ba..289d48a1aecc 100644 --- a/openmetadata-docs/content/partials/v1.2/connectors/storage/manifest.md +++ b/openmetadata-docs/content/partials/v1.2/connectors/storage/manifest.md @@ -21,6 +21,8 @@ need to bring information about: - **dataPath**: Where we can find the data. This should be a path relative to the top-level container. - **structureFormat**: What is the format of the data we are going to find. This information will be used to read the data. +- **separator**: Optionally, for delimiter-separated formats such as CSV, you can specify the separator to use when reading the file. + If you don't, we will use `,` for CSV and `/t` for TSV files. After ingesting this container, we will bring in the schema of the data in the `dataPath`. @@ -66,7 +68,8 @@ Again, this information will be added on top of the inferred schema from the dat ```json {% srNumber=2 %} { "dataPath": "transactions", - "structureFormat": "csv" + "structureFormat": "csv", + "separator": "," }, ``` ```json {% srNumber=3 %} diff --git a/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/containerMetadataConfig.json b/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/containerMetadataConfig.json index 6a0d95234f2b..437454b80a09 100644 --- a/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/containerMetadataConfig.json +++ b/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/containerMetadataConfig.json @@ -22,6 +22,12 @@ "type": "string", "default": null }, + "separator": { + "title": "Separator", + "description": "For delimited files such as CSV, what is the separator being used?", + "type": "string", + "default": null + }, "isPartitioned": { "title": "Is Partitioned", "description": "Flag indicating whether the container's data is partitioned", diff --git a/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/manifestMetadataConfig.json b/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/manifestMetadataConfig.json index f87f82ed2480..cb781a653436 100644 --- a/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/manifestMetadataConfig.json +++ b/openmetadata-spec/src/main/resources/json/schema/metadataIngestion/storage/manifestMetadataConfig.json @@ -26,6 +26,12 @@ "type": "string", "default": null }, + "separator": { + "title": "Separator", + "description": "For delimited files such as CSV, what is the separator being used?", + "type": "string", + "default": null + }, "isPartitioned": { "title": "Is Partitioned", "description": "Flag indicating whether the container's data is partitioned", From 8891a9a41089f128dee9a477ea43cd5ee72bad32 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Fri, 10 Nov 2023 10:46:09 +0100 Subject: [PATCH 02/10] Fix #13906 - Fix add_mlmodel_lineage description field (#13920) --- .../ingestion/ometa/mixins/mlmodel_mixin.py | 7 +++++-- ...model_api.py => test_ometa_mlmodel_api.py} | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) rename ingestion/tests/integration/ometa/{test_ometa_model_api.py => test_ometa_mlmodel_api.py} (94%) diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/mlmodel_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/mlmodel_mixin.py index ecb77999039b..f67dfd8c48d2 100644 --- a/ingestion/src/metadata/ingestion/ometa/mixins/mlmodel_mixin.py +++ b/ingestion/src/metadata/ingestion/ometa/mixins/mlmodel_mixin.py @@ -55,11 +55,14 @@ class OMetaMlModelMixin(OMetaLineageMixin): client: REST - def add_mlmodel_lineage(self, model: MlModel) -> Dict[str, Any]: + def add_mlmodel_lineage( + self, model: MlModel, description: Optional[str] = None + ) -> Dict[str, Any]: """ Iterates over MlModel's Feature Sources and add the lineage information. :param model: MlModel containing EntityReferences + :param description: Lineage description :return: List of added lineage information """ @@ -77,8 +80,8 @@ def add_mlmodel_lineage(self, model: MlModel) -> Dict[str, Any]: for entity_ref in refs: self.add_lineage( AddLineageRequest( - description="MlModel uses FeatureSource", edge=EntitiesEdge( + description=description, fromEntity=entity_ref, toEntity=self.get_entity_reference( entity=MlModel, fqn=model.fullyQualifiedName diff --git a/ingestion/tests/integration/ometa/test_ometa_model_api.py b/ingestion/tests/integration/ometa/test_ometa_mlmodel_api.py similarity index 94% rename from ingestion/tests/integration/ometa/test_ometa_model_api.py rename to ingestion/tests/integration/ometa/test_ometa_mlmodel_api.py index 3814807a5567..687a9dbd6177 100644 --- a/ingestion/tests/integration/ometa/test_ometa_model_api.py +++ b/ingestion/tests/integration/ometa/test_ometa_mlmodel_api.py @@ -62,6 +62,7 @@ from metadata.generated.schema.security.client.openMetadataJWTClientConfig import ( OpenMetadataJWTClientConfig, ) +from metadata.generated.schema.type.entityLineage import EntitiesEdge from metadata.generated.schema.type.entityReference import EntityReference from metadata.ingestion.ometa.ometa_api import OpenMetadata @@ -373,6 +374,24 @@ def test_mlmodel_properties(self): nodes = {node["id"] for node in lineage["nodes"]} assert nodes == {str(table1_entity.id.__root__), str(table2_entity.id.__root__)} + # If we delete the lineage, the `add_mlmodel_lineage` will take care of it too + for edge in lineage.get("upstreamEdges") or []: + self.metadata.delete_lineage_edge( + edge=EntitiesEdge( + fromEntity=EntityReference(id=edge["fromEntity"], type="table"), + toEntity=EntityReference(id=edge["toEntity"], type="mlmodel"), + ) + ) + + self.metadata.add_mlmodel_lineage(model=res) + + lineage = self.metadata.get_lineage_by_id( + entity=MlModel, entity_id=str(res.id.__root__) + ) + + nodes = {node["id"] for node in lineage["nodes"]} + assert nodes == {str(table1_entity.id.__root__), str(table2_entity.id.__root__)} + self.metadata.delete( entity=DatabaseService, entity_id=service_entity.id, From 7c06116b532b05f344767c9f9efde62c96edc692 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Fri, 10 Nov 2023 10:47:07 +0100 Subject: [PATCH 03/10] Add deprecation warnings (#13927) --- .../ingestion/ometa/mixins/glossary_mixin.py | 23 +++++++++++ .../ometa/mixins/role_policy_mixin.py | 9 +++++ ingestion/src/metadata/utils/deprecation.py | 35 +++++++++++++++++ .../tests/unit/utils/test_deprecation.py | 39 +++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 ingestion/src/metadata/utils/deprecation.py create mode 100644 ingestion/tests/unit/utils/test_deprecation.py diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/glossary_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/glossary_mixin.py index 8dd47f50a860..d3afddfe58e2 100644 --- a/ingestion/src/metadata/ingestion/ometa/mixins/glossary_mixin.py +++ b/ingestion/src/metadata/ingestion/ometa/mixins/glossary_mixin.py @@ -30,6 +30,7 @@ PatchValue, ) from metadata.ingestion.ometa.utils import model_str +from metadata.utils.deprecation import deprecated from metadata.utils.logger import ometa_logger logger = ometa_logger() @@ -44,6 +45,7 @@ class GlossaryMixin(OMetaPatchMixinBase): To be inherited by OpenMetadata """ + @deprecated(message="Use metadata.create_or_update instead", release="1.3") def create_glossary(self, glossaries_body): """Method to create new Glossary Args: @@ -54,6 +56,7 @@ def create_glossary(self, glossaries_body): ) logger.info(f"Created a Glossary: {resp}") + @deprecated(message="Use metadata.create_or_update instead", release="1.3") def create_glossary_term(self, glossary_term_body): """Method to create new Glossary Term Args: @@ -64,6 +67,10 @@ def create_glossary_term(self, glossary_term_body): ) logger.info(f"Created a Glossary Term: {resp}") + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_glossary_term_parent( self, entity_id: Union[str, basic.Uuid], @@ -133,6 +140,10 @@ def patch_glossary_term_parent( return None + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_glossary_term_related_terms( self, entity_id: Union[str, basic.Uuid], @@ -221,6 +232,10 @@ def patch_glossary_term_related_terms( return None + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_reviewers( self, entity: Union[Type[Glossary], Type[GlossaryTerm]], @@ -307,6 +322,10 @@ def patch_reviewers( return None + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_glossary_term_synonyms( self, entity_id: Union[str, basic.Uuid], @@ -385,6 +404,10 @@ def patch_glossary_term_synonyms( return None + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_glossary_term_references( self, entity_id: Union[str, basic.Uuid], diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/role_policy_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/role_policy_mixin.py index a2556df4b462..68bb58e74239 100644 --- a/ingestion/src/metadata/ingestion/ometa/mixins/role_policy_mixin.py +++ b/ingestion/src/metadata/ingestion/ometa/mixins/role_policy_mixin.py @@ -30,6 +30,7 @@ PatchValue, ) from metadata.ingestion.ometa.utils import model_str +from metadata.utils.deprecation import deprecated from metadata.utils.logger import ometa_logger logger = ometa_logger() @@ -129,6 +130,10 @@ def _get_optional_rule_patch( ] return data + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_role_policy( self, entity_id: Union[str, basic.Uuid], @@ -261,6 +266,10 @@ def patch_role_policy( return None + @deprecated( + message="Use metadata.patch instead as the new standard method that will create the jsonpatch dynamically", + release="1.3", + ) def patch_policy_rule( self, entity_id: Union[str, basic.Uuid], diff --git a/ingestion/src/metadata/utils/deprecation.py b/ingestion/src/metadata/utils/deprecation.py new file mode 100644 index 000000000000..f1a8e3880f27 --- /dev/null +++ b/ingestion/src/metadata/utils/deprecation.py @@ -0,0 +1,35 @@ +# Copyright 2021 Collate +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +""" +Announce method deprecation +""" +import warnings +from functools import wraps + + +def deprecated(message: str, release: str): + """Decorator factory to accept specific messages for each function""" + + def _deprecated(fn): + @wraps(fn) + def inner(*args, **kwargs): + warnings.simplefilter("always", DeprecationWarning) + warnings.warn( + f"[{fn.__name__}] will be deprecated in the release [{release}]: {message}", + category=DeprecationWarning, + ) + warnings.simplefilter("default", DeprecationWarning) + + return fn(*args, **kwargs) + + return inner + + return _deprecated diff --git a/ingestion/tests/unit/utils/test_deprecation.py b/ingestion/tests/unit/utils/test_deprecation.py new file mode 100644 index 000000000000..19bcd769eab9 --- /dev/null +++ b/ingestion/tests/unit/utils/test_deprecation.py @@ -0,0 +1,39 @@ +# Copyright 2021 Collate +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +""" +Test deprecation warnings +""" + +import warnings +from unittest import TestCase + +from metadata.utils.deprecation import deprecated + + +class TestDeprecationWarning(TestCase): + """Test deprecation warnings are properly displayed""" + + @deprecated(message="This is a deprecation", release="x.y.z") + def deprecated_call(self) -> None: + """Sample method""" + + def test_deprecation_warning(self) -> None: + """Validate warning""" + + with warnings.catch_warnings(record=True) as warn: + # Trigger the warning + self.deprecated_call() + + # Verify the result + self.assertEquals(len(warn), 1) + self.assertTrue(issubclass(warn[0].category, DeprecationWarning)) + self.assertTrue("This is a deprecation" in str(warn[0].message)) + self.assertTrue("x.y.z" in str(warn[0].message)) From ece3f7385ff6057118ee0d860054cde650b1596f Mon Sep 17 00:00:00 2001 From: 07Himank <112613760+07Himank@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:23:24 +0530 Subject: [PATCH 04/10] Enhancement in search in explore and internal (#13770) --- .../elasticsearch/en/chart_index_mapping.json | 3 ++- .../en/classification_index_mapping.json | 3 ++- .../en/container_index_mapping.json | 3 ++- .../dashboard_data_model_index_mapping.json | 3 ++- .../en/dashboard_index_mapping.json | 3 ++- .../en/dashboard_service_index_mapping.json | 3 ++- .../en/data_products_index_mapping.json | 3 ++- .../en/database_index_mapping.json | 3 ++- .../en/database_schema_index_mapping.json | 3 ++- .../en/database_service_index_mapping.json | 3 ++- .../en/domain_index_mapping.json | 3 ++- .../en/glossary_term_index_mapping.json | 3 ++- .../en/messaging_service_index_mapping.json | 3 ++- .../en/metadata_service_index_mapping.json | 3 ++- .../en/mlmodel_index_mapping.json | 3 ++- .../en/mlmodel_service_index_mapping.json | 3 ++- .../en/pipeline_index_mapping.json | 3 ++- .../en/pipeline_service_index_mapping.json | 3 ++- .../en/search_entity_index_mapping.json | 3 ++- .../en/search_service_index_mapping.json | 3 ++- .../en/storage_service_index_mapping.json | 3 ++- .../en/stored_procedure_index_mapping.json | 3 ++- .../elasticsearch/en/table_index_mapping.json | 3 ++- .../elasticsearch/en/tag_index_mapping.json | 3 ++- .../elasticsearch/en/team_index_mapping.json | 3 ++- .../en/test_case_index_mapping.json | 3 ++- .../en/test_suite_index_mapping.json | 3 ++- .../elasticsearch/en/topic_index_mapping.json | 3 ++- .../elasticsearch/en/user_index_mapping.json | 3 ++- .../elasticsearch/jp/chart_index_mapping.json | 3 ++- .../jp/classification_index_mapping.json | 3 ++- .../jp/container_index_mapping.json | 3 ++- .../jp/dashboard_data_model_index.json | 3 ++- .../jp/dashboard_index_mapping.json | 3 ++- .../jp/dashboard_service_index_mapping.json | 3 ++- .../jp/data_products_index_mapping.json | 3 ++- .../jp/database_index_mapping.json | 3 ++- .../jp/database_schema_index_mapping.json | 3 ++- .../jp/database_service_index_mapping.json | 3 ++- .../jp/domain_index_mapping.json | 3 ++- .../jp/glossary_term_index_mapping.json | 3 ++- .../jp/messaging_service_index_mapping.json | 3 ++- ...metadata_service_search_index_mapping.json | 3 ++- .../jp/mlmodel_index_mapping.json | 3 ++- .../jp/mlmodel_service_index_mapping.json | 3 ++- .../jp/pipeline_index_mapping.json | 3 ++- .../jp/pipeline_service_index_mapping.json | 3 ++- .../jp/search_entity_index_mapping.json | 3 ++- .../jp/search_service_index_mapping.json | 3 ++- .../jp/storage_service_index_mapping.json | 3 ++- .../jp/stored_procedure_index_mapping.json | 3 ++- .../elasticsearch/jp/table_index_mapping.json | 3 ++- .../elasticsearch/jp/tag_index_mapping.json | 3 ++- .../elasticsearch/jp/team_index_mapping.json | 3 ++- .../jp/test_case_index_mapping.json | 3 ++- .../jp/test_suite_index_mapping.json | 3 ++- .../elasticsearch/jp/topic_index_mapping.json | 3 ++- .../elasticsearch/jp/user_index_mapping.json | 3 ++- .../elasticsearch/zh/chart_index_mapping.json | 3 ++- .../zh/classfication_index_mapping.json | 3 ++- .../zh/container_index_mapping.json | 3 ++- .../dashboard_data_model_index_mapping.json | 3 ++- .../zh/dashboard_index_mapping.json | 3 ++- .../zh/dashboard_service_index_mapping.json | 3 ++- .../zh/data_products_index_mapping.json | 3 ++- .../zh/database_index_mapping.json | 3 ++- .../zh/database_schema_index_mapping.json | 3 ++- .../zh/database_service_index_mapping.json | 3 ++- .../zh/domain_index_mapping.json | 3 ++- .../zh/glossary_term_index_mapping.json | 3 ++- .../zh/messaging_service_index_mapping.json | 3 ++- .../zh/metadata_service_index_mapping.json | 3 ++- .../zh/mlmodel_index_mapping.json | 3 ++- .../zh/mlmodel_service_index_mapping.json | 3 ++- .../zh/pipeline_index_mapping.json | 3 ++- .../zh/pipeline_service_index_mapping.json | 3 ++- .../zh/search_entity_index_mapping.json | 3 ++- .../zh/search_service_index_mapping.json | 3 ++- .../zh/storage_service_index_mapping.json | 3 ++- .../zh/stored_procedure_index_mapping.json | 3 ++- .../elasticsearch/zh/table_index_mapping.json | 3 ++- .../elasticsearch/zh/tag_index_mapping.json | 3 ++- .../elasticsearch/zh/team_index_mapping.json | 3 ++- .../zh/test_case_index_mapping.json | 3 ++- .../zh/test_suite_index_mapping.json | 3 ++- .../elasticsearch/zh/topic_index_mapping.json | 3 ++- .../elasticsearch/zh/user_index_mapping.json | 24 ++++++++++++++++++- 87 files changed, 195 insertions(+), 87 deletions(-) diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json index bfce3d71b48e..cefe36511b1c 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/chart_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json index 17c66a45ebdb..d95fe1f20fb5 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/classification_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json index c145ea06ae0c..3c10dc9db2f3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json @@ -45,7 +45,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json index b38b53f83bb1..f3ac1d31043a 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_data_model_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json index b38cf0c7a419..ff1fa958ce64 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json index 8677348a833d..0d90ca5eddc1 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/dashboard_service_index_mapping.json @@ -45,7 +45,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json index 3745fbc0529b..bc671fca88da 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/data_products_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json index 9b317c664097..03e44f357a98 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json index aca424794176..7b9c8743ca6d 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json index 315b1d3455ad..4e317ea1f0a5 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/database_service_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json index 59da903d6c02..3a18c8c12418 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/domain_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json index 99a108f485a6..1a7148cfef3f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json index 931ad2445d88..e261b9cfac93 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/messaging_service_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json index 14836fe937df..a7996d75e252 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json index 553c8bce0749..a65c8e32f8b5 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json index 5769cdc6e652..ba35d7cfa80f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_service_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json index 184dcd17669e..eb9866cfa67f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json @@ -45,7 +45,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json index 9276fec5fce6..4e1291653729 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/pipeline_service_index_mapping.json @@ -45,7 +45,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json index 79b02a5c0b15..d6b29d6f19ba 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json index 47944b87af84..1e6529b12111 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/search_service_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/storage_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/storage_service_index_mapping.json index c67147f0ca60..f028a62a7261 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/storage_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/storage_service_index_mapping.json @@ -45,7 +45,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json index a9e777b729d3..acbda67b92cc 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json index 282d3cbc64da..8b7448998d94 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json index 79e589afa8f5..8f1100b0b76a 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json index eb2e5320371c..85ca0e9e3906 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/team_index_mapping.json @@ -43,7 +43,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json index f949a6c4d104..aeeba0b48fa3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_case_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json index c82f42949ee3..4a00e438d135 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/test_suite_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json index 2e801d0933c5..cffdd7b29240 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json index 35c02baf1133..d0815304be76 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/en/user_index_mapping.json @@ -45,7 +45,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json index 1e46c9aaa7ed..83bafbb798df 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json index 6c186cb424f1..083f7aa379f1 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/classification_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json index 43335a9212e5..5a928bdbd758 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json index 23ee5b25a469..24c154325f29 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_data_model_index.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json index 1edfaa5c94f6..0c16ba6cdc26 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json index bc20b3dd918d..16dcc5f7a6af 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_service_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json index 3456b03cd4f4..9ab117d3f6d6 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/data_products_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json index ffbba3cd6097..0405df1628e3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json index 5d58da743421..591aa25641f1 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json index ee1a73b3c614..2894ec933327 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/database_service_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json index 6dc9557d8ef0..bafb5a9a30bc 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/domain_index_mapping.json @@ -52,7 +52,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json index eb6b434f82da..cf77f40c037f 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json index 7628fb106448..e30da5968468 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/messaging_service_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/metadata_service_search_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/metadata_service_search_index_mapping.json index 7be71c8b8ffc..191198da8e25 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/metadata_service_search_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/metadata_service_search_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json index 131a04604f12..01e1ea352f29 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json index 7face7b53f28..2839c1e805b3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_service_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json index 96e72d63cb95..d188600ae825 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json index a49d25231795..79634ab9d4e4 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/pipeline_service_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json index fa2e72e58330..64e42dc6b6ff 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json index 883e6da04304..945f0d4f9b2a 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/search_service_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json index c1904df501a5..ee03b8a957cd 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/storage_service_index_mapping.json @@ -48,7 +48,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json index cc4f5929ceb6..47a3deec6f1a 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json index bf8cd3d022c1..4ef1a5b46fa7 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json index 4bf96a1fe449..e2de31d72917 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/team_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/team_index_mapping.json index 39b6d98fe83c..9b8daf2d48b8 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/team_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/team_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json index 5e74ffbf6fa0..f02ef8cc451c 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_case_index_mapping.json @@ -56,7 +56,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json index fafa3b4065e1..6c7ccb3130de 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/test_suite_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json index ac51ead87da4..e737eac0f68d 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json @@ -49,7 +49,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/user_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/user_index_mapping.json index 9e0461990812..16ecb525af0a 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/jp/user_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/jp/user_index_mapping.json @@ -47,7 +47,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json index 2dadc8b5cba7..af132f31ec43 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/chart_index_mapping.json @@ -38,7 +38,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json index 7cc8e0460acb..5a13a00745ce 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/classfication_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json index 33b9d10c1c74..259995c5c950 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json @@ -47,7 +47,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json index bbca2ebe1835..61555a8f6950 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_data_model_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json index d493de3ca524..1271e9efe113 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json index e4375084c158..028a723e8aad 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_service_index_mapping.json @@ -37,7 +37,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json index 91a9b8dc90c6..68b0d71837ce 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/data_products_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json index 27f91368a9ec..7efcb6ef0275 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json index 21154e96b728..224801cabe54 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json @@ -38,7 +38,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json index e368877960a0..580baf5a300d 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/database_service_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json index af3ccfc214e6..66af69804c18 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/domain_index_mapping.json @@ -42,7 +42,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json index eb2ea9c37bf4..7ea9d73fef4e 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json @@ -30,7 +30,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json index a0c85cd8eae4..82d8eb2418b3 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/messaging_service_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json index 18a7909f9220..bb5bf424a61d 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json index ca64b9c0c4df..6ad1bf057a35 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json @@ -30,7 +30,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json index 0d29dfbaeebb..96bd36f8cbb1 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_service_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json index bebf2c92f3dd..001ade10c7ec 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_index_mapping.json @@ -32,7 +32,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json index 8b18072f1148..1599656cf9e5 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/pipeline_service_index_mapping.json @@ -37,7 +37,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json index 5cbe43c1c0fd..9038c22dda82 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json index 776cc371ad95..c7a31927ca73 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/search_service_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json index 84461ba86cbe..c2cdf16b85d2 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/storage_service_index_mapping.json @@ -37,7 +37,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json index f9ae74b1709c..9c29978f48dd 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json index f24c5cf711d3..19906fa794c4 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json index 3d996780c572..03a867b29502 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/team_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/team_index_mapping.json index 8c3fbde3b70e..19ff7196e2c1 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/team_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/team_index_mapping.json @@ -9,7 +9,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json index ba29d1c13974..baf4e60e3b08 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_case_index_mapping.json @@ -46,7 +46,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" }, "ngram": { "type": "text", diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json index fb541c8478af..8860dd5c4eef 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/test_suite_index_mapping.json @@ -39,7 +39,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json index 37354ff13f3f..e750b894f122 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json @@ -32,7 +32,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/user_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/user_index_mapping.json index 787b660c5773..9c17cf136c28 100644 --- a/openmetadata-service/src/main/resources/elasticsearch/zh/user_index_mapping.json +++ b/openmetadata-service/src/main/resources/elasticsearch/zh/user_index_mapping.json @@ -1,4 +1,25 @@ { + "settings": { + "analysis": { + "normalizer": { + "lowercase_normalizer": { + "type": "custom", + "char_filter": [], + "filter": [ + "lowercase" + ] + } + }, + "analyzer": { + }, + "filter": { + "om_stemmer": { + "type": "stemmer", + "name": "english" + } + } + } + }, "mappings": { "properties": { "id": { @@ -9,7 +30,8 @@ "fields": { "keyword": { "type": "keyword", - "ignore_above": 256 + "ignore_above": 256, + "normalizer": "lowercase_normalizer" } } }, From 0eacc829a4dbb2c72f744dcf5fbef10dc64f3f68 Mon Sep 17 00:00:00 2001 From: Pere Miquel Brull Date: Fri, 10 Nov 2023 11:00:06 +0100 Subject: [PATCH 05/10] Fix #13794 - Add domain support to the Python SDK (#13931) --- .../ingestion/ometa/mixins/patch_mixin.py | 25 ++- .../src/metadata/ingestion/ometa/ometa_api.py | 1 + .../src/metadata/ingestion/ometa/routes.py | 11 + .../ometa/test_ometa_domains_api.py | 192 ++++++++++++++++++ .../schema/api/domains/createDataProduct.json | 2 +- .../json/schema/api/domains/createDomain.json | 2 +- 6 files changed, 229 insertions(+), 4 deletions(-) create mode 100644 ingestion/tests/integration/ometa/test_ometa_domains_api.py diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py index a7f5a62517b2..f9994858a945 100644 --- a/ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py +++ b/ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py @@ -25,6 +25,7 @@ ) from metadata.generated.schema.entity.automations.workflow import WorkflowStatus from metadata.generated.schema.entity.data.table import Column, Table, TableConstraint +from metadata.generated.schema.entity.domains.domain import Domain from metadata.generated.schema.entity.services.connections.testConnectionResult import ( TestConnectionResult, ) @@ -485,7 +486,9 @@ def patch_automation_workflow_response( f"Error trying to PATCH status for automation workflow [{model_str(automation_workflow)}]: {exc}" ) - def patch_life_cycle(self, entity: Entity, life_cycle: LifeCycle) -> None: + def patch_life_cycle( + self, entity: Entity, life_cycle: LifeCycle + ) -> Optional[Entity]: """ Patch life cycle data for a entity @@ -495,9 +498,27 @@ def patch_life_cycle(self, entity: Entity, life_cycle: LifeCycle) -> None: try: destination = entity.copy(deep=True) destination.lifeCycle = life_cycle - self.patch(entity=type(entity), source=entity, destination=destination) + return self.patch( + entity=type(entity), source=entity, destination=destination + ) except Exception as exc: logger.debug(traceback.format_exc()) logger.warning( f"Error trying to Patch life cycle data for {entity.fullyQualifiedName.__root__}: {exc}" ) + return None + + def patch_domain(self, entity: Entity, domain: Domain) -> Optional[Entity]: + """Patch domain data for an Entity""" + try: + destination: Entity = entity.copy(deep=True) + destination.domain = EntityReference(id=domain.id, type="domain") + return self.patch( + entity=type(entity), source=entity, destination=destination + ) + except Exception as exc: + logger.debug(traceback.format_exc()) + logger.warning( + f"Error trying to Patch Domain for {entity.fullyQualifiedName.__root__}: {exc}" + ) + return None diff --git a/ingestion/src/metadata/ingestion/ometa/ometa_api.py b/ingestion/src/metadata/ingestion/ometa/ometa_api.py index 8e8df29101c9..84fc0d655269 100644 --- a/ingestion/src/metadata/ingestion/ometa/ometa_api.py +++ b/ingestion/src/metadata/ingestion/ometa/ometa_api.py @@ -239,6 +239,7 @@ def get_entity_from_create(self, create: Type[C]) -> Type[T]: .replace("searchindex", "searchIndex") .replace("storedprocedure", "storedProcedure") .replace("ingestionpipeline", "ingestionPipeline") + .replace("dataproduct", "dataProduct") ) class_path = ".".join( filter( diff --git a/ingestion/src/metadata/ingestion/ometa/routes.py b/ingestion/src/metadata/ingestion/ometa/routes.py index c8e6669c841b..6cf70529ad07 100644 --- a/ingestion/src/metadata/ingestion/ometa/routes.py +++ b/ingestion/src/metadata/ingestion/ometa/routes.py @@ -46,6 +46,10 @@ ) from metadata.generated.schema.api.data.createTable import CreateTableRequest from metadata.generated.schema.api.data.createTopic import CreateTopicRequest +from metadata.generated.schema.api.domains.createDataProduct import ( + CreateDataProductRequest, +) +from metadata.generated.schema.api.domains.createDomain import CreateDomainRequest from metadata.generated.schema.api.lineage.addLineage import AddLineageRequest from metadata.generated.schema.api.policies.createPolicy import CreatePolicyRequest from metadata.generated.schema.api.services.createDashboardService import ( @@ -107,6 +111,8 @@ from metadata.generated.schema.entity.data.storedProcedure import StoredProcedure from metadata.generated.schema.entity.data.table import Table from metadata.generated.schema.entity.data.topic import Topic +from metadata.generated.schema.entity.domains.dataProduct import DataProduct +from metadata.generated.schema.entity.domains.domain import Domain from metadata.generated.schema.entity.policies.policy import Policy from metadata.generated.schema.entity.services.connections.testConnectionDefinition import ( TestConnectionDefinition, @@ -214,4 +220,9 @@ WebAnalyticEventData.__name__: "/analytics/web/events/collect", DataInsightChart.__name__: "/analytics/dataInsights/charts", Kpi.__name__: "/kpi", + # Domains & Data Products + Domain.__name__: "/domains", + CreateDomainRequest.__name__: "/domains", + DataProduct.__name__: "/dataProducts", + CreateDataProductRequest.__name__: "/dataProducts", } diff --git a/ingestion/tests/integration/ometa/test_ometa_domains_api.py b/ingestion/tests/integration/ometa/test_ometa_domains_api.py new file mode 100644 index 000000000000..032f08adbb60 --- /dev/null +++ b/ingestion/tests/integration/ometa/test_ometa_domains_api.py @@ -0,0 +1,192 @@ +# Copyright 2021 Collate +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +OpenMetadata high-level API Domains & Data Products test +""" +from unittest import TestCase + +from metadata.generated.schema.api.data.createDashboard import CreateDashboardRequest +from metadata.generated.schema.api.domains.createDataProduct import ( + CreateDataProductRequest, +) +from metadata.generated.schema.api.domains.createDomain import CreateDomainRequest +from metadata.generated.schema.api.services.createDashboardService import ( + CreateDashboardServiceRequest, +) +from metadata.generated.schema.api.teams.createUser import CreateUserRequest +from metadata.generated.schema.entity.data.dashboard import Dashboard +from metadata.generated.schema.entity.domains.dataProduct import DataProduct +from metadata.generated.schema.entity.domains.domain import Domain, DomainType +from metadata.generated.schema.entity.services.connections.dashboard.lookerConnection import ( + LookerConnection, +) +from metadata.generated.schema.entity.services.connections.metadata.openMetadataConnection import ( + OpenMetadataConnection, +) +from metadata.generated.schema.entity.services.dashboardService import ( + DashboardConnection, + DashboardService, + DashboardServiceType, +) +from metadata.generated.schema.security.client.openMetadataJWTClientConfig import ( + OpenMetadataJWTClientConfig, +) +from metadata.generated.schema.type.entityReference import EntityReference +from metadata.ingestion.ometa.ometa_api import OpenMetadata + + +class OMetaDomainTest(TestCase): + """ + Run this integration test with the local API available + Install the ingestion package before running the tests + """ + + service_entity_id = None + + server_config = OpenMetadataConnection( + hostPort="http://localhost:8585/api", + authProvider="openmetadata", + securityConfig=OpenMetadataJWTClientConfig( + jwtToken="eyJraWQiOiJHYjM4OWEtOWY3Ni1nZGpzLWE5MmotMDI0MmJrOTQzNTYiLCJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImlzQm90IjpmYWxzZSwiaXNzIjoib3Blbi1tZXRhZGF0YS5vcmciLCJpYXQiOjE2NjM5Mzg0NjIsImVtYWlsIjoiYWRtaW5Ab3Blbm1ldGFkYXRhLm9yZyJ9.tS8um_5DKu7HgzGBzS1VTA5uUjKWOCU0B_j08WXBiEC0mr0zNREkqVfwFDD-d24HlNEbrqioLsBuFRiwIWKc1m_ZlVQbG7P36RUxhuv2vbSp80FKyNM-Tj93FDzq91jsyNmsQhyNv_fNr3TXfzzSPjHt8Go0FMMP66weoKMgW2PbXlhVKwEuXUHyakLLzewm9UMeQaEiRzhiTMU3UkLXcKbYEJJvfNFcLwSl9W8JCO_l0Yj3ud-qt_nQYEZwqW6u5nfdQllN133iikV4fM5QZsMCnm8Rq1mvLR0y9bmJiD7fwM1tmJ791TUWqmKaTnP49U493VanKpUAfzIiOiIbhg" + ), + ) + metadata = OpenMetadata(server_config) + + assert metadata.health_check() + + user = metadata.create_or_update( + data=CreateUserRequest(name="random-user", email="random@user.com"), + ) + owner = EntityReference(id=user.id, type="user") + + service = CreateDashboardServiceRequest( + name="test-service-dashboard", + serviceType=DashboardServiceType.Looker, + connection=DashboardConnection( + config=LookerConnection( + hostPort="http://hostPort", clientId="id", clientSecret="secret" + ) + ), + ) + service_type = "dashboardService" + + create_domain = CreateDomainRequest( + domainType=DomainType.Consumer_aligned, name="TestDomain", description="random" + ) + + create_data_product = CreateDataProductRequest( + name="TestDataProduct", + description="random", + domain="TestDomain", + ) + + @classmethod + def setUpClass(cls) -> None: + """ + Prepare ingredients + """ + cls.service_entity = cls.metadata.create_or_update(data=cls.service) + + cls.dashboard: Dashboard = cls.metadata.create_or_update( + CreateDashboardRequest( + name="test", + service=cls.service_entity.fullyQualifiedName, + ) + ) + + @classmethod + def tearDownClass(cls) -> None: + """ + Clean up + """ + + service_id = str( + cls.metadata.get_by_name( + entity=DashboardService, fqn=cls.service.name.__root__ + ).id.__root__ + ) + + cls.metadata.delete( + entity=DashboardService, + entity_id=service_id, + recursive=True, + hard_delete=True, + ) + + domain: Domain = cls.metadata.get_by_name( + entity=Domain, fqn=cls.create_domain.name.__root__ + ) + + cls.metadata.delete( + entity=Domain, entity_id=domain.id, recursive=True, hard_delete=True + ) + + def test_create(self): + """ + We can create a Domain and we receive it back as Entity + """ + + res: Domain = self.metadata.create_or_update(data=self.create_domain) + self.assertEquals(res.name, self.create_domain.name) + self.assertEquals(res.description, self.create_domain.description) + + res: DataProduct = self.metadata.create_or_update(data=self.create_data_product) + self.assertEquals(res.name, self.create_data_product.name) + self.assertEquals(res.description, self.create_data_product.description) + self.assertEquals(res.domain.name, self.create_data_product.domain.__root__) + + def test_get_name(self): + """We can fetch Domains & Data Products by name""" + self.metadata.create_or_update(data=self.create_domain) + + res: Domain = self.metadata.get_by_name( + entity=Domain, fqn=self.create_domain.name.__root__ + ) + self.assertEqual(res.name, self.create_domain.name) + + self.metadata.create_or_update(data=self.create_data_product) + + res: DataProduct = self.metadata.get_by_name( + entity=DataProduct, fqn=self.create_data_product.name.__root__ + ) + self.assertEqual(res.name, self.create_data_product.name) + + def test_get_id(self): + """We can fetch Domains & Data Products by ID""" + self.metadata.create_or_update(data=self.create_domain) + + res_name: Domain = self.metadata.get_by_name( + entity=Domain, fqn=self.create_domain.name.__root__ + ) + res: Domain = self.metadata.get_by_id(entity=Domain, entity_id=res_name.id) + self.assertEqual(res.name, self.create_domain.name) + + self.metadata.create_or_update(data=self.create_data_product) + + res_name: DataProduct = self.metadata.get_by_name( + entity=DataProduct, fqn=self.create_data_product.name.__root__ + ) + res: DataProduct = self.metadata.get_by_id( + entity=DataProduct, entity_id=res_name.id + ) + self.assertEqual(res.name, self.create_data_product.name) + + def test_patch_domain(self): + """We can add domain to an asset""" + domain: Domain = self.metadata.create_or_update(data=self.create_domain) + self.metadata.patch_domain(entity=self.dashboard, domain=domain) + + updated_dashboard: Dashboard = self.metadata.get_by_name( + entity=Dashboard, fqn=self.dashboard.fullyQualifiedName, fields=["domain"] + ) + + self.assertEquals(updated_dashboard.domain.name, domain.name.__root__) diff --git a/openmetadata-spec/src/main/resources/json/schema/api/domains/createDataProduct.json b/openmetadata-spec/src/main/resources/json/schema/api/domains/createDataProduct.json index 5d20fb401c3b..f9267b587694 100644 --- a/openmetadata-spec/src/main/resources/json/schema/api/domains/createDataProduct.json +++ b/openmetadata-spec/src/main/resources/json/schema/api/domains/createDataProduct.json @@ -1,7 +1,7 @@ { "$id": "https://open-metadata.org/schema/entity/domains/createDataProduct.json", "$schema": "http://json-schema.org/draft-07/schema#", - "title": "createDataProduct", + "title": "CreateDataProductRequest", "description": "Create DataProduct API request", "type": "object", "javaType": "org.openmetadata.schema.api.domains.CreateDataProduct", diff --git a/openmetadata-spec/src/main/resources/json/schema/api/domains/createDomain.json b/openmetadata-spec/src/main/resources/json/schema/api/domains/createDomain.json index 9a77fff9564f..3c677fc067d5 100644 --- a/openmetadata-spec/src/main/resources/json/schema/api/domains/createDomain.json +++ b/openmetadata-spec/src/main/resources/json/schema/api/domains/createDomain.json @@ -1,7 +1,7 @@ { "$id": "https://open-metadata.org/schema/entity/domains/createDomain.json", "$schema": "http://json-schema.org/draft-07/schema#", - "title": "createDomain", + "title": "CreateDomainRequest", "description": "Create Domain API request", "type": "object", "javaType": "org.openmetadata.schema.api.domains.CreateDomain", From 71a67d6bbe48e2a9289dc6a11e9e26cf7b35c48b Mon Sep 17 00:00:00 2001 From: Mayur Singal <39544459+ulixius9@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:50:37 +0530 Subject: [PATCH 06/10] Fix ES search during lineage ingestion (#13932) --- .../src/metadata/ingestion/lineage/sql_lineage.py | 7 +++++++ .../ingestion/ometa/mixins/lineage_mixin.py | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ingestion/src/metadata/ingestion/lineage/sql_lineage.py b/ingestion/src/metadata/ingestion/lineage/sql_lineage.py index 4cae5a53948d..38d1c28530a0 100644 --- a/ingestion/src/metadata/ingestion/lineage/sql_lineage.py +++ b/ingestion/src/metadata/ingestion/lineage/sql_lineage.py @@ -34,6 +34,7 @@ logger = utils_logger() LRU_CACHE_SIZE = 4096 +DEFAULT_SCHEMA_NAME = "" def get_column_fqn(table_entity: Table, column: str) -> Optional[str]: @@ -145,6 +146,12 @@ def get_table_fqn_from_query_name( empty_list * (3 - len(split_table)) ) + split_table + if schema_query == DEFAULT_SCHEMA_NAME: + schema_query = None + + if database_query == DEFAULT_SCHEMA_NAME: + database_query = None + return database_query, schema_query, table diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py index d6c0b8d052a5..b0ac257b36f6 100644 --- a/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py +++ b/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py @@ -177,9 +177,10 @@ def add_lineage_by_query( timeout_seconds=timeout, ) for lineage_request in add_lineage_request or []: - resp = self.add_lineage(lineage_request) - entity_name = resp.get("entity", {}).get("name") - for node in resp.get("nodes", []): - logger.info( - f"added lineage between table {node.get('name')} and {entity_name} " - ) + if lineage_request.right: + resp = self.add_lineage(lineage_request.right) + entity_name = resp.get("entity", {}).get("name") + for node in resp.get("nodes", []): + logger.info( + f"added lineage between table {node.get('name')} and {entity_name} " + ) From b7e7625071aea819bef74795328a6d28faeedf0c Mon Sep 17 00:00:00 2001 From: Onkar Ravgan Date: Fri, 10 Nov 2023 16:15:16 +0530 Subject: [PATCH 07/10] Convert dbt test result timestamps to millis (#13903) * Fixed dbt test res time to millis * added postgres migration --- .../migrations/native/1.2.1/mysql/schemaChanges.sql | 11 +++++++++++ .../native/1.2.1/postgres/schemaChanges.sql | 13 ++++++++++++- .../ingestion/source/database/dbt/metadata.py | 7 +++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/bootstrap/sql/migrations/native/1.2.1/mysql/schemaChanges.sql b/bootstrap/sql/migrations/native/1.2.1/mysql/schemaChanges.sql index e69de29bb2d1..581299a72e48 100644 --- a/bootstrap/sql/migrations/native/1.2.1/mysql/schemaChanges.sql +++ b/bootstrap/sql/migrations/native/1.2.1/mysql/schemaChanges.sql @@ -0,0 +1,11 @@ + +--update the timestamps to millis for dbt test results +UPDATE data_quality_data_time_series dqdts +SET dqdts.json = JSON_INSERT( + JSON_REMOVE(dqdts.json, '$.timestamp'), + '$.timestamp', + JSON_EXTRACT(dqdts.json, '$.timestamp') * 1000 + ) +WHERE dqdts.extension = 'testCase.testCaseResult' + AND JSON_EXTRACT(dqdts.json, '$.timestamp') REGEXP '^[0-9]{10}$' +; \ No newline at end of file diff --git a/bootstrap/sql/migrations/native/1.2.1/postgres/schemaChanges.sql b/bootstrap/sql/migrations/native/1.2.1/postgres/schemaChanges.sql index 16144ff5bdd8..cac3a9ea8b47 100644 --- a/bootstrap/sql/migrations/native/1.2.1/postgres/schemaChanges.sql +++ b/bootstrap/sql/migrations/native/1.2.1/postgres/schemaChanges.sql @@ -8,4 +8,15 @@ SET json = jsonb_set( true ) WHERE json #>> '{pipelineType}' = 'metadata' -AND json #>> '{sourceConfig,config,type}' = 'DatabaseMetadata'; \ No newline at end of file +AND json #>> '{sourceConfig,config,type}' = 'DatabaseMetadata'; + + +--update the timestamps to millis for dbt test results +UPDATE data_quality_data_time_series dqdts +SET json = jsonb_set( + dqdts.json::jsonb, + '{timestamp}', + to_jsonb(((dqdts.json ->> 'timestamp')::bigint)*1000) +) +WHERE dqdts.extension = 'testCase.testCaseResult' + AND (json->>'timestamp') ~ '^[0-9]{10}$'; diff --git a/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py b/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py index a1d3862cab38..479f85c0843d 100644 --- a/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py +++ b/ingestion/src/metadata/ingestion/source/database/dbt/metadata.py @@ -86,6 +86,7 @@ from metadata.utils.elasticsearch import get_entity_from_es_result from metadata.utils.logger import ingestion_logger from metadata.utils.tag_utils import get_ometa_tag_and_classification, get_tag_labels +from metadata.utils.time_utils import convert_timestamp_to_milliseconds logger = ingestion_logger() @@ -845,7 +846,9 @@ def add_dbt_test_result(self, dbt_test: dict): testCaseFailureReason=None, testCaseFailureComment=None, updatedAt=Timestamp( - __root__=int(datetime.utcnow().timestamp() * 1000) + __root__=convert_timestamp_to_milliseconds( + datetime.utcnow().timestamp() + ) ), updatedBy=None, ) @@ -863,7 +866,7 @@ def add_dbt_test_result(self, dbt_test: dict): dbt_timestamp = self.context.run_results_generate_time.timestamp() # Create the test case result object test_case_result = TestCaseResult( - timestamp=dbt_timestamp, + timestamp=convert_timestamp_to_milliseconds(dbt_timestamp), testCaseStatus=test_case_status, testResultValue=[ TestResultValue( From 431fbce098a4acee38a85d6b3b299f4632950edc Mon Sep 17 00:00:00 2001 From: Sachin Chaurasiya Date: Fri, 10 Nov 2023 16:37:12 +0530 Subject: [PATCH 08/10] chore(ui): improve file and folder names (#13784) * chore(ui): improve file and folder names * chore: fix test * fix: build * Fix paging (#13821) * chore(ui): pagesize support for all the pagination * revamp pagination * complete pagination update * fix import * fix pagination * fix tests * fix path * fix import * fix import error --------- Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com> --- .../src/main/resources/ui/src/App.test.tsx | 8 +- .../src/main/resources/ui/src/App.tsx | 6 +- .../src/main/resources/ui/src/AppState.ts | 2 +- .../ActivityFeedCard/ActivityFeedCard.tsx | 2 +- .../FeedCardBody/FeedCardBody.test.tsx | 2 +- .../FeedCardBody/FeedCardBody.tsx | 2 +- .../FeedCardBody/FeedCardBodyV1.tsx | 2 +- .../ActivityFeedCard/PopoverContent.test.tsx | 2 +- .../ActivityFeedCard/PopoverContent.tsx | 2 +- .../ActivityFeedListV1.component.tsx | 2 +- .../ActivityFeedProvider.tsx | 2 +- .../ActivityFeedTab.component.tsx | 4 +- .../ActivityThreadPanelBody.tsx | 4 +- .../Shared/ActivityFeedActions.tsx | 2 +- .../ActivityFeed/Shared/AnnouncementBadge.tsx | 2 +- .../ActivityFeed/Shared/TaskBadge.tsx | 2 +- .../Shared/{Badge.less => task-badge.less} | 0 .../AddDataQualityTestV1.tsx | 8 +- .../EditTestCaseModal.test.tsx | 2 +- .../AddDataQualityTest/EditTestCaseModal.tsx | 4 +- .../AddDataQualityTest/TestSuiteIngestion.tsx | 2 +- .../components/ParameterForm.test.tsx | 2 +- .../components/ParameterForm.tsx | 4 +- .../components/TestCaseForm.tsx | 4 +- .../AddIngestion/AddIngestion.component.tsx | 4 +- .../AddService/AddService.component.tsx | 6 +- .../AddService/AddService.interface.ts | 2 +- .../components/AddService/AddService.test.tsx | 2 +- .../AddService/Steps/SelectServiceType.tsx | 2 +- .../AddTestCaseList.component.tsx | 2 +- .../AlertsDetails/AlertDetails.component.tsx | 8 +- .../ui/src/components/AppBar/Appbar.test.tsx | 4 +- .../ui/src/components/AppBar/Appbar.tsx | 4 +- .../AppContainer/AppContainer.test.tsx | 4 +- .../components/AppContainer/AppContainer.tsx | 2 +- .../AdminProtectedRoute.tsx | 2 +- .../{router => AppRouter}/AppRouter.tsx | 12 +- .../AuthenticatedAppRouter.tsx | 8 +- .../GlobalSettingRouter.tsx | 8 +- .../withActivityFeed.tsx | 0 .../withAdvanceSearch.tsx | 0 .../withSuspenseFallback.js | 0 .../src/components/{tour => AppTour}/Tour.tsx | 2 +- .../{tour => AppTour}/tour.style.less | 0 .../AppDetails/AppDetails.component.tsx | 2 +- .../AppInstallVerifyCard.component.tsx | 2 +- .../AppLogsViewer/AppLogsViewer.component.tsx | 2 +- .../AppRunsHistory.component.tsx | 35 +- .../AppRunsHistory.interface.ts | 2 +- .../ApplicationCard.component.tsx | 2 +- .../MarketPlaceAppDetails.component.tsx | 4 +- .../AssetSelectionModal.tsx | 8 +- .../Auth0Authenticator.test.tsx | 2 +- .../AppAuthenticators}/Auth0Authenticator.tsx | 4 +- .../BasicAuthAuthenticator.tsx} | 4 +- .../MsalAuthenticator.test.tsx | 2 +- .../AppAuthenticators}/MsalAuthenticator.tsx | 2 +- .../AppAuthenticators}/OidcAuthenticator.tsx | 8 +- .../AppAuthenticators}/OktaAuthenticator.tsx | 4 +- .../AppAuthenticators}/SamlAuthenticator.tsx | 4 +- .../Auth0Callback/Auth0Callback.test.tsx | 2 +- .../Auth0Callback/Auth0Callback.tsx | 4 +- .../AuthProviders}/AuthProvider.interface.ts | 0 .../AuthProviders}/AuthProvider.test.tsx | 0 .../AuthProviders}/AuthProvider.tsx | 18 +- .../AuthProviders/BasicAuthProvider.tsx} | 0 .../AuthProviders/OktaAuthProvider.tsx} | 0 .../Extensions/hashtag/hashtagSuggestion.ts | 2 +- .../components/BotDetails/AuthMechanism.tsx | 4 +- .../BotDetails/BotDetails.component.tsx | 8 +- .../components/BotDetails/BotDetails.test.tsx | 4 +- ...AuthMechanism.less => auth-mechanism.less} | 0 ...BotDetails.style.less => bot-details.less} | 0 .../BotListV1/BotListV1.component.tsx | 18 +- .../src/components/Chart/CustomBarChart.tsx | 2 +- .../DataDistributionHistogram.component.tsx | 2 +- .../Chart/DataDistributionHistogram.test.tsx | 2 +- .../Chart/OperationDateBarChart.tsx | 2 +- .../ClassificationDetails.tsx | 99 ++++-- .../ContainerChildren/ContainerChildren.tsx | 4 +- .../ContainerDataModel.test.tsx | 4 +- .../ContainerDataModel/ContainerDataModel.tsx | 2 +- .../ContainerVersion.component.tsx | 2 +- .../ContainerVersion.interface.ts | 2 +- .../ContainerVersion.test.tsx | 2 +- .../CopyToClipboardButton.test.tsx | 0 .../CopyToClipboardButton.tsx | 4 +- .../CreateUser/CreateUser.component.tsx | 6 +- .../components/CreateUser/CreateUser.test.tsx | 2 +- .../AddCustomProperty.test.tsx | 2 +- .../AddCustomProperty/AddCustomProperty.tsx | 2 +- .../CustomPropertyTable.test.tsx | 4 +- .../CustomPropertyTable.tsx | 4 +- .../AddWidgetModal/AddWidgetModal.tsx | 4 +- ...WidgetModal.less => add-widget-modal.less} | 0 .../CustomizeMyData/CustomizeMyData.tsx | 6 +- ...mizeMyData.less => customize-my-data.less} | 0 .../EmptyWidgetPlaceholder.tsx | 2 +- ...der.less => empty-widget-placeholder.less} | 0 .../DashboardDetails.component.tsx | 10 +- .../DashboardDetails.test.tsx | 6 +- .../DashboardVersion.component.tsx | 4 +- .../DashboardVersion.interface.ts | 2 +- .../DashboardVersion.test.tsx | 6 +- .../DataAssetsHeader.component.tsx | 10 +- .../DataAssetsHeader.interface.ts | 2 +- .../DataAssetsHeader.test.tsx | 8 +- .../DataAssetsVersionHeader.interface.ts | 2 +- .../DataAssetsVersionHeader.tsx | 2 +- .../DailyActiveUsersChart.tsx | 4 +- .../DataInsightDetail/DataInsightSummary.tsx | 2 +- .../DataInsightDetail/DescriptionInsight.tsx | 6 +- .../EmptyGraphPlaceholder.tsx | 2 +- .../components/DataInsightDetail/KPIChart.tsx | 6 +- .../DataInsightDetail/OwnerInsight.tsx | 6 +- .../PageViewsByEntitiesChart.tsx | 4 +- .../DataInsightDetail/TierInsight.tsx | 6 +- .../DataInsightDetail/TopActiveUsers.tsx | 4 +- .../DataInsightDetail/TopViewEntities.tsx | 4 +- .../DataInsightDetail/TotalEntityInsight.tsx | 4 +- .../TotalEntityInsightSummary.component.tsx | 2 +- ...htDetail.less => data-insight-detail.less} | 0 .../DataModelVersion.component.tsx | 2 +- .../DataModelVersion.interface.ts | 2 +- .../DataModels/DataModelDetails.component.tsx | 10 +- .../components/DataModels/DataModelsTable.tsx | 92 ++++- .../DataProductsDetailsPage.component.tsx | 4 +- .../DataProductsPage.component.tsx | 4 +- .../TestCaseStatusModal.component.tsx | 4 +- .../TestCaseStatusModal.test.tsx | 2 +- .../TestCases/TestCases.component.tsx | 78 ++-- .../DataQuality/TestCases/TestCases.test.tsx | 14 +- .../TestSuites/TestSuites.component.tsx | 81 +++-- .../TestSuites/TestSuites.test.tsx | 6 +- .../DatePickerMenu.component.tsx | 2 +- ...rMenu.style.less => date-picker-menu.less} | 0 .../Domain/AddDomain/AddDomain.component.tsx | 2 +- .../DomainDetailsPage.component.tsx | 4 +- .../Domain/DomainPage.component.tsx | 4 +- .../DataProductsTab.component.tsx | 6 +- .../DocumentationTab.component.tsx | 2 +- .../DocumentationTab.test.tsx | 2 +- .../DomainVersion/DomainVersion.component.tsx | 4 +- .../DomainVersion/DomainVersion.test.tsx | 2 +- .../EntityHeader/EntityHeader.component.tsx | 4 +- .../EdgeInfoDrawer.component.tsx | 6 +- .../EntityInfoDrawer.component.tsx | 2 +- ...wer.style.less => entity-info-drawer.less} | 0 .../AppPipelineModel/AddPipeLineModal.tsx | 4 +- .../EntityLineage/EntityLineage.component.tsx | 2 +- .../EntityLineage/EntityLineage.interface.ts | 2 +- .../NodeSuggestions.component.tsx | 2 +- .../Execution/Execution.component.tsx | 2 +- .../ListView/ListViewTab.component.tsx | 2 +- .../{Execution.style.less => execution.less} | 0 .../AdvanceSearchProvider.component.tsx | 2 +- .../AppliedFilterText/AppliedFilterText.tsx | 2 +- ...lterText.less => applied-filter-text.less} | 0 .../DataProductSummary.component.tsx | 2 +- .../EntitySummaryPanel.component.tsx | 4 +- .../EntitySummaryPanel.interface.ts | 2 +- .../ServiceSummary.interface.ts | 2 +- .../StoredProcedureSummary.component.tsx | 2 +- .../SummaryList/SummaryList.component.tsx | 2 +- .../SummaryListItems.component.tsx | 2 +- .../SummaryListItems.test.tsx | 2 +- ...mmaryList.style.less => summary-list.less} | 0 .../TagsSummary/TagsSummary.component.tsx | 6 +- ...l.style.less => entity-summary-panel.less} | 0 .../{exlore.mock.ts => Explore.mock.ts} | 2 +- ....interface.ts => ExplorePage.interface.ts} | 4 +- .../Explore/ExploreQuickFilters.interface.ts | 2 +- .../Explore/ExploreQuickFilters.test.tsx | 2 +- .../Explore/ExploreQuickFilters.tsx | 4 +- .../ExploreSearchCard.interface.ts | 2 +- .../ExploreSearchCard/ExploreSearchCard.tsx | 2 +- .../ExploreV1/ExploreV1.component.tsx | 24 +- .../components/ExploreV1/ExploreV1.test.tsx | 8 +- .../{ExploreV1.style.less => exploreV1.less} | 0 .../src/components/FeedEditor/FeedEditor.tsx | 4 +- .../{FeedEditor.css => feed-editor.less} | 0 .../GlobalSearchProvider.interface.tsx | 2 +- .../GlobalSearchProvider.tsx | 2 +- ...ns.less => global-search-suggestions.less} | 0 .../AddGlossary/AddGlossary.component.tsx | 4 +- .../AddGlossary/AddGlossary.interface.ts | 2 +- .../AddGlossaryTermForm.component.tsx | 2 +- .../GlossaryDetails.component.tsx | 4 +- ...tails.style.less => glossary-details.less} | 0 .../GlossaryHeader.component.tsx | 4 +- .../GlossaryHeader/GlossaryHeader.test.tsx | 2 +- .../GlossaryTermTab.component.tsx | 4 +- .../GlossaryTermTab/GlossaryTermTab.test.tsx | 4 +- .../GlossaryTermsV1.interface.ts | 2 +- .../tabs/AssetsTabs.component.tsx | 60 ++-- .../tabs/AssetsTabs.interface.ts | 2 +- .../tabs/GlossaryOverviewTab.component.tsx | 2 +- .../tabs/GlossaryOverviewTab.test.tsx | 2 +- .../Glossary/GlossaryV1.component.tsx | 4 +- .../Glossary/GlossaryV1.interfaces.ts | 2 +- .../components/Glossary/GlossaryV1.test.tsx | 4 +- .../GlossaryVersion.component.tsx | 2 +- .../GlossaryVersion/GlossaryVersion.test.tsx | 2 +- .../ImportGlossary/ImportGlossary.test.tsx | 2 +- .../ImportGlossary/ImportGlossary.tsx | 6 +- ...portGlossary.less => import-glossary.less} | 0 ...{GlossaryV1.style.less => glossaryV1.less} | 0 .../Ingestion/Ingestion.component.tsx | 4 +- .../components/Ingestion/Ingestion.test.tsx | 2 +- .../IngestionListTable.component.tsx | 55 +-- .../Ingestion/IngestionListTable.test.tsx | 4 +- .../IngestinoPipelineList.test.tsx | 9 +- .../IngestionPipelineList.component.tsx | 12 +- .../ListView/ListView.component.tsx | 2 +- .../src/components/ListView/ListView.test.tsx | 9 +- .../MlModelDetail.component.test.tsx | 6 +- .../MlModelDetail/MlModelDetail.component.tsx | 8 +- .../MlModelFeaturesList.test.tsx | 2 +- .../MlModelDetail/MlModelFeaturesList.tsx | 2 +- .../MlModelDetail/SourceList.component.tsx | 2 +- ...SourceList.style.less => source-list.less} | 0 .../MlModelVersion.component.tsx | 6 +- .../MlModelVersion.interface.tsx | 2 +- .../MlModelVersion/MlModelVersion.test.tsx | 7 +- .../AddAnnouncementModal.test.tsx | 2 +- .../AddAnnouncementModal.tsx | 6 +- .../EditAnnouncementModal.test.tsx | 2 +- .../EditAnnouncementModal.tsx | 4 +- ...mentModal.less => announcement-modal.less} | 0 .../ModalWithMarkdownEditor.test.tsx | 2 +- .../ModalWithMarkdownEditor.tsx | 4 +- ...e.less => modal-with-markdown-editor.less} | 0 .../SchemaModal/SchemaModal.interface.ts | 2 +- .../Modals/SchemaModal/SchemaModal.test.tsx | 2 +- .../Modals/SchemaModal/SchemaModal.tsx | 4 +- ...hemaModal.style.less => schema-modal.less} | 0 .../Modals/WhatsNewModal/ChangeLogs.tsx | 2 +- .../Modals/WhatsNewModal/FeaturesCarousel.tsx | 2 +- .../WhatsNewAlert/WhatsNewAlert.component.tsx | 3 +- .../Modals/WhatsNewModal/WhatsNewModal.tsx | 4 +- ...Modal.styles.less => whats-new-modal.less} | 0 .../LeftSidebar/LeftSidebar.component.tsx | 2 +- .../MyDataWidget/MyDataWidget.component.tsx | 6 +- .../MyData/MyDataWidget/MyDataWidget.test.tsx | 2 +- ...{MyDataWidget.less => my-data-widget.less} | 0 .../RightSidebar/AnnouncementsWidget.tsx | 2 +- .../MyData/RightSidebar/FollowingWidget.tsx | 4 +- ...sWidget.less => announcements-widget.less} | 0 ...owingWidget.less => following-widget.less} | 0 .../{nav-bar => NavBar}/NavBar.interface.ts | 0 .../components/{nav-bar => NavBar}/NavBar.tsx | 16 +- .../{nav-bar => NavBar}/nav-bar.less | 0 .../NotificationBox.component.tsx | 2 +- .../PageHeader.component.tsx | 2 +- .../PageHeader.interface.ts | 0 .../page-header.less} | 0 .../PageLayoutV1.test.tsx | 0 .../PageLayoutV1.tsx | 0 .../PermissionProvider.test.tsx | 2 +- .../PermissionProvider/PermissionProvider.tsx | 2 +- .../PersonaDetailsCard/PersonaDetailsCard.tsx | 2 +- .../PipelineDetails.component.tsx | 8 +- .../PipelineDetails/PipelineDetails.test.tsx | 6 +- .../PipelineVersion.component.tsx | 4 +- .../PipelineVersion.interface.ts | 2 +- .../PipelineVersion/PipelineVersion.test.tsx | 9 +- .../component/DataQualityTab.test.tsx | 2 +- .../component/DataQualityTab.tsx | 19 +- .../component/ProfilerDetailsCard.test.tsx | 2 +- .../component/ProfilerDetailsCard.tsx | 2 +- .../component/ProfilerLatestValue.tsx | 2 +- .../component/TestSummary.test.tsx | 4 +- .../component/TestSummary.tsx | 8 +- ...tyTab.style.less => data-quality-tab.less} | 0 ...stSummary.style.less => test-summary.less} | 0 ...Dashboard.less => profiler-dashboard.less} | 0 .../profilerDashboard.interface.ts | 11 +- .../src/components/Reactions/Emoji.test.tsx | 2 +- .../ui/src/components/Reactions/Emoji.tsx | 2 +- .../ui/src/components/Reactions/Reactions.tsx | 2 +- .../components/SampleDataTable/RowData.tsx | 2 +- ...e.interface.ts => SampleData.interface.ts} | 2 +- .../SampleDataTable.component.tsx | 8 +- .../SampleDataTable/SampleDataTable.test.tsx | 2 +- ...able.style.less => sample-data-table.less} | 0 .../SampleDataWithMessages/MessageCard.tsx | 4 +- .../SampleDataWithMessages.tsx | 2 +- .../{MessageCard.less => message-card.less} | 0 .../SchemaEditor.test.tsx | 0 .../SchemaEditor.tsx | 2 +- .../SchemaTab/SchemaTab.component.tsx | 2 +- .../SchemaTable/SchemaTable.component.tsx | 2 +- .../SchemaTable/SchemaTable.test.tsx | 4 +- .../SearchDropdown.interface.ts | 2 +- .../SearchDropdown/SearchDropdown.tsx | 2 +- ...archDropdown.less => search-dropdown.less} | 0 .../SearchIndexVersion.interface.ts | 2 +- .../SearchIndexVersion/SearchIndexVersion.tsx | 2 +- .../SearchedData.interface.ts | 2 +- .../SearchedData.test.tsx | 4 +- .../SearchedData.tsx | 4 +- .../ui/src/components/Services/Services.tsx | 17 +- .../SettingsIngestion.component.tsx | 294 ---------------- .../SettingsIngestion.interface.ts | 24 -- .../ExploreLeftPanelSkeleton.component.tsx | 2 +- .../GlossaryV1LeftPanelSkeleton.component.tsx | 2 +- .../EntityListSkeleton.component.tsx | 6 +- .../SummaryPanelSkeleton.component.tsx | 2 +- .../Tags/TagsLeftPanelSkeleton.component.tsx | 2 +- .../StoredProcedureVersion.component.tsx | 2 +- .../StoredProcedureVersion.interface.ts | 2 +- .../StoredProcedureVersion.test.tsx | 2 +- .../TableDataCardBody.test.tsx | 2 +- .../TableDataCardBody/TableDataCardBody.tsx | 2 +- .../TableDescription.component.tsx | 2 +- .../Component/ColumnProfileTable.test.tsx | 2 +- .../Component/ColumnProfileTable.tsx | 4 +- .../TableProfiler/Component/ColumnSummary.tsx | 2 +- .../Component/ProfilerSettingsModal.tsx | 4 +- .../TableProfiler/TableProfilerV1.tsx | 6 +- ...tableProfiler.less => table-profiler.less} | 0 .../TableQueries/QueryCard.test.tsx | 2 +- .../src/components/TableQueries/QueryCard.tsx | 2 +- .../QueryCardExtraOption.component.tsx | 2 +- .../QueryCardExtraOption.test.tsx | 2 +- .../QueryUsedByOtherTable.test.tsx | 2 +- .../TableQueries/TableQueries.test.tsx | 2 +- .../components/TableQueries/TableQueries.tsx | 63 ++-- .../TableQueryRightPanel.component.tsx | 2 +- .../TableQueryRightPanel.test.tsx | 2 +- .../TableVersion/TableVersion.component.tsx | 2 +- .../TableVersion/TableVersion.interface.ts | 2 +- .../TableVersion/TableVersion.test.tsx | 2 +- .../Task/TaskTab/TaskTab.component.tsx | 2 +- .../Team/TeamDetails/RolesAndPoliciesList.tsx | 2 +- .../TeamDetails/TeamDetailsV1.interface.ts} | 32 +- .../Team/TeamDetails/TeamDetailsV1.tsx | 53 +-- .../Team/TeamDetails/TeamHierarchy.tsx | 2 +- .../TeamsHeadingLabel.component.tsx | 2 +- .../TeamsInfo.component.tsx | 2 +- .../TeamDetails/UserTab/UserTab.component.tsx | 148 ++++++-- .../TeamDetails/UserTab/UserTab.interface.ts | 10 - .../Team/TeamDetails/UserTab/UserTab.test.tsx | 88 ++--- .../AddTestSuiteForm.test.tsx | 2 +- .../AddTestSuiteForm/AddTestSuiteForm.tsx | 4 +- .../TestSuitePipelineTab.component.tsx | 4 +- ...ace.tsx => TestSuiteStepper.interface.tsx} | 0 .../TestSuiteStepper.test.tsx | 6 +- .../TestSuiteStepper/TestSuiteStepper.tsx | 6 +- .../TopicDetails/TopicDetails.component.tsx | 10 +- .../TopicDetails/TopicDetails.test.tsx | 10 +- .../TopicSchema/TopicSchema.test.tsx | 6 +- .../TopicDetails/TopicSchema/TopicSchema.tsx | 6 +- .../TopicVersion/TopicVersion.component.tsx | 2 +- .../TopicVersion/TopicVersion.interface.ts | 2 +- .../TopicVersion/TopicVersion.test.tsx | 7 +- .../TotalDataAssetsWidget.component.tsx | 4 +- ...get.less => total-data-assets-widget.less} | 0 .../components/UserList/UserListV1.test.tsx | 165 --------- .../ui/src/components/UserList/UserListV1.tsx | 317 ----------------- .../UserProfileIcon.component.tsx | 4 +- .../components/Users/Users.component.test.tsx | 8 +- .../src/components/Users/Users.component.tsx | 10 +- .../UserProfileDetails.component.tsx | 2 +- .../UserProfileDetails.test.tsx | 25 +- .../Users/UsersTab/UsersTabs.component.tsx | 4 +- .../src/components/Users/mocks/User.mocks.ts | 2 +- .../Users/{Users.style.less => users.less} | 0 .../VersionTable/VersionTable.component.tsx | 6 +- .../WebAnalytics/WebAnalyticsProvider.tsx | 2 +- .../WebSocketProvider.tsx} | 2 +- .../WelcomeScreen/WelcomeScreen.component.tsx | 2 +- .../FeedsWidget/FeedsWidget.component.tsx | 4 +- .../{FeedsWidget.less => feeds-widget.less} | 0 .../Widgets/RecentlyViewed/RecentlyViewed.tsx | 2 +- ...centlyViewed.less => recently-viewed.less} | 0 .../Avatar.test.tsx | 0 .../{avatar => AvatarComponent}/Avatar.tsx | 0 .../common/CronEditor/CronEditor.tsx | 1 + .../common/CronEditor/cron-editor.less} | 0 .../CustomPropertyTable.test.tsx | 2 +- .../CustomPropertyTable.tsx | 2 +- .../CustomPropertyTable/ExtensionTable.tsx | 2 +- .../PropertyValue.test.tsx | 2 +- .../CustomPropertyTable/PropertyValue.tsx | 2 +- .../Description.interface.ts | 0 .../Description.test.tsx | 2 +- .../Description.tsx | 2 +- .../DescriptionV1.tsx | 2 +- .../AnnouncementCard/AnnouncementCard.less | 0 .../AnnouncementCard.test.tsx | 0 .../AnnouncementCard/AnnouncementCard.tsx | 0 .../AnnouncementDrawer.test.tsx | 0 .../AnnouncementDrawer/AnnouncementDrawer.tsx | 2 +- .../ManageButton/ManageButton.less | 0 .../ManageButton/ManageButton.test.tsx | 0 .../ManageButton/ManageButton.tsx | 6 +- .../EntitySummaryDetails.tsx | 2 +- ...less => entity-summary-details.style.less} | 0 .../AssignErrorPlaceHolder.tsx | 0 .../CreateErrorPlaceHolder.tsx | 0 .../CustomNoDataPlaceHolder.tsx | 0 .../ErrorPlaceHolder.test.tsx | 0 .../ErrorPlaceHolder.tsx | 0 .../ErrorPlaceHolderES.test.tsx | 0 .../ErrorPlaceHolderES.tsx | 0 .../ErrorPlaceHolderIngestion.test.tsx | 0 .../ErrorPlaceHolderIngestion.tsx | 0 .../FilterErrorPlaceHolder.tsx | 0 .../FilterTablePlaceHolder.tsx | 0 .../NoDataPlaceholder.tsx | 0 .../PermissionErrorPlaceholder.tsx | 0 .../placeholder.interface.ts | 0 .../FeedsFilterPopover.component.tsx | 2 +- .../InheritedRolesCard.component.tsx | 2 +- ...e.less => inherited-roles-card.style.less} | 0 .../NextPrevious.interface.ts | 0 .../NextPrevious.test.tsx | 0 .../NextPrevious.tsx | 0 .../common/PopOverCard/EntityPopOverCard.tsx | 2 +- .../ProfilePicture/ProfilePicture.test.tsx | 2 +- .../common/ProfilePicture/ProfilePicture.tsx | 2 +- .../QueryViewer/QueryViewer.component.tsx | 2 +- .../ResizablePanels/ResizablePanels.tsx | 2 +- ...zablePanels.less => resizable-panels.less} | 0 .../CustomHtmlRederer.interface.ts | 0 .../CustomHtmlRederer/CustomHtmlRederer.tsx | 0 .../EditorToolBar.ts | 0 .../RichTextEditor.interface.ts | 0 .../RichTextEditor.test.tsx | 0 .../RichTextEditor.tsx | 2 +- .../RichTextEditorPreviewer.test.tsx | 0 .../RichTextEditorPreviewer.tsx | 2 +- .../rich-text-editor-previewer.less} | 0 .../rich-text-editor.less} | 0 .../common/RolesCard/RolesCard.component.tsx | 2 +- .../RolesElement/RolesElement.component.tsx | 2 +- ....styles.less => roles-element.styles.less} | 0 .../SearchBar.component.tsx} | 0 .../Searchbar.test.tsx | 2 +- .../SelectableList.component.tsx | 2 +- .../ServiceDocPanel/ServiceDocPanel.test.tsx | 2 +- .../ServiceDocPanel/ServiceDocPanel.tsx | 4 +- ...ceDocPanel.less => service-doc-panel.less} | 0 .../SuccessScreen.test.tsx | 0 .../SuccessScreen.tsx | 2 +- .../SummaryTagsDescription.component.tsx | 4 +- .../TableDataCardV2.less | 0 .../TableDataCardV2.test.tsx | 0 .../TableDataCardV2.tsx | 2 +- .../ConnectionStepCard/ConnectionStepCard.tsx | 2 +- ...tepCard.less => connection-step-card.less} | 0 .../common/TestIndicator/TestIndicator.tsx | 2 +- ...testIndicator.less => test-indicator.less} | 0 .../common/TierCard/TierCard.test.tsx | 2 +- .../components/common/TierCard/TierCard.tsx | 2 +- .../TitleBreadcrumb.component.test.tsx} | 2 +- .../TitleBreadcrumb.component.tsx} | 2 +- .../TitleBreadcrumb.interface.ts} | 0 .../ui/src/constants/explore.constants.ts | 2 +- .../ui/src/hooks/paging/usePaging.ts | 29 +- .../src/pages/AddAlertPage/AddAlertPage.tsx | 2 +- .../AddDataInsightReportAlert.test.tsx | 2 +- .../AddDataInsightReportAlert.tsx | 2 +- .../AddGlossary/AddGlossaryPage.component.tsx | 2 +- .../AddIngestionPage.component.tsx | 6 +- .../AddQueryPage/AddQueryPage.component.tsx | 10 +- .../pages/AddQueryPage/AddQueryPage.test.tsx | 6 +- .../AddServicePage.component.tsx | 2 +- .../AlertDataInsightReportPage.tsx | 4 +- .../ui/src/pages/AlertsPage/AlertsPage.tsx | 74 ++-- .../pages/AppInstall/AppInstall.component.tsx | 4 +- .../src/pages/Application/ApplicationPage.tsx | 22 +- .../pages/BotDetailsPage/BotDetailsPage.tsx | 2 +- .../ClassificationVersionPage.tsx | 63 +--- .../EditLoginConfigurationPage.tsx | 2 +- .../LoginConfigurationPage.tsx | 4 +- .../ContainerPage/ContainerPage.test.tsx | 4 +- .../src/pages/ContainerPage/ContainerPage.tsx | 10 +- .../CreateUserPage.component.tsx | 4 +- .../CreateUserPage/CreateUserPage.test.tsx | 2 +- .../CustomLogoConfigSettingsPage.tsx | 4 +- .../CustomPageSettings/CustomPageSettings.tsx | 125 ++++--- ...ettings.less => custom-page-settings.less} | 0 .../CustomPropertiesPageV1.tsx | 8 +- ...eV1.less => custom-properties-pageV1.less} | 0 .../DashboardDetailsPage.component.tsx | 4 +- .../DataInsightPage.component.tsx | 6 +- .../DataInsightPage/DataInsightPage.test.tsx | 2 +- .../pages/DataInsightPage/KPIList.test.tsx | 4 +- .../ui/src/pages/DataInsightPage/KPIList.tsx | 8 +- .../{DataInsight.less => data-insight.less} | 0 .../DataModelPage/DataModelPage.component.tsx | 4 +- .../DataModelPage/DataModelsInterface.tsx | 2 +- .../DataQuality/DataQualityPage.test.tsx | 2 +- .../src/pages/DataQuality/DataQualityPage.tsx | 2 +- .../DatabaseDetailsPage.test.tsx | 19 +- .../DatabaseDetailsPage.tsx | 12 +- .../DatabaseSchemaPage.component.tsx | 95 ++--- .../DatabaseSchemaPage.test.tsx | 9 +- .../DatabaseSchemaPage/SchemaTablesTab.tsx | 10 +- .../DatabaseSchemaVersionPage.tsx | 6 +- .../DatabaseVersionPage.tsx | 8 +- .../EditConnectionFormPage.component.tsx | 6 +- .../EditCustomLogoConfig.test.tsx | 2 +- .../EditCustomLogoConfig.tsx | 2 +- .../EditEmailConfigPage.component.tsx | 2 +- .../EditIngestionPage.component.tsx | 6 +- .../EmailConfigSettingsPage.component.tsx | 4 +- .../EntityVersionPage.component.tsx | 4 +- .../EntityVersionPage.test.tsx | 2 +- .../ExplorePage.interface.ts | 0 .../ExplorePageV1.component.tsx | 6 +- .../forgot-password.component.tsx | 2 +- .../forgot-password.styles.less | 0 .../GlobalSettingPage/GlobalSettingPage.tsx | 4 +- .../GlossaryPage/GlossaryPage.component.tsx | 6 +- .../GlossaryPage/GlossaryPage.test.tsx | 2 +- .../ui/src/pages/KPIPage/AddKPIPage.test.tsx | 4 +- .../ui/src/pages/KPIPage/AddKPIPage.tsx | 6 +- .../ui/src/pages/KPIPage/EditKPIPage.test.tsx | 4 +- .../ui/src/pages/KPIPage/EditKPIPage.tsx | 6 +- .../KPIPage/{KPIPage.less => kpi-page.less} | 0 .../LoginCarousel.test.tsx | 0 .../{login => LoginPage}/LoginCarousel.tsx | 0 .../pages/{login => LoginPage}/index.test.tsx | 4 +- .../src/pages/{login => LoginPage}/index.tsx | 4 +- .../{login => LoginPage}/login.style.less | 0 .../LogsViewer/LogsViewer.component.test.tsx | 4 +- .../pages/LogsViewer/LogsViewer.component.tsx | 8 +- ...ewer.style.less => logs-viewer.style.less} | 0 .../pages/MarketPlacePage/MarketPlacePage.tsx | 51 +-- .../MlModelPage/MlModelPage.component.tsx | 4 +- .../MyDataPage/MyDataPageV1.component.tsx | 4 +- .../PageNotFound.test.tsx | 0 .../PageNotFound.tsx | 0 .../page-not-found.less | 0 .../PersonaDetailsPage/PersonaDetailsPage.tsx | 8 +- .../Persona/PersonaListPage/PersonaPage.tsx | 32 +- .../PipelineDetailsPage.component.tsx | 4 +- .../PipelineDetailsPage.test.tsx | 2 +- .../AddPolicyPage/AddPolicyPage.test.tsx | 4 +- .../AddPolicyPage/AddPolicyPage.tsx | 4 +- ...{policies.mock.ts => PoliciesData.mock.ts} | 0 .../PoliciesDetailPage/AddRulePage.test.tsx | 6 +- .../PoliciesDetailPage/AddRulePage.tsx | 4 +- .../PoliciesDetailPage/EditRulePage.test.tsx | 6 +- .../PoliciesDetailPage/EditRulePage.tsx | 4 +- .../PoliciesDetailPage.test.tsx | 10 +- .../PoliciesDetailPage/PoliciesDetailPage.tsx | 10 +- .../PoliciesDetailsList.component.tsx | 2 +- ...liciesDetail.less => policies-detail.less} | 0 .../PoliciesListPage.test.tsx | 4 +- .../PoliciesListPage/PoliciesListPage.tsx | 46 ++- .../{PoliciesList.less => policies-list.less} | 0 .../PoliciesPage/RuleForm/RuleForm.test.tsx | 2 +- .../pages/PoliciesPage/RuleForm/RuleForm.tsx | 2 +- .../pages/QueryPage/QueryPage.component.tsx | 8 +- .../ui/src/pages/QueryPage/QueryPage.test.tsx | 4 +- .../ResetPassword.component.tsx} | 4 +- .../reset-password.style.less | 0 .../AddAttributeModal.test.tsx | 2 +- .../AddAttributeModal/AddAttributeModal.tsx | 6 +- ...uteModal.less => add-attribute-modal.less} | 0 .../AddRolePage/AddRolePage.test.tsx | 6 +- .../RolesPage/AddRolePage/AddRolePage.tsx | 4 +- .../RolesDetailPage/RolesDetailPage.test.tsx | 6 +- .../RolesDetailPage/RolesDetailPage.tsx | 8 +- .../RolesDetailPageList.component.tsx | 2 +- .../{RolesDetail.less => roles-detail.less} | 0 .../RolesListPage/RolesListPage.test.tsx | 4 +- .../RolesPage/RolesListPage/RolesListPage.tsx | 43 ++- .../{RolesList.less => roles-list.less} | 0 .../ui/src/pages/SamlCallback/index.tsx | 4 +- .../SearchIndexDetailsPage.test.tsx | 6 +- .../SearchIndexDetailsPage.tsx | 10 +- .../SearchIndexFieldsTab.test.tsx | 14 +- .../SearchIndexFieldsTab.tsx | 2 +- .../SearchIndexFieldsTable.test.tsx | 2 +- .../SearchIndexFieldsTable.tsx | 2 +- .../ServiceDetailsPage/ServiceDetailsPage.tsx | 66 +--- .../ServiceMainTabContent.tsx | 8 +- .../ServiceVersionMainTabContent.interface.ts | 2 +- .../ServiceVersionMainTabContent.test.tsx | 16 +- .../ServiceVersionMainTabContent.tsx | 6 +- .../ServiceVersionPage.test.tsx | 12 +- .../ServiceVersionPage/ServiceVersionPage.tsx | 6 +- .../ServicesPage.tsx | 2 +- .../pages/SignUp/BasicSignup.component.tsx | 8 +- .../ui/src/pages/SignUp/SignUpPage.test.tsx | 4 +- .../ui/src/pages/SignUp/SignUpPage.tsx | 4 +- .../{signup.mock.ts => SignupData.mock.ts} | 0 .../StoredProcedurePage.test.tsx | 8 +- .../StoredProcedure/StoredProcedurePage.tsx | 14 +- .../StoredProcedureTab.test.tsx | 137 +------ .../StoredProcedure/StoredProcedureTab.tsx | 103 ++++-- .../storedProcedure.interface.ts | 21 -- .../pages/{swagger => SwaggerPage}/index.tsx | 0 .../{swagger => SwaggerPage}/swagger.less | 0 .../TableDetailsPageV1.test.tsx | 6 +- .../TableDetailsPageV1/TableDetailsPageV1.tsx | 12 +- .../ui/src/pages/TagsPage/TagsForm.test.tsx | 2 +- .../ui/src/pages/TagsPage/TagsPage.test.tsx | 6 +- .../ui/src/pages/TagsPage/TagsPage.tsx | 101 +----- .../RequestDescriptionPage.tsx | 12 +- .../RequestTagPage/RequestTagPage.tsx | 8 +- .../UpdateDescriptionPage.tsx | 8 +- .../TasksPage/UpdateTagPage/UpdateTagPage.tsx | 8 +- .../TasksPage/shared/CommentModal.test.tsx | 2 +- .../pages/TasksPage/shared/CommentModal.tsx | 2 +- .../TasksPage/shared/DescriptionTabs.test.tsx | 4 +- .../TasksPage/shared/DescriptionTabs.tsx | 6 +- .../TasksPage/shared/DescriptionTask.tsx | 2 +- ...skPage.style.less => task-page.style.less} | 0 .../AddTeamForm.interface.ts | 0 .../{teams => TeamsPage}/AddTeamForm.test.tsx | 0 .../{teams => TeamsPage}/AddTeamForm.tsx | 4 +- .../ImportTeamsPage.interface.ts | 0 .../ImportTeamsPage/ImportTeamsPage.test.tsx | 4 +- .../ImportTeamsPage/ImportTeamsPage.tsx | 6 +- .../pages/{teams => TeamsPage}/TeamsPage.tsx | 139 +------- .../TestCaseDetailsPage.component.tsx | 6 +- ...less => test-case-details-page.style.less} | 0 .../TestSuiteDetailsPage.component.tsx | 72 ++-- .../TestSuiteDetailsPage.test.tsx | 14 +- ...ss => test-suite-details-page.styles.less} | 0 .../TestSuiteIngestionPage.tsx | 6 +- .../TopicDetailsPage.component.tsx | 4 +- .../TourPage.component.tsx | 8 +- .../{mockUserData.ts => MockUserPageData.ts} | 0 .../UserListPage/UserListPageV1.test.tsx | 221 +++--------- .../src/pages/UserListPage/UserListPageV1.tsx | 333 +++++++++++++++--- .../UserListPage/user-list-page-v1.less} | 0 .../src/pages/UserPage/UserPage.component.tsx | 2 +- .../ui/src/pages/UserPage/UserPage.test.tsx | 2 +- .../src/main/resources/ui/src/rest/miscAPI.ts | 2 +- .../src/main/resources/ui/src/styles/index.js | 3 - .../ui/src/styles/myDataDetailsTemp.css | 158 --------- .../ui/src/styles/x-custom/stepper.css | 80 ----- .../ui/src/utils/AuthProvider.util.ts | 2 +- .../ui/src/utils/AuthProviderUtil.test.ts | 2 +- .../ui/src/utils/ClassificationUtils.tsx | 2 +- .../resources/ui/src/utils/CommonUtils.tsx | 13 +- .../ui/src/utils/DatabaseDetails.utils.tsx | 8 +- .../ui/src/utils/EntityLineageUtils.tsx | 4 +- .../resources/ui/src/utils/EntityUtils.tsx | 4 +- .../Explore => utils}/Explore.utils.ts | 14 +- .../ExplorePage/ExplorePageUtils.test.ts | 2 +- .../src/utils/ExplorePage/ExplorePageUtils.ts | 2 +- .../mocks/ExplorePageUtils.mock.ts | 2 +- .../main/resources/ui/src/utils/FeedUtils.tsx | 2 +- .../resources/ui/src/utils/IngestionUtils.tsx | 2 +- .../ResetPassword.utils.ts} | 0 .../SchemaEditor.utils.ts | 4 +- .../src/utils/ServiceMainTabContentUtils.tsx | 2 +- .../SkeletonUtils => utils}/Skeleton.utils.ts | 0 .../resources/ui/src/utils/TableUtils.tsx | 2 +- .../main/resources/ui/src/utils/TagsUtils.tsx | 2 +- .../resources/ui/src/utils/UserDataUtils.ts | 2 +- .../Users => utils}/Users.util.tsx | 13 +- .../WhatsNewModal.util.ts | 0 .../main/resources/ui/src/utils/formUtils.tsx | 4 +- 662 files changed, 2307 insertions(+), 3424 deletions(-) rename openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/{Badge.less => task-badge.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/AdminProtectedRoute.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/AppRouter.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/AuthenticatedAppRouter.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/GlobalSettingRouter.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/withActivityFeed.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/withAdvanceSearch.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{router => AppRouter}/withSuspenseFallback.js (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{tour => AppTour}/Tour.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{tour => AppTour}/tour.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/Auth0Authenticator.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/Auth0Authenticator.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators/basic-auth.authenticator.tsx => Auth/AppAuthenticators/BasicAuthAuthenticator.tsx} (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/MsalAuthenticator.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/MsalAuthenticator.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/OidcAuthenticator.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/OktaAuthenticator.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/authenticators => Auth/AppAuthenticators}/SamlAuthenticator.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/callbacks => Auth/AppCallbacks}/Auth0Callback/Auth0Callback.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/callbacks => Auth/AppCallbacks}/Auth0Callback/Auth0Callback.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/auth-provider => Auth/AuthProviders}/AuthProvider.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/auth-provider => Auth/AuthProviders}/AuthProvider.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/auth-provider => Auth/AuthProviders}/AuthProvider.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/auth-provider/basic-auth.provider.tsx => Auth/AuthProviders/BasicAuthProvider.tsx} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{authentication/auth-provider/okta-auth-provider.tsx => Auth/AuthProviders/OktaAuthProvider.tsx} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/BotDetails/{AuthMechanism.less => auth-mechanism.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/BotDetails/{BotDetails.style.less => bot-details.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{buttons => }/CopyToClipboardButton/CopyToClipboardButton.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{buttons => }/CopyToClipboardButton/CopyToClipboardButton.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/{AddWidgetModal.less => add-widget-modal.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/{CustomizeMyData.less => customize-my-data.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/{EmptyWidgetPlaceholder.less => empty-widget-placeholder.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/{DataInsightDetail.less => data-insight-detail.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/{DatePickerMenu.style.less => date-picker-menu.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/{EntityInfoDrawer.style.less => entity-info-drawer.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Execution/{Execution.style.less => execution.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/{AppliedFilterText.less => applied-filter-text.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/{SummaryList.style.less => summary-list.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/{EntitySummaryPanel.style.less => entity-summary-panel.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Explore/{exlore.mock.ts => Explore.mock.ts} (99%) rename openmetadata-ui/src/main/resources/ui/src/components/Explore/{explore.interface.ts => ExplorePage.interface.ts} (96%) rename openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/{ExploreV1.style.less => exploreV1.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/{FeedEditor.css => feed-editor.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/{GlobalSearchSuggestions.less => global-search-suggestions.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/{GlossaryDetails.style.less => glossary-details.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/{ImportGlossary.less => import-glossary.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Glossary/{GlossaryV1.style.less => glossaryV1.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/{SourceList.style.less => source-list.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/{AnnouncementModal.less => announcement-modal.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/{ModalWithMarkdownEditor.style.less => modal-with-markdown-editor.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/{SchemaModal.style.less => schema-modal.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/{WhatsNewModal.styles.less => whats-new-modal.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/{MyDataWidget.less => my-data-widget.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/{AnnouncementsWidget.less => announcements-widget.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/{FollowingWidget.less => following-widget.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{nav-bar => NavBar}/NavBar.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{nav-bar => NavBar}/NavBar.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{nav-bar => NavBar}/nav-bar.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{header => PageHeader}/PageHeader.component.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{header => PageHeader}/PageHeader.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{header/PageHeader.style.less => PageHeader/page-header.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{containers => PageLayoutV1}/PageLayoutV1.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{containers => PageLayoutV1}/PageLayoutV1.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/{DataQualityTab.style.less => data-quality-tab.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/{TestSummary.style.less => test-summary.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/{profilerDashboard.less => profiler-dashboard.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/{sample.interface.ts => SampleData.interface.ts} (90%) rename openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/{SampleDataTable.style.less => sample-data-table.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/{MessageCard.less => message-card.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{schema-editor => SchemaEditor}/SchemaEditor.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{schema-editor => SchemaEditor}/SchemaEditor.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/{SearchDropdown.less => search-dropdown.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{searched-data => SearchedData}/SearchedData.interface.ts (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{searched-data => SearchedData}/SearchedData.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{searched-data => SearchedData}/SearchedData.tsx (96%) delete mode 100644 openmetadata-ui/src/main/resources/ui/src/components/SettingsIngestion/SettingsIngestion.component.tsx delete mode 100644 openmetadata-ui/src/main/resources/ui/src/components/SettingsIngestion/SettingsIngestion.interface.ts rename openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/{tableProfiler.less => table-profiler.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/{interface/teamsAndUsers.interface.ts => components/Team/TeamDetails/TeamDetailsV1.interface.ts} (79%) rename openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/{testSuite.interface.tsx => TestSuiteStepper.interface.tsx} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/{TotalDataAssetsWidget.less => total-data-assets-widget.less} (100%) delete mode 100644 openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.test.tsx delete mode 100644 openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx rename openmetadata-ui/src/main/resources/ui/src/components/Users/{Users.style.less => users.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{web-scoket/web-scoket.provider.tsx => WebSocketProvider/WebSocketProvider.tsx} (96%) rename openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/{FeedsWidget.less => feeds-widget.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/{RecentlyViewed.less => recently-viewed.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{avatar => AvatarComponent}/Avatar.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{avatar => AvatarComponent}/Avatar.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/{styles/x-custom/CronEditor.css => components/common/CronEditor/cron-editor.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{description => EntityDescription}/Description.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{description => EntityDescription}/Description.test.tsx (99%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{description => EntityDescription}/Description.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{description => EntityDescription}/DescriptionV1.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/AnnouncementCard/AnnouncementCard.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/AnnouncementCard/AnnouncementCard.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/AnnouncementCard/AnnouncementCard.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/AnnouncementDrawer/AnnouncementDrawer.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/AnnouncementDrawer/AnnouncementDrawer.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/ManageButton/ManageButton.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/ManageButton/ManageButton.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{entityPageInfo => EntityPageInfos}/ManageButton/ManageButton.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/{EntitySummaryDetails.style.less => entity-summary-details.style.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/AssignErrorPlaceHolder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/CreateErrorPlaceHolder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/CustomNoDataPlaceHolder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/ErrorPlaceHolder.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/ErrorPlaceHolder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/ErrorPlaceHolderES.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/ErrorPlaceHolderES.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/ErrorPlaceHolderIngestion.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/ErrorPlaceHolderIngestion.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/FilterErrorPlaceHolder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/FilterTablePlaceHolder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/NoDataPlaceholder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/PermissionErrorPlaceholder.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{error-with-placeholder => ErrorWithPlaceholder}/placeholder.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/{InheritedRolesCard.style.less => inherited-roles-card.style.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{next-previous => NextPrevious}/NextPrevious.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{next-previous => NextPrevious}/NextPrevious.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{next-previous => NextPrevious}/NextPrevious.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/{ResizablePanels.less => resizable-panels.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/CustomHtmlRederer/CustomHtmlRederer.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/CustomHtmlRederer/CustomHtmlRederer.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/EditorToolBar.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/RichTextEditor.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/RichTextEditor.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/RichTextEditor.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/RichTextEditorPreviewer.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor => RichTextEditor}/RichTextEditorPreviewer.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor/RichTextEditorPreviewer.less => RichTextEditor/rich-text-editor-previewer.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{rich-text-editor/RichTextEditor.css => RichTextEditor/rich-text-editor.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/{RolesElement.styles.less => roles-element.styles.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{searchbar/Searchbar.tsx => SearchBarComponent/SearchBar.component.tsx} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{searchbar => SearchBarComponent}/Searchbar.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/{ServiceDocPanel.less => service-doc-panel.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{success-screen => SuccessScreen}/SuccessScreen.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{success-screen => SuccessScreen}/SuccessScreen.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{table-data-card-v2 => TableDataCardV2}/TableDataCardV2.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{table-data-card-v2 => TableDataCardV2}/TableDataCardV2.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{table-data-card-v2 => TableDataCardV2}/TableDataCardV2.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/{ConnectionStepCard.less => connection-step-card.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/{testIndicator.less => test-indicator.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{title-breadcrumb/title-breadcrumb.component.test.tsx => TitleBreadcrumb/TitleBreadcrumb.component.test.tsx} (97%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{title-breadcrumb/title-breadcrumb.component.tsx => TitleBreadcrumb/TitleBreadcrumb.component.tsx} (98%) rename openmetadata-ui/src/main/resources/ui/src/components/common/{title-breadcrumb/title-breadcrumb.interface.ts => TitleBreadcrumb/TitleBreadcrumb.interface.ts} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/CustomPageSettings/{CustomPageSettings.less => custom-page-settings.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/{CustomPropertiesPageV1.less => custom-properties-pageV1.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/{DataInsight.less => data-insight.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{explore => ExplorePage}/ExplorePage.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{explore => ExplorePage}/ExplorePageV1.component.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/pages/{forgot-password => ForgotPassword}/forgot-password.component.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/pages/{forgot-password => ForgotPassword}/forgot-password.styles.less (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/{KPIPage.less => kpi-page.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{login => LoginPage}/LoginCarousel.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{login => LoginPage}/LoginCarousel.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{login => LoginPage}/index.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/pages/{login => LoginPage}/index.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/pages/{login => LoginPage}/login.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/{LogsViewer.style.less => logs-viewer.style.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{page-not-found => PageNotFound}/PageNotFound.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{page-not-found => PageNotFound}/PageNotFound.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{page-not-found => PageNotFound}/page-not-found.less (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/{policies.mock.ts => PoliciesData.mock.ts} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/{PoliciesDetail.less => policies-detail.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/{PoliciesList.less => policies-list.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{reset-password/reset-password.component.tsx => ResetPassword/ResetPassword.component.tsx} (97%) rename openmetadata-ui/src/main/resources/ui/src/pages/{reset-password => ResetPassword}/reset-password.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/{AddAttributeModal.less => add-attribute-modal.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/{RolesDetail.less => roles-detail.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/{RolesList.less => roles-list.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{services => ServicesPage}/ServicesPage.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/pages/SignUp/mocks/{signup.mock.ts => SignupData.mock.ts} (100%) delete mode 100644 openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/storedProcedure.interface.ts rename openmetadata-ui/src/main/resources/ui/src/pages/{swagger => SwaggerPage}/index.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{swagger => SwaggerPage}/swagger.less (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/{TaskPage.style.less => task-page.style.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/AddTeamForm.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/AddTeamForm.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/AddTeamForm.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/ImportTeamsPage/ImportTeamsPage.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/ImportTeamsPage/ImportTeamsPage.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/ImportTeamsPage/ImportTeamsPage.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/pages/{teams => TeamsPage}/TeamsPage.tsx (79%) rename openmetadata-ui/src/main/resources/ui/src/pages/TestCaseDetailsPage/{TestCaseDetailsPage.style.less => test-case-details-page.style.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/{TestSuiteDetailsPage.styles.less => test-suite-details-page.styles.less} (100%) rename openmetadata-ui/src/main/resources/ui/src/pages/{tour-page => TourPage}/TourPage.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/{mockUserData.ts => MockUserPageData.ts} (100%) rename openmetadata-ui/src/main/resources/ui/src/{components/UserList/usersList.less => pages/UserListPage/user-list-page-v1.less} (100%) delete mode 100644 openmetadata-ui/src/main/resources/ui/src/styles/myDataDetailsTemp.css delete mode 100644 openmetadata-ui/src/main/resources/ui/src/styles/x-custom/stepper.css rename openmetadata-ui/src/main/resources/ui/src/{components/Explore => utils}/Explore.utils.ts (93%) rename openmetadata-ui/src/main/resources/ui/src/{pages/reset-password/reset-password.utils.ts => utils/ResetPassword.utils.ts} (100%) rename openmetadata-ui/src/main/resources/ui/src/{components/schema-editor => utils}/SchemaEditor.utils.ts (89%) rename openmetadata-ui/src/main/resources/ui/src/{components/Skeleton/SkeletonUtils => utils}/Skeleton.utils.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/{components/Users => utils}/Users.util.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/{components/Modals/WhatsNewModal => utils}/WhatsNewModal.util.ts (100%) diff --git a/openmetadata-ui/src/main/resources/ui/src/App.test.tsx b/openmetadata-ui/src/main/resources/ui/src/App.test.tsx index fa7e40637086..a4fa6260dd3a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/App.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/App.test.tsx @@ -14,14 +14,14 @@ import { render } from '@testing-library/react'; import React from 'react'; import App from './App'; -import { AuthContext } from './components/authentication/auth-provider/AuthProvider'; -import { IAuthContext } from './components/authentication/auth-provider/AuthProvider.interface'; +import { AuthContext } from './components/Auth/AuthProviders/AuthProvider'; +import { IAuthContext } from './components/Auth/AuthProviders/AuthProvider.interface'; -jest.mock('./components/router/AppRouter', () => { +jest.mock('./components/AppRouter/AppRouter', () => { return jest.fn().mockReturnValue(

AppRouter

); }); -jest.mock('./components/authentication/auth-provider/AuthProvider', () => { +jest.mock('./components/Auth/AuthProviders/AuthProvider', () => { return { AuthProvider: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/App.tsx b/openmetadata-ui/src/main/resources/ui/src/App.tsx index c897ab6e0fb6..ea4771c0dc26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/App.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/App.tsx @@ -18,16 +18,16 @@ import { Router } from 'react-router-dom'; import { ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.min.css'; import ApplicationConfigProvider from './components/ApplicationConfigProvider/ApplicationConfigProvider'; -import { AuthProvider } from './components/authentication/auth-provider/AuthProvider'; +import AppRouter from './components/AppRouter/AppRouter'; +import { AuthProvider } from './components/Auth/AuthProviders/AuthProvider'; import DomainProvider from './components/Domain/DomainProvider/DomainProvider'; import { EntityExportModalProvider } from './components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; import ErrorBoundary from './components/ErrorBoundary/ErrorBoundary'; import GlobalSearchProvider from './components/GlobalSearchProvider/GlobalSearchProvider'; import PermissionProvider from './components/PermissionProvider/PermissionProvider'; -import AppRouter from './components/router/AppRouter'; import TourProvider from './components/TourProvider/TourProvider'; -import WebSocketProvider from './components/web-scoket/web-scoket.provider'; import WebAnalyticsProvider from './components/WebAnalytics/WebAnalyticsProvider'; +import WebSocketProvider from './components/WebSocketProvider/WebSocketProvider'; import { TOAST_OPTIONS } from './constants/Toasts.constants'; import { history } from './utils/HistoryUtils'; import i18n from './utils/i18next/LocalUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/AppState.ts b/openmetadata-ui/src/main/resources/ui/src/AppState.ts index 77d5b537dfa5..398f0a806112 100644 --- a/openmetadata-ui/src/main/resources/ui/src/AppState.ts +++ b/openmetadata-ui/src/main/resources/ui/src/AppState.ts @@ -14,7 +14,7 @@ import { isEmpty, isNil, isUndefined } from 'lodash'; import { action, makeAutoObservable } from 'mobx'; import { ClientAuth, NewUser } from 'Models'; -import { EntityUnion } from './components/Explore/explore.interface'; +import { EntityUnion } from './components/Explore/ExplorePage.interface'; import { ResourcePermission } from './generated/entity/policies/accessControl/resourcePermission'; import { EntityReference as UserTeams, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx index 0b5e4f138cb3..c964535d4232 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx @@ -25,7 +25,7 @@ import { getEntityFQN, getEntityType, } from '../../../utils/FeedUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard'; import ProfilePicture from '../../common/ProfilePicture/ProfilePicture'; import EditAnnouncementModal from '../../Modals/AnnouncementModal/EditAnnouncementModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx index 1f10577c9388..ac82d90461d6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx @@ -32,7 +32,7 @@ jest.mock('../../../../utils/FeedUtils', () => ({ }, })); -jest.mock('../../../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichText Preview

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx index 69bd598d0d0f..dfac26f6f30d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx @@ -21,7 +21,7 @@ import { getFrontEndFormat, MarkdownToHTMLConverter, } from '../../../../utils/FeedUtils'; -import RichTextEditorPreviewer from '../../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; import Reactions from '../../../Reactions/Reactions'; import ActivityFeedEditor from '../../ActivityFeedEditor/ActivityFeedEditor'; import { FeedBodyProp } from '../ActivityFeedCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx index de6c6e6625ce..127dafaf4c0d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx @@ -16,7 +16,7 @@ import { isUndefined } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import ActivityFeedEditor from '../../../../components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor'; -import RichTextEditorPreviewer from '../../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils'; import { getFrontEndFormat, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx index 91cc023886ca..1f68d30a4db1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx @@ -43,7 +43,7 @@ const mockUserData: User = { isAdmin: true, }; -jest.mock('../../authentication/auth-provider/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx index 619624cd89c1..7c015d9276ff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx @@ -23,7 +23,7 @@ import { REACTION_LIST } from '../../../constants/reactions.constant'; import { ReactionOperation } from '../../../enums/reactions.enum'; import { Post } from '../../../generated/entity/feed/thread'; import { ReactionType } from '../../../generated/type/reaction'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import Reaction from '../../Reactions/Reaction'; import { ConfirmState } from './ActivityFeedCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx index a014a4bb5104..945d47cfe5f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx @@ -16,7 +16,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as ActivityFeedIcon } from '../../../assets/svg/activity-feed.svg'; import { ReactComponent as TaskIcon } from '../../../assets/svg/ic-task.svg'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Loader from '../../../components/Loader/Loader'; import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum'; import { Thread } from '../../../generated/entity/feed/thread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx index 553295e81317..687b1bdab9a4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx @@ -45,7 +45,7 @@ import { import { getEntityFeedLink } from '../../../utils/EntityUtils'; import { getUpdatedThread } from '../../../utils/FeedUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import ActivityFeedDrawer from '../ActivityFeedDrawer/ActivityFeedDrawer'; import { ActivityFeedProviderContextType } from './ActivityFeedProviderContext.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx index e98a47b5d686..acf78d510240 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx @@ -47,10 +47,10 @@ import { ENTITY_LINK_SEPARATOR, getEntityFeedLink, } from '../../../utils/EntityUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import Loader from '../../Loader/Loader'; import { TaskTab } from '../../Task/TaskTab/TaskTab.component'; -import '../../Widgets/FeedsWidget/FeedsWidget.less'; +import '../../Widgets/FeedsWidget/feeds-widget.less'; import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor'; import ActivityFeedListV1 from '../ActivityFeedList/ActivityFeedListV1.component'; import FeedPanelBodyV1 from '../ActivityFeedPanel/FeedPanelBodyV1'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx index 5857c51c9b44..208b75637fff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx @@ -31,8 +31,8 @@ import { Paging } from '../../../generated/type/paging'; import { useElementInView } from '../../../hooks/useElementInView'; import { getAllFeeds } from '../../../rest/feedsAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Loader from '../../Loader/Loader'; import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal'; import { ConfirmState } from '../ActivityFeedCard/ActivityFeedCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx index b3f7b15d1059..62093bcf0666 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx @@ -29,7 +29,7 @@ import { Thread, ThreadType, } from '../../../generated/entity/feed/thread'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider'; import './activity-feed-actions.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx index c0e17dbd2e3f..3aeefb6cccab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx @@ -15,7 +15,7 @@ import { Typography } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as AnnouncementIcon } from '../../../assets/svg/announcements-v1.svg'; -import './Badge.less'; +import './task-badge.less'; const AnnouncementBadge = () => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx index 9bbec0063dd7..ca41d8036c6f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx @@ -19,7 +19,7 @@ import { useTranslation } from 'react-i18next'; import { ReactComponent as IconTaskClose } from '../../../assets/svg/complete.svg'; import { ReactComponent as IconTaskOpen } from '../../../assets/svg/in-progress.svg'; import { ThreadTaskStatus } from '../../../generated/entity/feed/thread'; -import './Badge.less'; +import './task-badge.less'; const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx index e35ee63a90f0..799c3eec1a2a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx @@ -46,10 +46,10 @@ import { createExecutableTestSuite, createTestCase } from '../../rest/testAPI'; import { getEntityBreadcrumbs, getEntityName } from '../../utils/EntityUtils'; import { getEncodedFqn } from '../../utils/StringsUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import SuccessScreen from '../common/success-screen/SuccessScreen'; -import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; +import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; import IngestionStepper from '../IngestionStepper/IngestionStepper.component'; import { AddDataQualityTestProps } from './AddDataQualityTest.interface'; import RightPanel from './components/RightPanel'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx index ee87a410296d..fe7dccbb035f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx @@ -26,7 +26,7 @@ const mockProps: EditTestCaseModalProps = { onUpdate: jest.fn(), }; -jest.mock('../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(() =>
RichTextEditor.component
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx index a5f1240e7a7a..72f928357453 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx @@ -35,8 +35,8 @@ import { getTestDefinitionById, updateTestCaseById } from '../../rest/testAPI'; import { getNameFromFQN } from '../../utils/CommonUtils'; import { getEntityFqnFromEntityLink } from '../../utils/TableUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import RichTextEditor from '../common/rich-text-editor/RichTextEditor'; -import { EditorContentRef } from '../common/rich-text-editor/RichTextEditor.interface'; +import RichTextEditor from '../common/RichTextEditor/RichTextEditor'; +import { EditorContentRef } from '../common/RichTextEditor/RichTextEditor.interface'; import Loader from '../Loader/Loader'; import { EditTestCaseModalProps } from './AddDataQualityTest.interface'; import ParameterForm from './components/ParameterForm'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx index 6cf534eefd59..c9923941f84d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx @@ -42,7 +42,7 @@ import { } from '../../utils/CommonUtils'; import { getIngestionName } from '../../utils/ServiceUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import SuccessScreen from '../common/success-screen/SuccessScreen'; +import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal'; import { TestSuiteIngestionProps } from './AddDataQualityTest.interface'; import TestSuiteScheduler from './components/TestSuiteScheduler'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx index d60dd4606a01..752b07068183 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx @@ -22,7 +22,7 @@ import { } from '../../../mocks/TestSuite.mock'; import ParameterForm from './ParameterForm'; -jest.mock('../../../components/schema-editor/SchemaEditor', () => { +jest.mock('../../../components/SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(
SchemaEditor
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx index 47e9474205e1..59c882cca62c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx @@ -17,7 +17,6 @@ import 'codemirror/addon/fold/foldgutter.css'; import { isUndefined } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import SchemaEditor from '../../../components/schema-editor/SchemaEditor'; import { SUPPORTED_PARTITION_TYPE_FOR_DATE_TIME } from '../../../constants/profiler.constant'; import { CSMode } from '../../../enums/codemirror.enum'; import { @@ -25,7 +24,8 @@ import { TestDataType, } from '../../../generated/tests/testDefinition'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; -import '../../TableProfiler/tableProfiler.less'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; +import '../../TableProfiler/table-profiler.less'; import { ParameterFormProps } from '../AddDataQualityTest.interface'; const ParameterForm: React.FC = ({ definition, table }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx index 56e848928738..a28ff62ed90f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx @@ -39,8 +39,8 @@ import { getEntityName } from '../../../utils/EntityUtils'; import { getDecodedFqn } from '../../../utils/StringsUtils'; import { generateEntityLink } from '../../../utils/TableUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import RichTextEditor from '../../common/rich-text-editor/RichTextEditor'; -import { EditorContentRef } from '../../common/rich-text-editor/RichTextEditor.interface'; +import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; +import { EditorContentRef } from '../../common/RichTextEditor/RichTextEditor.interface'; import { TestCaseFormProps } from '../AddDataQualityTest.interface'; import ParameterForm from './ParameterForm'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx index 438a3fe02c3c..1196a33e3830 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx @@ -29,8 +29,8 @@ import { IngestionPipeline } from '../../generated/entity/services/ingestionPipe import { IngestionWorkflowData } from '../../interface/service.interface'; import { getIngestionFrequency } from '../../utils/CommonUtils'; import { getIngestionName } from '../../utils/ServiceUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import SuccessScreen from '../common/success-screen/SuccessScreen'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; import IngestionStepper from '../IngestionStepper/IngestionStepper.component'; import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx index 29f793dd6dc2..1cbb2fc61cee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx @@ -41,10 +41,10 @@ import { import { getEncodedFqn } from '../../utils/StringsUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import AddIngestion from '../AddIngestion/AddIngestion.component'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import ServiceDocPanel from '../common/ServiceDocPanel/ServiceDocPanel'; -import SuccessScreen from '../common/success-screen/SuccessScreen'; -import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component'; +import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; +import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; import IngestionStepper from '../IngestionStepper/IngestionStepper.component'; import ConnectionConfigForm from '../ServiceConfig/ConnectionConfigForm'; import { AddServiceProps, ServiceConfig } from './AddService.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts index 8deae89a720e..508568a659e5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts @@ -14,7 +14,7 @@ import { ServiceCategory } from '../../enums/service.enum'; import { CreateIngestionPipeline } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; import { DataObj } from '../../interface/service.interface'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface AddServiceProps { serviceCategory: ServiceCategory; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx index 768bdd0ccdd8..b98bc50305d2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx @@ -24,7 +24,7 @@ jest.mock('../AddIngestion/AddIngestion.component', () => () => ( <>AddIngestion )); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => () => ( +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => () => ( <>TitleBreadcrumb.component )); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx index 905d46252469..5520db3b3bb0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx @@ -30,7 +30,7 @@ import { PipelineServiceType } from '../../../generated/entity/services/pipeline import { errorMsg, getServiceLogo } from '../../../utils/CommonUtils'; import ServiceUtilClassBase from '../../../utils/ServiceUtilClassBase'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; -import Searchbar from '../../common/searchbar/Searchbar'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import './select-service-type.less'; import { SelectServiceTypeProps } from './Steps.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx index af2de423449a..ca7b94597a89 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx @@ -15,7 +15,6 @@ import VirtualList from 'rc-virtual-list'; import React, { UIEventHandler, useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import Searchbar from '../../components/common/searchbar/Searchbar'; import Loader from '../../components/Loader/Loader'; import { getTableTabPath, PAGE_SIZE } from '../../constants/constants'; import { SearchIndex } from '../../enums/search.enum'; @@ -29,6 +28,7 @@ import { getNameFromFQN } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; import { replacePlus } from '../../utils/StringsUtils'; import { getEntityFqnFromEntityLink } from '../../utils/TableUtils'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; import { AddTestCaseModalProps } from './AddTestCaseList.interface'; // Todo: need to help from backend guys for ES query diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx index 2f898574c6bb..07b71b14d1a2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx @@ -20,10 +20,6 @@ import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg'; import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; -import TitleBreadcrumb from '../../../components/common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../../../components/common/title-breadcrumb/title-breadcrumb.interface'; -import PageHeader from '../../../components/header/PageHeader.component'; -import { HeaderProps } from '../../../components/header/PageHeader.interface'; import { Effect, EventSubscription, @@ -37,6 +33,10 @@ import { getFunctionDisplayName, } from '../../../utils/Alerts/AlertsUtil'; import { getHostNameFromURL } from '../../../utils/CommonUtils'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import PageHeader from '../../PageHeader/PageHeader.component'; +import { HeaderProps } from '../../PageHeader/PageHeader.interface'; interface AlertDetailsComponentProps { alerts: EventSubscription; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.test.tsx index f9b136e0c276..68b99be9519c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.test.tsx @@ -27,7 +27,7 @@ jest.mock('../../hooks/authHooks', () => ({ }, })); -jest.mock('../authentication/auth-provider/AuthProvider', () => { +jest.mock('../Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ isAuthDisabled: false, @@ -39,7 +39,7 @@ jest.mock('../authentication/auth-provider/AuthProvider', () => { }; }); -jest.mock('../nav-bar/NavBar', () => { +jest.mock('../NavBar/NavBar', () => { return jest.fn().mockReturnValue(

NavBar

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx index c5daefc521c3..f5d0782a3202 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx @@ -49,8 +49,8 @@ import { import { addToRecentSearched } from '../../utils/CommonUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import NavBar from '../nav-bar/NavBar'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import NavBar from '../NavBar/NavBar'; import './app-bar.style.less'; const Appbar: React.FC = (): JSX.Element => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx index 0007f1f7b261..74d2e0352d7f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx @@ -32,7 +32,7 @@ jest.mock('../../AppState', () => ({ }, })); -jest.mock('../authentication/auth-provider/AuthProvider', () => { +jest.mock('../Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ isAuthDisabled: false, @@ -68,7 +68,7 @@ jest.mock('../../pages/SignUp/SignUpPage', () => jest.fn().mockReturnValue(

SignUpPage

) ); -jest.mock('../../components/router/AuthenticatedAppRouter', () => +jest.mock('../../components/AppRouter/AuthenticatedAppRouter', () => jest.fn().mockReturnValue(

AuthenticatedAppRouter

) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx index 9c736e505c9d..70118538aeeb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx @@ -18,8 +18,8 @@ import React from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; import AppState from '../../AppState'; import Appbar from '../../components/AppBar/Appbar'; +import AuthenticatedAppRouter from '../../components/AppRouter/AuthenticatedAppRouter'; import LeftSidebar from '../../components/MyData/LeftSidebar/LeftSidebar.component'; -import AuthenticatedAppRouter from '../../components/router/AuthenticatedAppRouter'; import { ROUTES } from '../../constants/constants'; import SignUpPage from '../../pages/SignUp/SignUpPage'; import './app-container.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/AdminProtectedRoute.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/router/AdminProtectedRoute.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx index 74229bdce591..92ff5f187298 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/AdminProtectedRoute.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx @@ -13,7 +13,7 @@ import React from 'react'; import { Redirect, Route, RouteProps } from 'react-router-dom'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { ROUTES } from '../../constants/constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { useAuth } from '../../hooks/authHooks'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/AppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/router/AppRouter.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx index 965df9269d92..49bec08b5f74 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/AppRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx @@ -21,27 +21,25 @@ import { AuthProvider } from '../../generated/settings/settings'; import SamlCallback from '../../pages/SamlCallback'; import AccountActivationConfirmation from '../../pages/SignUp/account-activation-confirmation.component'; import { isProtectedRoute } from '../../utils/AuthProvider.util'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import Loader from '../Loader/Loader'; import withSuspenseFallback from './withSuspenseFallback'; const SigninPage = withSuspenseFallback( - React.lazy(() => import('../../pages/login')) + React.lazy(() => import('../../pages/LoginPage')) ); const PageNotFound = withSuspenseFallback( - React.lazy(() => import('../../pages/page-not-found/PageNotFound')) + React.lazy(() => import('../../pages/PageNotFound/PageNotFound')) ); const ForgotPassword = withSuspenseFallback( React.lazy( - () => import('../../pages/forgot-password/forgot-password.component') + () => import('../../pages/ForgotPassword/forgot-password.component') ) ); const ResetPassword = withSuspenseFallback( - React.lazy( - () => import('../../pages/reset-password/reset-password.component') - ) + React.lazy(() => import('../../pages/ResetPassword/ResetPassword.component')) ); const BasicSignupPage = withSuspenseFallback( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/AuthenticatedAppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/router/AuthenticatedAppRouter.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx index 963299473c09..d1c84b8a366c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/AuthenticatedAppRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx @@ -77,7 +77,7 @@ const ServicePage = withSuspenseFallback( ); const SwaggerPage = withSuspenseFallback( - React.lazy(() => import('../../pages/swagger')) + React.lazy(() => import('../../pages/SwaggerPage')) ); const TagsPage = withSuspenseFallback( React.lazy(() => import('../../pages/TagsPage/TagsPage')) @@ -94,7 +94,7 @@ const TopicDetailsPage = withSuspenseFallback( ) ); const TourPageComponent = withSuspenseFallback( - React.lazy(() => import('../../pages/tour-page/TourPage.component')) + React.lazy(() => import('../../pages/TourPage/TourPage.component')) ); const UserPage = withSuspenseFallback( React.lazy(() => import('../../pages/UserPage/UserPage.component')) @@ -211,7 +211,7 @@ const DatabaseSchemaVersionPage = withSuspenseFallback( ) ); const ExplorePageV1 = withSuspenseFallback( - React.lazy(() => import('../../pages/explore/ExplorePageV1.component')) + React.lazy(() => import('../../pages/ExplorePage/ExplorePageV1.component')) ); const GlossaryPage = withSuspenseFallback( @@ -333,7 +333,7 @@ const AddQueryPage = withSuspenseFallback( ); const PageNotFound = withSuspenseFallback( - React.lazy(() => import('../../pages/page-not-found/PageNotFound')) + React.lazy(() => import('../../pages/PageNotFound/PageNotFound')) ); const EditLoginConfiguration = withSuspenseFallback( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/GlobalSettingRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/router/GlobalSettingRouter.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx index 1cd21e1923f3..1d4cb71faa84 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/GlobalSettingRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx @@ -37,7 +37,9 @@ const AddAlertPage = withSuspenseFallback( ); const ImportTeamsPage = withSuspenseFallback( - React.lazy(() => import('../../pages/teams/ImportTeamsPage/ImportTeamsPage')) + React.lazy( + () => import('../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage') + ) ); const AddDataInsightReportAlert = withSuspenseFallback( React.lazy( @@ -69,11 +71,11 @@ const AlertsPage = withSuspenseFallback( ); const TeamsPage = withSuspenseFallback( - React.lazy(() => import('../../pages/teams/TeamsPage')) + React.lazy(() => import('../../pages/TeamsPage/TeamsPage')) ); const ServicesPage = withSuspenseFallback( - React.lazy(() => import('../../pages/services/ServicesPage')) + React.lazy(() => import('../../pages/ServicesPage/ServicesPage')) ); const BotsPageV1 = withSuspenseFallback( React.lazy(() => import('../../pages/BotsPageV1/BotsPageV1.component')) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/withActivityFeed.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withActivityFeed.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/router/withActivityFeed.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withActivityFeed.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/withAdvanceSearch.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/router/withAdvanceSearch.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/withSuspenseFallback.js b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/router/withSuspenseFallback.js rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js diff --git a/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx index 48a5175572c0..982f4cecddc9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx @@ -16,10 +16,10 @@ import { Button } from 'antd'; import { observer } from 'mobx-react'; import React, { useState } from 'react'; import { useHistory } from 'react-router-dom'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; import { PRIMERY_COLOR } from '../../constants/constants'; import { CurrentTourPageType } from '../../enums/tour.enum'; import TourEndModal from '../Modals/TourEndModal/TourEndModal'; +import { useTourProvider } from '../TourProvider/TourProvider'; import './tour.style.less'; const Tour = ({ steps }: { steps: TourSteps[] }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/tour/tour.style.less b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/tour.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/tour/tour.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/AppTour/tour.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx index 0b6a21f2afbc..9aab53df867e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx @@ -40,8 +40,8 @@ import { ReactComponent as IconExternalLink } from '../../../assets/svg/external import { ReactComponent as DeleteIcon } from '../../../assets/svg/ic-delete.svg'; import { ReactComponent as IconRestore } from '../../../assets/svg/ic-restore.svg'; import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; -import PageLayoutV1 from '../../../components/containers/PageLayoutV1'; import Loader from '../../../components/Loader/Loader'; +import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import TabsLabel from '../../../components/TabsLabel/TabsLabel.component'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx index 8a0f14ce351f..f1edec0ceef4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx @@ -29,7 +29,7 @@ import { useTranslation } from 'react-i18next'; import { Transi18next } from '../../../utils/CommonUtils'; import { getRelativeTime } from '../../../utils/date-time/DateTimeUtils'; import { getEntityName } from '../../../utils/EntityUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import BrandImage from '../../common/BrandImage/BrandImage'; import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard'; import ProfilePicture from '../../common/ProfilePicture/ProfilePicture'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx index fa5bde1fb992..d7268d0e14d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx @@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next'; import { LazyLog } from 'react-lazylog'; import { ReactComponent as IconSuccessBadge } from '../../../assets/svg/success-badge.svg'; import { formatDateTimeWithTimezone } from '../../../utils/date-time/DateTimeUtils'; -import CopyToClipboardButton from '../../buttons/CopyToClipboardButton/CopyToClipboardButton'; +import CopyToClipboardButton from '../../CopyToClipboardButton/CopyToClipboardButton'; import { AppLogsViewerProps, JobStats } from './AppLogsViewer.interface'; const AppLogsViewer = ({ data }: AppLogsViewerProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx index d12f0f4c0f86..00a1a122daee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx @@ -45,9 +45,9 @@ import { } from '../../../utils/date-time/DateTimeUtils'; import { getLogsViewerPath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; import StatusBadge from '../../common/StatusBadge/StatusBadge.component'; import { StatusType } from '../../common/StatusBadge/StatusBadge.interface'; import Table from '../../common/Table/Table'; @@ -77,6 +77,7 @@ const AppRunsHistory = forwardRef( handlePagingChange, handlePageChange, handlePageSizeChange, + showPagination: paginationVisible, } = usePaging(); const history = useHistory(); @@ -255,7 +256,7 @@ const AppRunsHistory = forwardRef( }: PagingHandlerParams) => { handlePageChange(currentPage); fetchAppHistory({ - offset: currentPage * pageSize, + offset: (currentPage - 1) * pageSize, } as Paging); }; @@ -267,10 +268,10 @@ const AppRunsHistory = forwardRef( useEffect(() => { fetchAppHistory(); - }, [fqn]); + }, [fqn, pageSize]); return ( - + - - {paging.total > pageSize && showPagination && ( -
- -
+ + {showPagination && paginationVisible && ( + )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts index 7898a8bb9c51..f7382e3f0b67 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts @@ -24,6 +24,6 @@ export interface AppRunsHistoryRef { export interface AppRunsHistoryProps { maxRecords?: number; - showPagination?: boolean; appData?: App; + showPagination?: boolean; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx index 366badc1542c..4fc2bf258896 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx @@ -16,7 +16,7 @@ import classNames from 'classnames'; import { kebabCase } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import AppLogo from '../AppLogo/AppLogo.component'; import { ApplicationCardProps } from './ApplicationCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx index 81e90f887d86..172ad459a0b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx @@ -18,9 +18,9 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { ReactComponent as CheckMarkIcon } from '../../../assets/svg/ic-cloud-checkmark.svg'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; -import PageLayoutV1 from '../../../components/containers/PageLayoutV1'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import Loader from '../../../components/Loader/Loader'; +import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { ROUTES } from '../../../constants/constants'; import { AppMarketPlaceDefinition } from '../../../generated/entity/applications/marketplace/appMarketPlaceDefinition'; import { Include } from '../../../generated/type/include'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx index 49646c1907bc..be0d2026ccb2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx @@ -41,12 +41,12 @@ import { } from '../../../utils/Assets/AssetsUtils'; import { getEntityReferenceFromEntity } from '../../../utils/EntityUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import Searchbar from '../../common/searchbar/Searchbar'; -import TableDataCardV2 from '../../common/table-data-card-v2/TableDataCardV2'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; +import TableDataCardV2 from '../../common/TableDataCardV2/TableDataCardV2'; import { AssetsOfEntity } from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import Loader from '../../Loader/Loader'; -import { SearchedDataProps } from '../../searched-data/SearchedData.interface'; +import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; import './asset-selection-model.style.less'; import { AssetSelectionModalProps } from './AssetSelectionModal.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/Auth0Authenticator.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/Auth0Authenticator.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.test.tsx index 917fee63ffb0..21fdbcac5a6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/Auth0Authenticator.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import Auth0Authenticator from './Auth0Authenticator'; -jest.mock('../auth-provider/AuthProvider', () => { +jest.mock('../AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ authConfig: {}, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/Auth0Authenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/Auth0Authenticator.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.tsx index 9e1ab3b0295c..a953a0a4e1f1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/Auth0Authenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/Auth0Authenticator.tsx @@ -21,8 +21,8 @@ import React, { import { useTranslation } from 'react-i18next'; import { AuthProvider } from '../../../generated/settings/settings'; import localState from '../../../utils/LocalStorageUtils'; -import { useAuthContext } from '../auth-provider/AuthProvider'; -import { AuthenticatorRef } from '../auth-provider/AuthProvider.interface'; +import { useAuthContext } from '../AuthProviders/AuthProvider'; +import { AuthenticatorRef } from '../AuthProviders/AuthProvider.interface'; interface Props { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/basic-auth.authenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/BasicAuthAuthenticator.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/basic-auth.authenticator.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/BasicAuthAuthenticator.tsx index 8f7c95fa9620..bab42adf34e6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/basic-auth.authenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/BasicAuthAuthenticator.tsx @@ -24,8 +24,8 @@ import { getAccessTokenOnExpiry, } from '../../../rest/auth-API'; import localState from '../../../utils/LocalStorageUtils'; -import { useAuthContext } from '../auth-provider/AuthProvider'; -import { useBasicAuth } from '../auth-provider/basic-auth.provider'; +import { useAuthContext } from '../AuthProviders/AuthProvider'; +import { useBasicAuth } from '../AuthProviders/BasicAuthProvider'; interface BasicAuthenticatorInterface { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/MsalAuthenticator.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/MsalAuthenticator.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.test.tsx index c9597a38cc94..a551e866c238 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/MsalAuthenticator.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import MsalAuthenticator from './MsalAuthenticator'; -jest.mock('../auth-provider/AuthProvider', () => { +jest.mock('../AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ authConfig: {}, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/MsalAuthenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/MsalAuthenticator.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.tsx index 27c629d86c2c..f3802e30478b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/MsalAuthenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/MsalAuthenticator.tsx @@ -31,7 +31,7 @@ import localState from '../../../utils/LocalStorageUtils'; import { AuthenticatorRef, OidcUser, -} from '../auth-provider/AuthProvider.interface'; +} from '../AuthProviders/AuthProvider.interface'; interface Props { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/OidcAuthenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/OidcAuthenticator.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx index b05a87ef3261..8644880f21d1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/OidcAuthenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx @@ -25,16 +25,16 @@ import { Callback, makeAuthenticator, makeUserManager } from 'react-oidc'; import { Redirect, Route, Switch, useHistory } from 'react-router-dom'; import AppState from '../../../AppState'; import { ROUTES } from '../../../constants/constants'; -import SigninPage from '../../../pages/login/index'; -import PageNotFound from '../../../pages/page-not-found/PageNotFound'; +import SigninPage from '../../../pages/LoginPage/index'; +import PageNotFound from '../../../pages/PageNotFound/PageNotFound'; import localState from '../../../utils/LocalStorageUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import Loader from '../../Loader/Loader'; -import { useAuthContext } from '../auth-provider/AuthProvider'; +import { useAuthContext } from '../AuthProviders/AuthProvider'; import { AuthenticatorRef, OidcUser, -} from '../auth-provider/AuthProvider.interface'; +} from '../AuthProviders/AuthProvider.interface'; interface Props { childComponentType: ComponentType; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/OktaAuthenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OktaAuthenticator.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/OktaAuthenticator.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OktaAuthenticator.tsx index eb7b71a07046..877fabd1cfc3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/OktaAuthenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OktaAuthenticator.tsx @@ -21,8 +21,8 @@ import React, { import { useHistory } from 'react-router-dom'; import { ROUTES } from '../../../constants/constants'; import localState from '../../../utils/LocalStorageUtils'; -import { useAuthContext } from '../auth-provider/AuthProvider'; -import { AuthenticatorRef } from '../auth-provider/AuthProvider.interface'; +import { useAuthContext } from '../AuthProviders/AuthProvider'; +import { AuthenticatorRef } from '../AuthProviders/AuthProvider.interface'; interface Props { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/SamlAuthenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/SamlAuthenticator.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/SamlAuthenticator.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/SamlAuthenticator.tsx index 0a175b876c1c..009989dfeabc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/authenticators/SamlAuthenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/SamlAuthenticator.tsx @@ -33,8 +33,8 @@ import { oidcTokenKey } from '../../../constants/constants'; import { SamlSSOClientConfig } from '../../../generated/configuration/authenticationConfiguration'; import { postSamlLogout } from '../../../rest/miscAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../auth-provider/AuthProvider'; -import { AuthenticatorRef } from '../auth-provider/AuthProvider.interface'; +import { useAuthContext } from '../AuthProviders/AuthProvider'; +import { AuthenticatorRef } from '../AuthProviders/AuthProvider.interface'; interface Props { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/callbacks/Auth0Callback/Auth0Callback.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/callbacks/Auth0Callback/Auth0Callback.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.test.tsx index 343233d62766..af9749e9ca1f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/callbacks/Auth0Callback/Auth0Callback.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.test.tsx @@ -50,7 +50,7 @@ jest.mock('@auth0/auth0-react', () => ({ useAuth0: jest.fn(), })); -jest.mock('../../../authentication/auth-provider/AuthProvider', () => { +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ authConfig: {}, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/callbacks/Auth0Callback/Auth0Callback.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/callbacks/Auth0Callback/Auth0Callback.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.tsx index c4edfe1894a9..d085ef3ffef0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/callbacks/Auth0Callback/Auth0Callback.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppCallbacks/Auth0Callback/Auth0Callback.tsx @@ -15,8 +15,8 @@ import { useAuth0 } from '@auth0/auth0-react'; import { t } from 'i18next'; import React, { VFC } from 'react'; import localState from '../../../../utils/LocalStorageUtils'; -import { useAuthContext } from '../../auth-provider/AuthProvider'; -import { OidcUser } from '../../auth-provider/AuthProvider.interface'; +import { useAuthContext } from '../../AuthProviders/AuthProvider'; +import { OidcUser } from '../../AuthProviders/AuthProvider.interface'; const Auth0Callback: VFC = () => { const { isAuthenticated, user, getIdTokenClaims, error } = useAuth0(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx index 21704fe77e27..b12eeb87b1b4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/AuthProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx @@ -72,21 +72,21 @@ import { } from '../../../utils/UserDataUtils'; import { resetWebAnalyticSession } from '../../../utils/WebAnalyticsUtils'; import Loader from '../../Loader/Loader'; -import Auth0Authenticator from '../authenticators/Auth0Authenticator'; -import BasicAuthAuthenticator from '../authenticators/basic-auth.authenticator'; -import MsalAuthenticator from '../authenticators/MsalAuthenticator'; -import OidcAuthenticator from '../authenticators/OidcAuthenticator'; -import OktaAuthenticator from '../authenticators/OktaAuthenticator'; -import SamlAuthenticator from '../authenticators/SamlAuthenticator'; -import Auth0Callback from '../callbacks/Auth0Callback/Auth0Callback'; +import Auth0Authenticator from '../AppAuthenticators/Auth0Authenticator'; +import BasicAuthAuthenticator from '../AppAuthenticators/BasicAuthAuthenticator'; +import MsalAuthenticator from '../AppAuthenticators/MsalAuthenticator'; +import OidcAuthenticator from '../AppAuthenticators/OidcAuthenticator'; +import OktaAuthenticator from '../AppAuthenticators/OktaAuthenticator'; +import SamlAuthenticator from '../AppAuthenticators/SamlAuthenticator'; +import Auth0Callback from '../AppCallbacks/Auth0Callback/Auth0Callback'; import { AuthenticationConfigurationWithScope, AuthenticatorRef, IAuthContext, OidcUser, } from './AuthProvider.interface'; -import BasicAuthProvider from './basic-auth.provider'; -import OktaAuthProvider from './okta-auth-provider'; +import BasicAuthProvider from './BasicAuthProvider'; +import OktaAuthProvider from './OktaAuthProvider'; interface AuthProviderProps { childComponentType: ComponentType; children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/basic-auth.provider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/BasicAuthProvider.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/basic-auth.provider.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/BasicAuthProvider.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/okta-auth-provider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/OktaAuthProvider.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/authentication/auth-provider/okta-auth-provider.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/OktaAuthProvider.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts index ba50e7b1675c..5334a0b8a4ab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts @@ -20,7 +20,7 @@ import { getSuggestions, searchData } from '../../../../rest/miscAPI'; import { getEntityBreadcrumbs } from '../../../../utils/EntityUtils'; import { buildMentionLink } from '../../../../utils/FeedUtils'; import { getEncodedFqn } from '../../../../utils/StringsUtils'; -import { SearchedDataProps } from '../../../searched-data/SearchedData.interface'; +import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface'; import { ExtensionRef } from '../../BlockEditor.interface'; import HashList from './HashList'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx index 3650c9ee30b3..f82dd8eb7fee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx @@ -17,8 +17,8 @@ import React, { FC } from 'react'; import { AuthenticationMechanism } from '../../generated/entity/teams/user'; import { getTokenExpiry } from '../../utils/BotsUtils'; import SVGIcons from '../../utils/SvgUtils'; -import CopyToClipboardButton from '../buttons/CopyToClipboardButton/CopyToClipboardButton'; -import './AuthMechanism.less'; +import CopyToClipboardButton from '../CopyToClipboardButton/CopyToClipboardButton'; +import './auth-mechanism.less'; interface Props { authenticationMechanism: AuthenticationMechanism; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx index 58d5021feb52..ad199d450e53 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx @@ -18,7 +18,7 @@ import { toLower } from 'lodash'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import { TERM_ADMIN } from '../../constants/constants'; import { GlobalSettingOptions, @@ -38,15 +38,15 @@ import { import { getEntityName } from '../../utils/EntityUtils'; import { getSettingPath } from '../../utils/RouterUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import Description from '../common/description/Description'; +import Description from '../common/EntityDescription/Description'; import InheritedRolesCard from '../common/InheritedRolesCard/InheritedRolesCard.component'; import RolesCard from '../common/RolesCard/RolesCard.component'; -import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component'; +import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal'; import AuthMechanism from './AuthMechanism'; import AuthMechanismForm from './AuthMechanismForm'; +import './bot-details.less'; import { BotsDetailProps } from './BotDetails.interfaces'; -import './BotDetails.style.less'; import { ReactComponent as IconBotProfile } from '../../assets/svg/bot-profile.svg'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx index e9dddbebad20..d0eb2b1b2f3f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx @@ -110,7 +110,7 @@ jest.mock('../../rest/userAPI', () => { }; }); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); @@ -122,7 +122,7 @@ jest.mock('./AuthMechanismForm', () => ) ); -jest.mock('../containers/PageLayoutV1', () => +jest.mock('../PageLayoutV1/PageLayoutV1', () => jest .fn() .mockImplementation(({ children, leftPanel, rightPanel, header }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.less b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/auth-mechanism.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.less rename to openmetadata-ui/src/main/resources/ui/src/components/BotDetails/auth-mechanism.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.style.less b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/bot-details.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/BotDetails/bot-details.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx index 1eb89a378ec3..bb3b7bbfdedf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx @@ -18,8 +18,7 @@ import { isEmpty, lowerCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import FilterTablePlaceHolder from '../../components/common/error-with-placeholder/FilterTablePlaceHolder'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; +import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import Table from '../../components/common/Table/Table'; import { getBotsPath } from '../../constants/constants'; import { BOTS_DOCS } from '../../constants/docs.constants'; @@ -32,16 +31,16 @@ import { Paging } from '../../generated/type/paging'; import { useAuth } from '../../hooks/authHooks'; import { usePaging } from '../../hooks/paging/usePaging'; import { getBots } from '../../rest/botsAPI'; -import { showPagination } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import DeleteWidgetModal from '../common/DeleteWidget/DeleteWidgetModal'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../common/next-previous/NextPrevious'; -import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer'; -import Searchbar from '../common/searchbar/Searchbar'; -import PageHeader from '../header/PageHeader.component'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; +import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +import PageHeader from '../PageHeader/PageHeader.component'; import { BotListV1Props } from './BotListV1.interfaces'; const BotListV1 = ({ @@ -62,6 +61,7 @@ const BotListV1 = ({ handlePagingChange, handlePageChange, handlePageSizeChange, + showPagination, } = usePaging(); const [handleErrorPlaceholder, setHandleErrorPlaceholder] = useState(false); @@ -288,7 +288,7 @@ const BotListV1 = ({ /> - {showPagination(paging) && ( + {showPagination && ( { return jest.fn().mockReturnValue(
ErrorPlaceHolder
); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx index a4778f9c99b3..d70aaff2e9a9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx @@ -28,7 +28,7 @@ import { import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants'; import { updateActiveChartFilter } from '../../utils/ChartUtils'; import { formatNumberWithComma } from '../../utils/CommonUtils'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { CustomBarChartProps } from './Chart.interface'; const OperationDateBarChart = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx index 8a521a207473..cbfb0889b61d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx @@ -14,21 +14,19 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import { Button, Col, Row, Space, Switch, Tooltip, Typography } from 'antd'; import ButtonGroup from 'antd/lib/button/button-group'; import { ColumnsType } from 'antd/lib/table'; +import { AxiosError } from 'axios'; import classNames from 'classnames'; import { capitalize, isUndefined, toString } from 'lodash'; -import React, { useCallback, useMemo } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { ReactComponent as IconTag } from '../../assets/svg/classification.svg'; import { ReactComponent as LockIcon } from '../../assets/svg/closed-lock.svg'; import { ReactComponent as VersionIcon } from '../../assets/svg/ic-version.svg'; import AppBadge from '../../components/common/Badge/Badge.component'; -import Description from '../../components/common/description/Description'; -import ManageButton from '../../components/common/entityPageInfo/ManageButton/ManageButton'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../../components/common/next-previous/NextPrevious'; -import { NextPreviousProps } from '../../components/common/next-previous/NextPrevious.interface'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import Description from '../../components/common/EntityDescription/Description'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import Table from '../../components/common/Table/Table'; import EntityHeaderTitle from '../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component'; import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; @@ -36,7 +34,7 @@ import { OperationPermission, ResourceEntity, } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { DE_ACTIVE_COLOR, PAGE_SIZE } from '../../constants/constants'; +import { DE_ACTIVE_COLOR } from '../../constants/constants'; import { EntityField } from '../../constants/Feeds.constants'; import { EntityType } from '../../enums/entity.enum'; import { ProviderType } from '../../generated/api/classification/createClassification'; @@ -47,7 +45,9 @@ import { import { Tag } from '../../generated/entity/classification/tag'; import { Operation } from '../../generated/entity/policies/policy'; import { Paging } from '../../generated/type/paging'; +import { usePaging } from '../../hooks/paging/usePaging'; import { DeleteTagsType } from '../../pages/TagsPage/TagsPage.interface'; +import { getTags } from '../../rest/tagAPI'; import { getClassificationExtraDropdownContent, getTagsTableColumn, @@ -61,19 +61,19 @@ import { getClassificationDetailsPath, getClassificationVersionsPath, } from '../../utils/RouterUtils'; +import { getErrorText } from '../../utils/StringsUtils'; +import { showErrorToast } from '../../utils/ToastUtils'; +import ManageButton from '../common/EntityPageInfos/ManageButton/ManageButton'; +import NextPrevious from '../common/NextPrevious/NextPrevious'; +import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface'; export interface ClassificationDetailsProps { - paging: Paging; - isTagsLoading: boolean; - currentPage: number; classificationPermissions: OperationPermission; isVersionView?: boolean; currentClassification?: Classification; deleteTags?: DeleteTagsType; - tags?: Tag[]; isEditClassification?: boolean; disableEditButton?: boolean; - handlePageChange: NextPreviousProps['pagingHandler']; handleAfterDeleteAction?: () => void; handleEditTagClick?: (selectedTag: Tag) => void; handleActionDeleteTag?: (record: Tag) => void; @@ -89,19 +89,14 @@ function ClassificationDetails({ currentClassification, handleAfterDeleteAction, isEditClassification, - isTagsLoading, classificationPermissions, handleUpdateClassification, handleEditTagClick, deleteTags, - tags, handleActionDeleteTag, handleAddNewTagClick, handleEditDescriptionClick, handleCancelEditDescription, - paging, - currentPage, - handlePageChange, disableEditButton, isVersionView = false, }: ClassificationDetailsProps) { @@ -109,6 +104,61 @@ function ClassificationDetails({ const { t } = useTranslation(); const { fqn: tagCategoryName } = useParams<{ fqn: string }>(); const history = useHistory(); + const [tags, setTags] = useState([]); + const [isTagsLoading, setIsTagsLoading] = useState(false); + + const { + currentPage, + paging, + pageSize, + handlePageChange, + handlePageSizeChange, + handlePagingChange, + showPagination, + } = usePaging(); + + const fetchClassificationChildren = async ( + currentClassificationName: string, + paging?: Partial + ) => { + setIsTagsLoading(true); + setTags([]); + try { + const { data, paging: tagPaging } = await getTags({ + arrQueryFields: ['usageCount'], + parent: currentClassificationName, + after: paging?.after, + before: paging?.before, + limit: pageSize, + }); + setTags(data); + handlePagingChange(tagPaging); + } catch (error) { + const errMsg = getErrorText( + error as AxiosError, + t('server.entity-fetch-error', { entity: t('label.tag-plural') }) + ); + showErrorToast(errMsg); + setTags([]); + } finally { + setIsTagsLoading(false); + } + }; + + const handleTagsPageChange: NextPreviousProps['pagingHandler'] = ({ + currentPage, + cursorType, + }) => { + if (cursorType) { + fetchClassificationChildren( + currentClassification?.fullyQualifiedName ?? '', + { + [cursorType]: paging[cursorType], + } + ); + } + handlePageChange(currentPage); + }; const currentVersion = useMemo( () => currentClassification?.version ?? '0.1', @@ -356,6 +406,12 @@ function ClassificationDetails({ : ''; }, [currentClassification, changeDescription]); + useEffect(() => { + if (currentClassification?.fullyQualifiedName) { + fetchClassificationChildren(currentClassification.fullyQualifiedName); + } + }, [currentClassification?.fullyQualifiedName, pageSize]); + return (
{currentClassification && ( @@ -496,12 +552,13 @@ function ClassificationDetails({ size="small" /> - {paging.total > PAGE_SIZE && ( + {showPagination && !isTagsLoading && ( )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx index cc191293a1bd..ce068232674f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx @@ -15,8 +15,8 @@ import { ColumnsType } from 'antd/lib/table'; import React, { FC, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import Table from '../../../components/common/Table/Table'; import { getContainerDetailPath } from '../../../constants/constants'; import { Container } from '../../../generated/entity/data/container'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx index ece5785f90d6..257aaa4aa2bd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx @@ -109,7 +109,7 @@ jest.mock('../../../utils/ContainerDetailUtils', () => ({ })); jest.mock( - '../../../components/common/rich-text-editor/RichTextEditorPreviewer', + '../../../components/common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() @@ -136,7 +136,7 @@ jest.mock('../../../components/TableTags/TableTags.component', () => ); jest.mock( - '../../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx index 1ea38b44b58b..cd0d82f8f835 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx @@ -23,7 +23,7 @@ import { import { EntityTags, TagFilterOptions } from 'Models'; import React, { FC, useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { ColumnFilter } from '../../../components/Table/ColumnFilter/ColumnFilter.component'; import TableDescription from '../../../components/TableDescription/TableDescription.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx index 5416ae0e834e..e7302b3dde2e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx @@ -18,7 +18,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts index 054e075c49e9..d2ec4000371b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts @@ -14,7 +14,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Container } from '../../generated/entity/data/container'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface ContainerVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx index 2ca30aa807ed..9cfcaf51cb0d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx @@ -41,7 +41,7 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/buttons/CopyToClipboardButton/CopyToClipboardButton.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/buttons/CopyToClipboardButton/CopyToClipboardButton.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/buttons/CopyToClipboardButton/CopyToClipboardButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/buttons/CopyToClipboardButton/CopyToClipboardButton.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx index 0adda05a08c6..830bd891ac16 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/buttons/CopyToClipboardButton/CopyToClipboardButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx @@ -14,8 +14,8 @@ import { Button, PopoverProps, Tooltip } from 'antd'; import React, { FunctionComponent } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as CopyIcon } from '../../../assets/svg/icon-copy.svg'; -import { useClipboard } from '../../../hooks/useClipBoard'; +import { ReactComponent as CopyIcon } from '../../assets/svg/icon-copy.svg'; +import { useClipboard } from '../../hooks/useClipBoard'; interface Props { copyText: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx index c5db3d8ee6a1..4a588ebb3823 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx @@ -41,9 +41,9 @@ import { handleSearchFilterOption } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import CopyToClipboardButton from '../buttons/CopyToClipboardButton/CopyToClipboardButton'; -import RichTextEditor from '../common/rich-text-editor/RichTextEditor'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import RichTextEditor from '../common/RichTextEditor/RichTextEditor'; +import CopyToClipboardButton from '../CopyToClipboardButton/CopyToClipboardButton'; import Loader from '../Loader/Loader'; import TeamsSelectable from '../TeamsSelectable/TeamsSelectable'; import { CreateUserProps } from './CreateUser.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx index 1218e583fe3f..3585ec3f8f58 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx @@ -21,7 +21,7 @@ jest.mock('../TeamsSelectable/TeamsSelectable', () => { return jest.fn().mockReturnValue(

TeamsSelectable component

); }); -jest.mock('../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(({ initialValue }, ref) => { return
{initialValue}MarkdownWithPreview component
; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx index 0e3374771feb..537229a2a551 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx @@ -211,7 +211,7 @@ jest.mock('../../../utils/ToastUtils', () => ({ })); jest.mock( - '../../../components/common/title-breadcrumb/title-breadcrumb.component', + '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockImplementation(() =>
BreadCrumb.component
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx index 3514a7bdcfbb..a0f90e319c45 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx @@ -45,7 +45,7 @@ import { getSettingPath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import ResizablePanels from '../../common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../common/ServiceDocPanel/ServiceDocPanel'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; const AddCustomProperty = () => { const { entityTypeFQN } = useParams<{ entityTypeFQN: EntityType }>(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx index 38b873faacf3..809bdfb3fb21 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx @@ -21,11 +21,11 @@ import { import React from 'react'; import { CustomPropertyTable } from './CustomPropertyTable'; -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreview

); }); jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockReturnValue(

ErrorPlaceHolder

); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx index 4cff8a5a8916..3c043f057dc4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx @@ -17,14 +17,14 @@ import React, { FC, Fragment, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as IconEdit } from '../../assets/svg/edit-new.svg'; import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Table from '../../components/common/Table/Table'; import { CUSTOM_PROPERTIES_DOCS } from '../../constants/docs.constants'; import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; import { ERROR_PLACEHOLDER_TYPE, OPERATION } from '../../enums/common.enum'; import { CustomProperty } from '../../generated/entity/type'; import { getEntityName } from '../../utils/EntityUtils'; -import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { CustomPropertyTableProp } from './CustomPropertyTable.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx index 040c494f6e25..4e3b86799858 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx @@ -23,12 +23,12 @@ import { Document } from '../../../generated/entity/docStore/document'; import { getAllKnowledgePanels } from '../../../rest/DocStoreAPI'; import { getWidgetWidthLabelFromKey } from '../../../utils/CustomizableLandingPageUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import './add-widget-modal.less'; import { AddWidgetModalProps, WidgetSizeInfo, } from './AddWidgetModal.interface'; -import './AddWidgetModal.less'; import AddWidgetTabContent from './AddWidgetTabContent'; function AddWidgetModal({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.less b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.less rename to openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx index 72b140fb3d29..c489ca4180e2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx @@ -51,11 +51,11 @@ import { import { getDecodedFqn } from '../../../utils/StringsUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import ActivityFeedProvider from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import PageLayoutV1 from '../../containers/PageLayoutV1'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import AddWidgetModal from '../AddWidgetModal/AddWidgetModal'; +import './customize-my-data.less'; import { CustomizeMyDataProps } from './CustomizeMyData.interface'; -import './CustomizeMyData.less'; const ReactGridLayout = WidthProvider(RGL); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.less b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.less rename to openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx index c81ecf110f28..4c3dc4cc08ed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx @@ -18,8 +18,8 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as AddPlaceHolderIcon } from '../../../assets/svg/add-placeholder.svg'; import { SIZE } from '../../../enums/common.enum'; +import './empty-widget-placeholder.less'; import { EmptyWidgetPlaceholderProps } from './EmptyWidgetPlaceholder.interface'; -import './EmptyWidgetPlaceholder.less'; function EmptyWidgetPlaceholder({ iconHeight = SIZE.MEDIUM, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.less b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.less rename to openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx index ea2b6ddc53fb..cf1eb3e7266b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx @@ -23,14 +23,14 @@ import { useHistory, useParams } from 'react-router-dom'; import { ReactComponent as ExternalLinkIcon } from '../../assets/svg/external-links.svg'; import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; import TableDescription from '../../components/TableDescription/TableDescription.component'; import TableTags from '../../components/TableTags/TableTags.component'; @@ -62,7 +62,7 @@ import { import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx index 106d5299c23f..7fa6e9d762e1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx @@ -97,10 +97,10 @@ jest.mock('../../components/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviwer

); }); @@ -136,7 +136,7 @@ jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ .mockReturnValue(

CustomPropertyTable.component

), })); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx index ed39d199008a..d822ca85b624 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx @@ -19,8 +19,8 @@ import { useTranslation } from 'react-i18next'; import { Link, useHistory, useParams } from 'react-router-dom'; import { ReactComponent as IconExternalLink } from '../../assets/svg/external-links.svg'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts index e5dc166a1b07..9e645b614d10 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Dashboard } from '../../generated/entity/data/dashboard'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface DashboardVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx index 2d5e9ab8c623..1335397517a1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx @@ -27,7 +27,7 @@ import { DashboardVersionProp } from './DashboardVersion.interface'; const mockPush = jest.fn(); jest.mock( - '../../components/common/rich-text-editor/RichTextEditorPreviewer', + '../../components/common/RichTextEditor/RichTextEditorPreviewer', () => { return jest .fn() @@ -35,7 +35,7 @@ jest.mock( } ); -jest.mock('../../components/common/description/DescriptionV1', () => { +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => { return jest.fn().mockImplementation(() =>
Description.component
); }); @@ -53,7 +53,7 @@ jest.mock('../../components/Loader/Loader', () => { }); jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx index 0396d14108c2..bd9884a3ba59 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx @@ -27,12 +27,8 @@ import { ReactComponent as StarIcon } from '../../../assets/svg/ic-star.svg'; import { ReactComponent as VersionIcon } from '../../../assets/svg/ic-version.svg'; import { ActivityFeedTabs } from '../../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; import { DomainLabel } from '../../../components/common/DomainLabel/DomainLabel.component'; -import AnnouncementCard from '../../../components/common/entityPageInfo/AnnouncementCard/AnnouncementCard'; -import AnnouncementDrawer from '../../../components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer'; -import ManageButton from '../../../components/common/entityPageInfo/ManageButton/ManageButton'; import { OwnerLabel } from '../../../components/common/OwnerLabel/OwnerLabel.component'; import TierCard from '../../../components/common/TierCard/TierCard'; -import TitleBreadcrumb from '../../../components/common/title-breadcrumb/title-breadcrumb.component'; import EntityHeaderTitle from '../../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component'; import { useTourProvider } from '../../../components/TourProvider/TourProvider'; import Voting from '../../../components/Voting/Voting.component'; @@ -59,7 +55,11 @@ import { import serviceUtilClassBase from '../../../utils/ServiceUtilClassBase'; import { getTierTags } from '../../../utils/TableUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import AnnouncementCard from '../../common/EntityPageInfos/AnnouncementCard/AnnouncementCard'; +import AnnouncementDrawer from '../../common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer'; +import ManageButton from '../../common/EntityPageInfos/ManageButton/ManageButton'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import { DataAssetHeaderInfo, DataAssetsHeaderProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts index c5473ab6dbbc..30df062b4e7a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts @@ -11,7 +11,6 @@ * limitations under the License. */ import { ReactNode } from 'react'; -import { TitleBreadcrumbProps } from '../../../components/common/title-breadcrumb/title-breadcrumb.interface'; import { EntityName } from '../../../components/Modals/EntityNameModal/EntityNameModal.interface'; import { OperationPermission } from '../../../components/PermissionProvider/PermissionProvider.interface'; import { QueryVote } from '../../../components/TableQueries/TableQueries.interface'; @@ -39,6 +38,7 @@ import { SearchService } from '../../../generated/entity/services/searchService' import { StorageService } from '../../../generated/entity/services/storageService'; import { EntityReference } from '../../../generated/entity/type'; import { ServicesType } from '../../../interface/service.interface'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export type DataAssetsType = | Table diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx index 33b03366d83a..94d517f9fbcf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx @@ -45,7 +45,7 @@ const mockProps: DataAssetsHeaderProps = { }; jest.mock( - '../../../components/common/title-breadcrumb/title-breadcrumb.component', + '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest .fn() @@ -74,16 +74,16 @@ jest.mock('../../../components/common/TierCard/TierCard', () => )) ); jest.mock( - '../../../components/common/entityPageInfo/ManageButton/ManageButton', + '../../../components/common/EntityPageInfos/ManageButton/ManageButton', () => jest.fn().mockImplementation(() =>
ManageButton.component
) ); jest.mock( - '../../../components/common/entityPageInfo/AnnouncementCard/AnnouncementCard', + '../../../components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard', () => jest.fn().mockImplementation(() =>
AnnouncementCard.component
) ); jest.mock( - '../../../components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer', + '../../../components/common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer', () => jest.fn().mockImplementation(() =>
AnnouncementDrawer.component
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.interface.ts index 69c961204ec9..f6d43a39c430 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.interface.ts @@ -11,13 +11,13 @@ * limitations under the License. */ -import { TitleBreadcrumbProps } from '../../../components/common/title-breadcrumb/title-breadcrumb.interface'; import { EntityType } from '../../../enums/entity.enum'; import { Database } from '../../../generated/entity/data/database'; import { DatabaseSchema } from '../../../generated/entity/data/databaseSchema'; import { EntityReference } from '../../../generated/entity/type'; import { ServicesType } from '../../../interface/service.interface'; import { VersionData } from '../../../pages/EntityVersionPage/EntityVersionPage.component'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface DataAssetsVersionHeaderProps { breadcrumbLinks: TitleBreadcrumbProps['titleLinks']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.tsx index 62322d2acd7f..a0f4877b103d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader.tsx @@ -19,12 +19,12 @@ import { useTranslation } from 'react-i18next'; import { ReactComponent as VersionIcon } from '../../../assets/svg/ic-version.svg'; import { DomainLabel } from '../../../components/common/DomainLabel/DomainLabel.component'; import { OwnerLabel } from '../../../components/common/OwnerLabel/OwnerLabel.component'; -import TitleBreadcrumb from '../../../components/common/title-breadcrumb/title-breadcrumb.component'; import EntityHeaderTitle from '../../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component'; import { EntityType } from '../../../enums/entity.enum'; import { getDataAssetsVersionHeaderInfo } from '../../../utils/DataAssetsVersionHeaderUtils'; import serviceUtilClassBase from '../../../utils/ServiceUtilClassBase'; import { stringToHTML } from '../../../utils/StringsUtils'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import { EntitiesWithDomainField } from '../DataAssetsHeader/DataAssetsHeader.interface'; import { DataAssetsVersionHeaderProps } from './DataAssetsVersionHeader.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DailyActiveUsersChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DailyActiveUsersChart.tsx index c18cc08023c0..16b49287e28e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DailyActiveUsersChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DailyActiveUsersChart.tsx @@ -26,7 +26,6 @@ import { XAxis, YAxis, } from 'recharts'; -import PageHeader from '../../components/header/PageHeader.component'; import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants'; import { BAR_CHART_MARGIN, @@ -45,8 +44,9 @@ import { renderLegend, } from '../../utils/DataInsightUtils'; import { showErrorToast } from '../../utils/ToastUtils'; +import PageHeader from '../PageHeader/PageHeader.component'; import CustomStatistic from './CustomStatistic'; -import './DataInsightDetail.less'; +import './data-insight-detail.less'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx index 21e7b277a31f..503340fdb294 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightSummary.tsx @@ -43,7 +43,7 @@ import { getEntityName } from '../../utils/EntityUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import UserPopOverCard from '../common/PopOverCard/UserPopOverCard'; import ProfilePicture from '../common/ProfilePicture/ProfilePicture'; -import './DataInsightDetail.less'; +import './data-insight-detail.less'; interface Props { chartFilter: ChartFilter; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.tsx index 11d38614a7c3..24b6e77fdb93 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DescriptionInsight.tsx @@ -25,7 +25,6 @@ import { XAxis, YAxis, } from 'recharts'; -import PageHeader from '../../components/header/PageHeader.component'; import { DEFAULT_CHART_OPACITY, GRAPH_BACKGROUND_COLOR, @@ -56,8 +55,9 @@ import { sortEntityByValue, } from '../../utils/DataInsightUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import Searchbar from '../common/searchbar/Searchbar'; -import './DataInsightDetail.less'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import DataInsightProgressBar from './DataInsightProgressBar'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; import EntitySummaryProgressBar from './EntitySummaryProgressBar.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EmptyGraphPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EmptyGraphPlaceholder.tsx index 019f8a27c466..c93b6456e2b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EmptyGraphPlaceholder.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/EmptyGraphPlaceholder.tsx @@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next'; import { DATA_INSIGHT_DOCS } from '../../constants/docs.constants'; import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../enums/common.enum'; import { Transi18next } from '../../utils/CommonUtils'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; export const EmptyGraphPlaceholder = () => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx index cfcc166909e2..3f925119e43a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChart.tsx @@ -29,8 +29,7 @@ import { XAxis, YAxis, } from 'recharts'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import PageHeader from '../../components/header/PageHeader.component'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { DEFAULT_CHART_OPACITY, GRAPH_BACKGROUND_COLOR, @@ -61,7 +60,8 @@ import { renderLegend, } from '../../utils/DataInsightUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import './DataInsightDetail.less'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; import KPILatestResultsV1 from './KPILatestResultsV1'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.tsx index a1e5dedc6003..571cf7a0b67d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/OwnerInsight.tsx @@ -25,7 +25,6 @@ import { XAxis, YAxis, } from 'recharts'; -import PageHeader from '../../components/header/PageHeader.component'; import { DEFAULT_CHART_OPACITY, GRAPH_BACKGROUND_COLOR, @@ -56,8 +55,9 @@ import { sortEntityByValue, } from '../../utils/DataInsightUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import Searchbar from '../common/searchbar/Searchbar'; -import './DataInsightDetail.less'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import DataInsightProgressBar from './DataInsightProgressBar'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; import EntitySummaryProgressBar from './EntitySummaryProgressBar.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/PageViewsByEntitiesChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/PageViewsByEntitiesChart.tsx index 2f408b9fa7cd..70de8055f6de 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/PageViewsByEntitiesChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/PageViewsByEntitiesChart.tsx @@ -25,7 +25,6 @@ import { XAxis, YAxis, } from 'recharts'; -import PageHeader from '../../components/header/PageHeader.component'; import { DEFAULT_CHART_OPACITY, GRAPH_BACKGROUND_COLOR, @@ -48,7 +47,8 @@ import { sortEntityByValue, } from '../../utils/DataInsightUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import './DataInsightDetail.less'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; import TotalEntityInsightSummary from './TotalEntityInsightSummary.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TierInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TierInsight.tsx index 716a69bb65a9..1778d4c3c465 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TierInsight.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TierInsight.tsx @@ -25,7 +25,6 @@ import { XAxis, YAxis, } from 'recharts'; -import PageHeader from '../../components/header/PageHeader.component'; import { DEFAULT_CHART_OPACITY, GRAPH_BACKGROUND_COLOR, @@ -56,8 +55,9 @@ import { } from '../../utils/DataInsightUtils'; import { getEntityName } from '../../utils/EntityUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import Searchbar from '../common/searchbar/Searchbar'; -import './DataInsightDetail.less'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import DataInsightProgressBar from './DataInsightProgressBar'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; import EntitySummaryProgressBar from './EntitySummaryProgressBar.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx index 205bbccb46ba..986040c664b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopActiveUsers.tsx @@ -18,7 +18,6 @@ import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import Table from '../../components/common/Table/Table'; -import PageHeader from '../../components/header/PageHeader.component'; import { getUserPath } from '../../constants/constants'; import { DataReportIndex } from '../../generated/dataInsight/dataInsightChart'; import { DataInsightChartType } from '../../generated/dataInsight/dataInsightChartResult'; @@ -31,7 +30,8 @@ import { } from '../../utils/date-time/DateTimeUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import ProfilePicture from '../common/ProfilePicture/ProfilePicture'; -import './DataInsightDetail.less'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx index d4f2bd5dc7fa..65c266f5aff9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TopViewEntities.tsx @@ -19,7 +19,6 @@ import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import Table from '../../components/common/Table/Table'; -import PageHeader from '../../components/header/PageHeader.component'; import { DataReportIndex } from '../../generated/dataInsight/dataInsightChart'; import { DataInsightChartType } from '../../generated/dataInsight/dataInsightChartResult'; import { MostViewedEntities } from '../../generated/dataInsight/type/mostViewedEntities'; @@ -28,7 +27,8 @@ import { getAggregateChartData } from '../../rest/DataInsightAPI'; import { getDecodedFqn } from '../../utils/StringsUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import ProfilePicture from '../common/ProfilePicture/ProfilePicture'; -import './DataInsightDetail.less'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsight.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsight.tsx index 0fddb702c884..dcb56718e11e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsight.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsight.tsx @@ -25,7 +25,6 @@ import { XAxis, YAxis, } from 'recharts'; -import PageHeader from '../../components/header/PageHeader.component'; import { DEFAULT_CHART_OPACITY, GRAPH_BACKGROUND_COLOR, @@ -51,7 +50,8 @@ import { sortEntityByValue, } from '../../utils/DataInsightUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import './DataInsightDetail.less'; +import PageHeader from '../PageHeader/PageHeader.component'; +import './data-insight-detail.less'; import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder'; import TotalEntityInsightSummary from './TotalEntityInsightSummary.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.component.tsx index 983dc242f5f5..bbf2e0902633 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/TotalEntityInsightSummary.component.tsx @@ -19,7 +19,7 @@ import { useTranslation } from 'react-i18next'; import { TOTAL_ENTITY_CHART_COLOR } from '../../constants/DataInsight.constants'; import { updateActiveChartFilter } from '../../utils/ChartUtils'; import { sortEntityByValue } from '../../utils/DataInsightUtils'; -import Searchbar from '../common/searchbar/Searchbar'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; import CustomStatistic from './CustomStatistic'; import EntitySummaryProgressBar from './EntitySummaryProgressBar.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightDetail.less b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/data-insight-detail.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataInsightDetail.less rename to openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/data-insight-detail.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx index 5ff1ccc41727..efa63b786c32 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx @@ -16,7 +16,7 @@ import classNames from 'classnames'; import { cloneDeep } from 'lodash'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts index d153be911b5f..449dbc8fd5ab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts @@ -15,7 +15,7 @@ import { DashboardDataModel } from '../../generated/entity/data/dashboardDataMod import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; import { VersionData } from '../../pages/EntityVersionPage/EntityVersionPage.component'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface DataModelVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx index 2d8dc26d77c3..993309c0d486 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx @@ -21,14 +21,12 @@ import { useHistory, useParams } from 'react-router-dom'; import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; import ActivityThreadPanel from '../../components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; -import SchemaEditor from '../../components/schema-editor/SchemaEditor'; -import { SourceType } from '../../components/searched-data/SearchedData.interface'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../components/Tag/TagsViewer/TagsViewer.interface'; @@ -48,6 +46,8 @@ import { getTagsWithoutTier } from '../../utils/TableUtils'; import { createTagObject } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +import SchemaEditor from '../SchemaEditor/SchemaEditor'; +import { SourceType } from '../SearchedData/SearchedData.interface'; import { DataModelDetailsProps } from './DataModelDetails.interface'; import ModelTab from './ModelTab/ModelTab.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx index 9fc1dfc65bef..f95aa2109e6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx @@ -13,27 +13,42 @@ import { Col } from 'antd'; import { ColumnsType } from 'antd/lib/table'; +import { AxiosError } from 'axios'; import { isUndefined } from 'lodash'; -import React, { useMemo } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Link } from 'react-router-dom'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../../components/common/next-previous/NextPrevious'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import { Link, useParams } from 'react-router-dom'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import Table from '../../components/common/Table/Table'; -import { getDataModelDetailsPath, PAGE_SIZE } from '../../constants/constants'; -import { DataModelTableProps } from '../../pages/DataModelPage/DataModelsInterface'; +import { + getDataModelDetailsPath, + pagingObject, +} from '../../constants/constants'; +import { Include } from '../../generated/type/include'; +import { Paging } from '../../generated/type/paging'; +import { usePaging } from '../../hooks/paging/usePaging'; import { ServicePageData } from '../../pages/ServiceDetailsPage/ServiceDetailsPage'; +import { getDataModels } from '../../rest/dashboardAPI'; import { getEntityName } from '../../utils/EntityUtils'; +import { showErrorToast } from '../../utils/ToastUtils'; +import NextPrevious from '../common/NextPrevious/NextPrevious'; +import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface'; -const DataModelTable = ({ - data, - isLoading, - paging, - pagingHandler, - currentPage, -}: DataModelTableProps) => { +const DataModelTable = ({ showDeleted }: { showDeleted?: boolean }) => { const { t } = useTranslation(); + const { fqn } = useParams<{ fqn: string }>(); + const [dataModels, setDataModels] = useState>(); + const { + currentPage, + pageSize, + paging, + handlePageChange, + handlePageSizeChange, + handlePagingChange, + showPagination, + } = usePaging(); + const [isLoading, setIsLoading] = useState(true); const tableColumn: ColumnsType = useMemo( () => [ @@ -73,6 +88,44 @@ const DataModelTable = ({ [] ); + const fetchDashboardsDataModel = useCallback( + async (pagingData?: Partial) => { + try { + setIsLoading(true); + const { data, paging: resPaging } = await getDataModels({ + service: fqn, + fields: 'owner,tags,followers', + limit: pageSize, + include: showDeleted ? Include.Deleted : Include.NonDeleted, + ...pagingData, + }); + setDataModels(data); + handlePagingChange(resPaging); + } catch (error) { + showErrorToast(error as AxiosError); + setDataModels([]); + handlePagingChange(pagingObject); + } finally { + setIsLoading(false); + } + }, + [fqn, pageSize, showDeleted] + ); + + const handleDataModelPageChange: NextPreviousProps['pagingHandler'] = ({ + cursorType, + currentPage, + }) => { + if (cursorType) { + fetchDashboardsDataModel({ [cursorType]: paging[cursorType] }); + } + handlePageChange(currentPage); + }; + + useEffect(() => { + fetchDashboardsDataModel(); + }, [pageSize, showDeleted]); + return ( <>
@@ -81,7 +134,7 @@ const DataModelTable = ({ className="mt-4 table-shadow" columns={tableColumn} data-testid="data-models-table" - dataSource={data} + dataSource={dataModels} loading={isLoading} locale={{ emptyText: , @@ -91,13 +144,14 @@ const DataModelTable = ({ size="small" /> - - {paging && paging.total > PAGE_SIZE && ( + + {showPagination && ( )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx index a4fb8f03d116..447af159a5dc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx @@ -34,19 +34,18 @@ import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; import { ReactComponent as StyleIcon } from '../../../assets/svg/style.svg'; import { AssetSelectionModal } from '../../../components/Assets/AssetsSelectionModal/AssetSelectionModal'; import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import PageLayoutV1 from '../../../components/containers/PageLayoutV1'; import { DomainTabs } from '../../../components/Domain/DomainPage.interface'; import DocumentationTab from '../../../components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component'; import { DocumentationEntity } from '../../../components/Domain/DomainTabs/DocumentationTab/DocumentationTab.interface'; import { EntityHeader } from '../../../components/Entity/EntityHeader/EntityHeader.component'; import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import { EntityDetailsObjectInterface } from '../../../components/Explore/explore.interface'; import AssetsTabs, { AssetsTabRef, } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.component'; import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import EntityDeleteModal from '../../../components/Modals/EntityDeleteModal/EntityDeleteModal'; import EntityNameModal from '../../../components/Modals/EntityNameModal/EntityNameModal.component'; +import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; import { OperationPermission, @@ -79,6 +78,7 @@ import { getDomainPath, } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; import StyleModal from '../../Modals/StyleModal/StyleModal.component'; import './data-products-details-page.less'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx index a8ff3d8eb284..1e6fd57d6b3c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx @@ -34,10 +34,10 @@ import { getDomainPath, } from '../../../utils/RouterUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../containers/PageLayoutV1'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../Loader/Loader'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import DataProductsDetailsPage from '../DataProductsDetailsPage/DataProductsDetailsPage.component'; const DataProductsPage = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.component.tsx index eadd1e3a4c9b..691fe13e47b3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.component.tsx @@ -14,7 +14,7 @@ import { Form, Modal, Select } from 'antd'; import { startCase } from 'lodash'; import React, { useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import RichTextEditor from '../../../components/common/rich-text-editor/RichTextEditor'; +import RichTextEditor from '../../../components/common/RichTextEditor/RichTextEditor'; import { EditorContentRef } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.interface'; import { TestCaseFailureReason, @@ -22,7 +22,7 @@ import { TestCaseFailureStatusType, } from '../../../generated/tests/testCase'; import { getCurrentMillis } from '../../../utils/date-time/DateTimeUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import { TestCaseStatusModalProps } from './TestCaseStatusModal.interface'; export const TestCaseStatusModal = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.test.tsx index 61260460be23..9ab2dd3711ea 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.test.tsx @@ -23,7 +23,7 @@ const mockProps: TestCaseStatusModalProps = { onSubmit: jest.fn().mockImplementation(() => Promise.resolve()), }; -jest.mock('../../../components/common/rich-text-editor/RichTextEditor', () => { +jest.mock('../../../components/common/RichTextEditor/RichTextEditor', () => { return forwardRef(jest.fn().mockReturnValue(
RichTextEditor
)); }); jest.mock('../../../generated/tests/testCase', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx index e142a25d96ea..c694bd1cebdb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx @@ -12,14 +12,14 @@ */ import { Col, Row } from 'antd'; import { AxiosError } from 'axios'; -import { PagingResponse } from 'Models'; import QueryString from 'qs'; import React, { ReactNode, useEffect, useMemo, useState } from 'react'; import { useHistory, useLocation, useParams } from 'react-router-dom'; -import { INITIAL_PAGING_VALUE, PAGE_SIZE } from '../../../constants/constants'; +import { PAGE_SIZE } from '../../../constants/constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { SearchIndex } from '../../../enums/search.enum'; import { TestCase } from '../../../generated/tests/testCase'; +import { usePaging } from '../../../hooks/paging/usePaging'; import { SearchHitBody, TestCaseSearchSource, @@ -32,9 +32,9 @@ import { ListTestCaseParams, } from '../../../rest/testAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface'; -import Searchbar from '../../common/searchbar/Searchbar'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; import DataQualityTab from '../../ProfilerDashboard/component/DataQualityTab'; import { DataQualitySearchParams } from '../DataQuality.interface'; @@ -57,13 +57,17 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { }, [location]); const { searchValue = '' } = params; - const [testCase, setTestCase] = useState>({ - data: [], - paging: { total: 0 }, - }); - + const [testCase, setTestCase] = useState([]); const [isLoading, setIsLoading] = useState(true); - const [currentPage, setCurrentPage] = useState(INITIAL_PAGING_VALUE); + + const { + currentPage, + handlePageChange, + pageSize, + handlePageSizeChange, + paging, + handlePagingChange, + } = usePaging(); const handleSearchParam = ( value: string | boolean, @@ -77,7 +81,7 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { const handleTestCaseUpdate = (data?: TestCase) => { if (data) { setTestCase((prev) => { - const updatedTestCase = prev.data.map((test) => + const updatedTestCase = prev.map((test) => test.id === data.id ? { ...test, ...data } : test ); @@ -89,12 +93,14 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { const fetchTestCases = async (params?: ListTestCaseParams) => { setIsLoading(true); try { - const response = await getListTestCase({ + const { data, paging } = await getListTestCase({ ...params, + limit: pageSize, fields: 'testDefinition,testCaseResult,testSuite', orderByLastExecutionDate: true, }); - setTestCase(response); + setTestCase(data); + handlePagingChange(paging); } catch (error) { showErrorToast(error as AxiosError); } finally { @@ -104,7 +110,7 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { const handleStatusSubmit = (testCase: TestCase) => { setTestCase((prev) => { - const data = prev.data.map((test) => { + const data = prev.map((test) => { if (test.fullyQualifiedName === testCase.fullyQualifiedName) { return testCase; } @@ -115,6 +121,7 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { return { ...prev, data }; }); }; + const searchTestCases = async (page = 1) => { setIsLoading(true); try { @@ -146,12 +153,10 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { return prev; }, [] as TestCase[]); - setTestCase({ - data: testSuites, - paging: { total: response.hits.total.value ?? 0 }, - }); + setTestCase(testSuites); + handlePagingChange({ total: response.hits.total.value ?? 0 }); } catch (error) { - setTestCase({ data: [], paging: { total: 0 } }); + setTestCase([]); } finally { setIsLoading(false); } @@ -163,14 +168,13 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { if (searchValue) { searchTestCases(currentPage); } else { - const { paging } = testCase; if (cursorType) { fetchTestCases({ [cursorType]: paging?.[cursorType], }); } } - setCurrentPage(currentPage); + handlePageChange(currentPage); }; useEffect(() => { @@ -185,7 +189,26 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { } else { setIsLoading(false); } - }, [tab, searchValue, testCasePermission]); + }, [tab, searchValue, testCasePermission, pageSize]); + + const pagingData = useMemo( + () => ({ + paging, + currentPage, + pagingHandler: handlePagingClick, + pageSize, + onShowSizeChange: handlePageSizeChange, + isNumberBased: Boolean(searchValue), + }), + [ + paging, + currentPage, + handlePagingClick, + pageSize, + handlePageSizeChange, + searchValue, + ] + ); if (!testCasePermission?.ViewAll && !testCasePermission?.ViewBasic) { return ; @@ -208,13 +231,8 @@ export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx index 4de35b60ff48..080e70574b0e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx @@ -68,12 +68,15 @@ jest.mock('react-router-dom', () => { useLocation: jest.fn().mockImplementation(() => mockLocation), }; }); -jest.mock('../../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); -jest.mock('../../../components/common/searchbar/Searchbar', () => { - return jest.fn().mockImplementation(() =>
Searchbar.component
); -}); +jest.mock( + '../../../components/common/SearchBarComponent/SearchBar.component', + () => { + return jest.fn().mockImplementation(() =>
Searchbar.component
); + } +); jest.mock( '../../../components/ProfilerDashboard/component/DataQualityTab', () => { @@ -83,7 +86,7 @@ jest.mock( } ); jest.mock( - '../../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest .fn() @@ -122,6 +125,7 @@ describe('TestCases component', () => { expect(mockGetListTestCase).toHaveBeenCalledWith({ fields: 'testDefinition,testCaseResult,testSuite', + limit: 15, orderByLastExecutionDate: true, }); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx index e04f2d6eda26..b366db793264 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx @@ -14,23 +14,24 @@ import { Button, Col, Row } from 'antd'; import { ColumnsType } from 'antd/lib/table'; import { AxiosError } from 'axios'; import { isString } from 'lodash'; -import { PagingResponse } from 'Models'; import QueryString from 'qs'; -import React, { ReactNode, useEffect, useMemo, useState } from 'react'; +import React, { + ReactNode, + useCallback, + useEffect, + useMemo, + useState, +} from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useParams } from 'react-router-dom'; -import { - getTableTabPath, - INITIAL_PAGING_VALUE, - PAGE_SIZE, - ROUTES, -} from '../../../constants/constants'; +import { getTableTabPath, ROUTES } from '../../../constants/constants'; import { PROGRESS_BAR_COLOR } from '../../../constants/TestSuite.constant'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { EntityTabs } from '../../../enums/entity.enum'; import { TestSummary } from '../../../generated/entity/data/table'; import { EntityReference } from '../../../generated/entity/type'; import { TestSuite } from '../../../generated/tests/testCase'; +import { usePaging } from '../../../hooks/paging/usePaging'; import { DataQualityPageTabs } from '../../../pages/DataQuality/DataQualityPage.interface'; import { getListTestSuites, @@ -40,10 +41,10 @@ import { import { getEntityName } from '../../../utils/EntityUtils'; import { getTestSuitePath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import FilterTablePlaceHolder from '../../common/error-with-placeholder/FilterTablePlaceHolder'; -import NextPrevious from '../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; import Table from '../../common/Table/Table'; import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; @@ -57,12 +58,16 @@ export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => { const { permissions } = usePermissionProvider(); const { testSuite: testSuitePermission } = permissions; - - const [testSuites, setTestSuites] = useState>({ - data: [], - paging: { total: 0 }, - }); - const [currentPage, setCurrentPage] = useState(INITIAL_PAGING_VALUE); + const [testSuites, setTestSuites] = useState([]); + const { + currentPage, + pageSize, + paging, + handlePageChange, + handlePageSizeChange, + handlePagingChange, + showPagination, + } = usePaging(); const [isLoading, setIsLoading] = useState(true); @@ -143,7 +148,8 @@ export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => { ? TestSuiteType.executable : TestSuiteType.logical, }); - setTestSuites(result); + setTestSuites(result.data); + handlePagingChange(result.paging); } catch (error) { showErrorToast(error as AxiosError); } finally { @@ -151,24 +157,26 @@ export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => { } }; - const handlePageChange = ({ - cursorType, - currentPage, - }: PagingHandlerParams) => { - const { paging } = testSuites; - if (isString(cursorType)) { - fetchTestSuites({ [cursorType]: paging?.[cursorType] }); - } - setCurrentPage(currentPage); - }; + const handleTestSuitesPageChange = useCallback( + ({ cursorType, currentPage }: PagingHandlerParams) => { + if (isString(cursorType)) { + fetchTestSuites({ + [cursorType]: paging?.[cursorType], + limit: pageSize, + }); + } + handlePageChange(currentPage); + }, + [pageSize, paging] + ); useEffect(() => { if (testSuitePermission?.ViewAll || testSuitePermission?.ViewBasic) { - fetchTestSuites(); + fetchTestSuites({ limit: pageSize }); } else { setIsLoading(false); } - }, [testSuitePermission]); + }, [testSuitePermission, pageSize]); if (!testSuitePermission?.ViewAll && !testSuitePermission?.ViewBasic) { return ; @@ -202,7 +210,7 @@ export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => { bordered columns={columns} data-testid="test-suite-table" - dataSource={testSuites.data} + dataSource={testSuites} loading={isLoading} locale={{ emptyText: , @@ -212,12 +220,13 @@ export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => { /> - {testSuites.paging.total > PAGE_SIZE && ( + {showPagination && ( )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx index 639236df2fa1..81194231eb29 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx @@ -53,11 +53,11 @@ jest.mock('react-router-dom', () => { useParams: jest.fn().mockImplementation(() => mockUseParam), }; }); -jest.mock('../../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); jest.mock( - '../../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest .fn() @@ -102,6 +102,7 @@ describe('TestSuites component', () => { ).toBeInTheDocument(); expect(mockGetListTestSuites).toHaveBeenCalledWith({ fields: 'owner,summary', + limit: 15, testSuiteType: 'executable', }); }); @@ -137,6 +138,7 @@ describe('TestSuites component', () => { ).toBeInTheDocument(); expect(mockGetListTestSuites).toHaveBeenCalledWith({ fields: 'owner,summary', + limit: 15, testSuiteType: 'logical', }); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx index 17b88af3f446..cfe5e2b1f340 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx @@ -34,7 +34,7 @@ import { getDaysCount, getTimestampLabel, } from '../../utils/DatePickerMenuUtils'; -import './DatePickerMenu.style.less'; +import './date-picker-menu.less'; interface DatePickerMenuProps { showSelectedCustomRange?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.style.less b/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/date-picker-menu.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/date-picker-menu.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomain/AddDomain.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomain/AddDomain.component.tsx index edf07bce700a..6b1e970c958a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomain/AddDomain.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomain/AddDomain.component.tsx @@ -24,7 +24,7 @@ import { getIsErrorMatch } from '../../../utils/CommonUtils'; import { getDomainPath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import ResizablePanels from '../../common/ResizablePanels/ResizablePanels'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import AddDomainForm from '../AddDomainForm/AddDomainForm.component'; import { DomainFormType } from '../DomainPage.interface'; import { useDomainProvider } from '../DomainProvider/DomainProvider'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx index 766678317556..e5de84f8b522 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx @@ -43,15 +43,14 @@ import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; import { ReactComponent as StyleIcon } from '../../../assets/svg/style.svg'; import { AssetSelectionModal } from '../../../components/Assets/AssetsSelectionModal/AssetSelectionModal'; import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import PageLayoutV1 from '../../../components/containers/PageLayoutV1'; import { EntityHeader } from '../../../components/Entity/EntityHeader/EntityHeader.component'; import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import { EntityDetailsObjectInterface } from '../../../components/Explore/explore.interface'; import AssetsTabs, { AssetsTabRef, } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.component'; import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import EntityNameModal from '../../../components/Modals/EntityNameModal/EntityNameModal.component'; +import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; import { OperationPermission, @@ -83,6 +82,7 @@ import { } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import DeleteWidgetModal from '../../common/DeleteWidget/DeleteWidgetModal'; +import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; import StyleModal from '../../Modals/StyleModal/StyleModal.component'; import AddDataProductModal from '../AddDataProductModal/AddDataProductModal.component'; import '../domain.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx index 3f57e97e2e76..f85170b287e1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx @@ -17,9 +17,9 @@ import { isEmpty } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Loader from '../../components/Loader/Loader'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; import { ROUTES } from '../../constants/constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx index 64bd49f058cf..2970a2ca63e5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx @@ -29,12 +29,12 @@ import { SearchIndex } from '../../../../enums/search.enum'; import { DataProduct } from '../../../../generated/entity/domains/dataProduct'; import { searchData } from '../../../../rest/miscAPI'; import { formatDataProductResponse } from '../../../../utils/APIUtils'; -import ErrorPlaceHolder from '../../../common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../../containers/PageLayoutV1'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import EntitySummaryPanel from '../../../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard'; import Loader from '../../../Loader/Loader'; -import { SourceType } from '../../../searched-data/SearchedData.interface'; +import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; +import { SourceType } from '../../../SearchedData/SearchedData.interface'; import { DataProductsTabProps } from './DataProductsTab.interface'; const DataProductsTab = forwardRef( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx index 770e8cc3f915..b5e507902984 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx @@ -16,7 +16,7 @@ import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; import { ReactComponent as PlusIcon } from '../../../../assets/svg/plus-primary.svg'; -import DescriptionV1 from '../../../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../../../components/common/EntityDescription/DescriptionV1'; import { UserSelectableList } from '../../../../components/common/UserSelectableList/UserSelectableList.component'; import { UserTeamSelectableList } from '../../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component'; import DomainExperts from '../../../../components/Domain/DomainExperts/DomainExperts.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.test.tsx index c4d0f20986a4..f2fe4e09640d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.test.tsx @@ -25,7 +25,7 @@ const defaultProps = { isVersionsView: false, }; -jest.mock('../../../common/description/DescriptionV1', () => { +jest.mock('../../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockImplementation(() =>
DescriptionV1
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx index 53bcb4d19c37..57531ca33003 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx @@ -26,10 +26,10 @@ import { getDomainVersionsPath, } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../containers/PageLayoutV1'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../Loader/Loader'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import DomainDetailsPage from '../DomainDetailsPage/DomainDetailsPage.component'; const DomainVersion = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.test.tsx index f3c47e88ccc7..26f5a10d59f9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.test.tsx @@ -104,7 +104,7 @@ jest.mock( } ); -jest.mock('../../../components/containers/PageLayoutV1', () => { +jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeader/EntityHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeader/EntityHeader.component.tsx index cdb02813dcbb..4b2bff18416d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeader/EntityHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeader/EntityHeader.component.tsx @@ -13,10 +13,10 @@ import classNames from 'classnames'; import React, { ReactNode } from 'react'; -import TitleBreadcrumb from '../../../components/common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../../../components/common/title-breadcrumb/title-breadcrumb.interface'; import { EntityType } from '../../../enums/entity.enum'; import { getEntityLinkFromType } from '../../../utils/EntityUtils'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; import EntityHeaderTitle from '../EntityHeaderTitle/EntityHeaderTitle.component'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx index b889d71fb528..a321e2c79ed1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx @@ -18,7 +18,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { Node } from 'reactflow'; -import DescriptionV1 from '../../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../../components/common/EntityDescription/DescriptionV1'; import { CSMode } from '../../../enums/codemirror.enum'; import { EntityType } from '../../../enums/entity.enum'; import { getNameFromFQN } from '../../../utils/CommonUtils'; @@ -26,12 +26,12 @@ import { getEntityName } from '../../../utils/EntityUtils'; import { getEncodedFqn } from '../../../utils/StringsUtils'; import { getEntityLink } from '../../../utils/TableUtils'; import Loader from '../../Loader/Loader'; -import SchemaEditor from '../../schema-editor/SchemaEditor'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; +import './entity-info-drawer.less'; import { EdgeInfoDrawerInfo, EdgeInformationType, } from './EntityInfoDrawer.interface'; -import './EntityInfoDrawer.style.less'; const EdgeInfoDrawer = ({ edge, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EntityInfoDrawer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EntityInfoDrawer.component.tsx index a222db652d64..35ea60c1d541 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EntityInfoDrawer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EntityInfoDrawer.component.tsx @@ -53,8 +53,8 @@ import StoredProcedureSummary from '../../Explore/EntitySummaryPanel/StoredProce import TableSummary from '../../Explore/EntitySummaryPanel/TableSummary/TableSummary.component'; import TopicSummary from '../../Explore/EntitySummaryPanel/TopicSummary/TopicSummary.component'; import { SelectedNode } from '../EntityLineage/EntityLineage.interface'; +import './entity-info-drawer.less'; import { LineageDrawerProps } from './EntityInfoDrawer.interface'; -import './EntityInfoDrawer.style.less'; const EntityInfoDrawer = ({ show, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EntityInfoDrawer.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/entity-info-drawer.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EntityInfoDrawer.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/entity-info-drawer.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx index 876a62ecc391..843ce506cf6d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx @@ -21,8 +21,8 @@ import { EntityReference } from '../../../../generated/entity/type'; import { getEntityName } from '../../../../utils/EntityUtils'; import Fqn from '../../../../utils/Fqn'; import { getEntityIcon } from '../../../../utils/TableUtils'; -import ErrorPlaceHolder from '../../../common/error-with-placeholder/ErrorPlaceHolder'; -import '../../../FeedEditor/FeedEditor.css'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import '../../../FeedEditor/feed-editor.less'; import './add-pipeline-modal.less'; interface AddPipeLineModalType { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.component.tsx index eaa9983b4203..6f2de7b357e8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.component.tsx @@ -113,7 +113,7 @@ import { } from '../../../utils/EntityUtils'; import SVGIcons from '../../../utils/SvgUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import Loader from '../../Loader/Loader'; import { useTourProvider } from '../../TourProvider/TourProvider'; import EdgeInfoDrawer from '../EntityInfoDrawer/EdgeInfoDrawer.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.interface.ts index 04a71fc6f106..41b618ffe1b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/EntityLineage.interface.ts @@ -18,7 +18,7 @@ import { EntityType } from '../../../enums/entity.enum'; import { Column } from '../../../generated/entity/data/container'; import { EntityReference } from '../../../generated/entity/type'; import { EntityLineage } from '../../../generated/type/entityLineage'; -import { SourceType } from '../../searched-data/SearchedData.interface'; +import { SourceType } from '../../SearchedData/SearchedData.interface'; export interface SelectedNode { name: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeSuggestions.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeSuggestions.component.tsx index 5273c1e9dfe2..a2fcd98f5672 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeSuggestions.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/NodeSuggestions.component.tsx @@ -36,7 +36,7 @@ import { } from '../../../utils/EntityLineageUtils'; import serviceUtilClassBase from '../../../utils/ServiceUtilClassBase'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { ExploreSearchIndex } from '../../Explore/explore.interface'; +import { ExploreSearchIndex } from '../../Explore/ExplorePage.interface'; import './node-suggestion.less'; interface EntitySuggestionProps extends HTMLAttributes { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx index 659567d7904e..ce6b1d2ba49b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx @@ -43,7 +43,7 @@ import { getEpochMillisForPastDays, } from '../../utils/date-time/DateTimeUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import './Execution.style.less'; +import './execution.less'; import ListView from './ListView/ListViewTab.component'; import TreeViewTab from './TreeView/TreeViewTab.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx index a40a0df83b0b..f0e39e0254c1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx @@ -22,7 +22,7 @@ import { getTableViewData, StatusIndicator, } from '../../../utils/executionUtils'; -import FilterTablePlaceHolder from '../../common/error-with-placeholder/FilterTablePlaceHolder'; +import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; interface ListViewProps { executions: Array | undefined; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Execution/execution.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Execution/execution.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx index 884e23571498..05c8a93fa462 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx @@ -40,7 +40,7 @@ import { elasticSearchFormat } from '../../../utils/QueryBuilderElasticsearchFor import { getEntityTypeFromSearchIndex } from '../../../utils/SearchUtils'; import Loader from '../../Loader/Loader'; import { AdvancedSearchModal } from '../AdvanceSearchModal.component'; -import { ExploreSearchIndex, UrlParams } from '../explore.interface'; +import { ExploreSearchIndex, UrlParams } from '../ExplorePage.interface'; import { AdvanceSearchContext, AdvanceSearchProviderProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/AppliedFilterText.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/AppliedFilterText.tsx index 8f14c6cfe970..45ec2729e17d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/AppliedFilterText.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/AppliedFilterText.tsx @@ -16,7 +16,7 @@ import React, { FC } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; -import './AppliedFilterText.less'; +import './applied-filter-text.less'; interface AppliedFilterTextProps { filterText: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/AppliedFilterText.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/applied-filter-text.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/AppliedFilterText.less rename to openmetadata-ui/src/main/resources/ui/src/components/Explore/AppliedFilterText/applied-filter-text.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx index 66ea58468b99..aac9781e9491 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx @@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next'; import { DataProduct } from '../../../../generated/entity/domains/dataProduct'; import { getEntityName } from '../../../../utils/EntityUtils'; import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; -import RichTextEditorPreviewer from '../../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; interface DataProductSummaryProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx index bd7a5f01e4e8..b4a49b1cf1a3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx @@ -45,7 +45,7 @@ import { } from '../../../utils/EntityUtils'; import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import { getEncodedFqn, stringToHTML } from '../../../utils/StringsUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Loader from '../../Loader/Loader'; import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; import { @@ -58,8 +58,8 @@ import DatabaseSchemaSummary from './DatabaseSchemaSummary/DatabaseSchemaSummary import DatabaseSummary from './DatabaseSummary/DatabaseSummary.component'; import DataModelSummary from './DataModelSummary/DataModelSummary.component'; import DataProductSummary from './DataProductSummary/DataProductSummary.component'; +import './entity-summary-panel.less'; import { EntitySummaryPanelProps } from './EntitySummaryPanel.interface'; -import './EntitySummaryPanel.style.less'; import GlossaryTermSummary from './GlossaryTermSummary/GlossaryTermSummary.component'; import MlModelSummary from './MlModelSummary/MlModelSummary.component'; import PipelineSummary from './PipelineSummary/PipelineSummary.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.interface.ts index 803353ba4fc2..e4d083298178 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { EntityDetailsObjectInterface } from '../explore.interface'; +import { EntityDetailsObjectInterface } from '../ExplorePage.interface'; export interface EntitySummaryPanelProps { entityDetails: EntityDetailsObjectInterface; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.interface.ts index 67cc15e905cb..b00bfb176f5a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.interface.ts @@ -11,10 +11,10 @@ * limitations under the License. */ -import { EntityServiceUnion } from '../../../../components/Explore/explore.interface'; import { ExplorePageTabs } from '../../../../enums/Explore.enum'; import { TagLabel } from '../../../../generated/type/tagLabel'; import { DRAWER_NAVIGATION_OPTIONS } from '../../../../utils/EntityUtils'; +import { EntityServiceUnion } from '../../ExplorePage.interface'; export interface ServiceSummaryProps { type: ExplorePageTabs; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx index 7420a919b20c..1ee372d02497 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx @@ -23,7 +23,7 @@ import { getEntityOverview, } from '../../../../utils/EntityUtils'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SchemaEditor from '../../../schema-editor/SchemaEditor'; +import SchemaEditor from '../../../SchemaEditor/SchemaEditor'; import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import { StoredProcedureSummaryProps } from './StoredProcedureSummary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx index a4a632d3df80..5e9fc3cfc198 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.component.tsx @@ -16,8 +16,8 @@ import { isEmpty, isUndefined } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { SummaryEntityType } from '../../../../enums/EntitySummary.enum'; +import './summary-list.less'; import { SummaryListProps } from './SummaryList.interface'; -import './SummaryList.style.less'; import SummaryListItems from './SummaryListItems/SummaryListItems.component'; const { Text } = Typography; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx index 454ebc834989..bf904c8f42a3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.component.tsx @@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next'; import { MAX_CHAR_LIMIT_ENTITY_SUMMARY } from '../../../../../constants/constants'; import { getTagValue } from '../../../../../utils/CommonUtils'; import { prepareConstraintIcon } from '../../../../../utils/TableUtils'; -import RichTextEditorPreviewer from '../../../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../../common/RichTextEditor/RichTextEditorPreviewer'; import TagsViewer from '../../../../Tag/TagsViewer/TagsViewer'; import { SummaryListItemProps } from './SummaryListItems.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.test.tsx index 5d9a033dbee9..6682a2d91135 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryListItems/SummaryListItems.test.tsx @@ -21,7 +21,7 @@ import { } from '../../mocks/SummaryListItems.mock'; import SummaryListItem from './SummaryListItems.component'; -jest.mock('../../../../common/rich-text-editor/RichTextEditorPreviewer', () => +jest.mock('../../../../common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() .mockImplementation(() => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/summary-list.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/SummaryList.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SummaryList/summary-list.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx index b5dfcdd5aef3..2899dc4fa067 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx @@ -16,10 +16,10 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { SearchIndex } from '../../../../enums/search.enum'; import { searchData } from '../../../../rest/miscAPI'; -import TableDataCardV2 from '../../../common/table-data-card-v2/TableDataCardV2'; -import { SourceType } from '../../../searched-data/SearchedData.interface'; +import TableDataCardV2 from '../../../common/TableDataCardV2/TableDataCardV2'; +import { SourceType } from '../../../SearchedData/SearchedData.interface'; import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; -import { EntityUnion } from '../../explore.interface'; +import { EntityUnion } from '../../ExplorePage.interface'; import { TagsSummaryProps } from './TagsSummary.interface'; function TagsSummary({ entityDetails, isLoading }: TagsSummaryProps) { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/entity-summary-panel.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/entity-summary-panel.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/exlore.mock.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.mock.ts similarity index 99% rename from openmetadata-ui/src/main/resources/ui/src/components/Explore/exlore.mock.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.mock.ts index 2b07416655e4..b65b98d66b0a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/exlore.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.mock.ts @@ -22,7 +22,7 @@ import { TagSource, } from '../../generated/entity/data/table'; import { SearchResponse } from '../../interface/search.interface'; -import { ExploreSearchIndex } from './explore.interface'; +import { ExploreSearchIndex } from './ExplorePage.interface'; export const MOCK_EXPLORE_SEARCH_RESULTS: SearchResponse = { hits: { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/explore.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExplorePage.interface.ts similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Explore/explore.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Explore/ExplorePage.interface.ts index 9d1825699cb0..5b8cf56f707c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/explore.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExplorePage.interface.ts @@ -13,7 +13,6 @@ import { ItemType } from 'antd/lib/menu/hooks/useItems'; import { DefaultOptionType } from 'antd/lib/select'; -import { SearchedDataProps } from '../../components/searched-data/SearchedData.interface'; import { SORT_ORDER } from '../../enums/common.enum'; import { SearchIndex } from '../../enums/search.enum'; import { Tag } from '../../generated/entity/classification/tag'; @@ -37,8 +36,9 @@ import { PipelineService } from '../../generated/entity/services/pipelineService import { SearchService } from '../../generated/entity/services/searchService'; import { StorageService } from '../../generated/entity/services/storageService'; import { Aggregations, SearchResponse } from '../../interface/search.interface'; -import { QueryFilterInterface } from '../../pages/explore/ExplorePage.interface'; +import { QueryFilterInterface } from '../../pages/ExplorePage/ExplorePage.interface'; import { SearchDropdownOption } from '../SearchDropdown/SearchDropdown.interface'; +import { SearchedDataProps } from '../SearchedData/SearchedData.interface'; export type UrlParams = { searchQuery: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.interface.ts index 5ac03c191d1c..d165e95e7016 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.interface.ts @@ -13,7 +13,7 @@ import { SearchIndex } from '../../enums/search.enum'; import { Aggregations } from '../../interface/search.interface'; -import { ExploreQuickFilterField } from './explore.interface'; +import { ExploreQuickFilterField } from './ExplorePage.interface'; export interface ExploreQuickFiltersProps { index: SearchIndex; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.test.tsx index 36e4bac68000..abc077d7b6f9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.test.tsx @@ -15,8 +15,8 @@ import { act, render } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; import { SearchIndex } from '../../enums/search.enum'; -import { ExploreQuickFilterField } from '../Explore/explore.interface'; import { SearchDropdownProps } from '../SearchDropdown/SearchDropdown.interface'; +import { ExploreQuickFilterField } from './ExplorePage.interface'; import ExploreQuickFilters from './ExploreQuickFilters'; import { mockAdvancedFieldDefaultOptions, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx index b0fd91f79ae4..38a17eb9d3af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/ExploreQuickFilters.tsx @@ -24,7 +24,7 @@ import { } from '../../constants/AdvancedSearch.constants'; import { TIER_FQN_KEY } from '../../constants/explore.constants'; import { SearchIndex } from '../../enums/search.enum'; -import { QueryFilterInterface } from '../../pages/explore/ExplorePage.interface'; +import { QueryFilterInterface } from '../../pages/ExplorePage/ExplorePage.interface'; import { getAggregateFieldOptions } from '../../rest/miscAPI'; import { getTags } from '../../rest/tagAPI'; import { getOptionsFromAggregationBucket } from '../../utils/AdvancedSearchUtils'; @@ -34,7 +34,7 @@ import { showErrorToast } from '../../utils/ToastUtils'; import SearchDropdown from '../SearchDropdown/SearchDropdown'; import { SearchDropdownOption } from '../SearchDropdown/SearchDropdown.interface'; import { useAdvanceSearch } from './AdvanceSearchProvider/AdvanceSearchProvider.component'; -import { ExploreSearchIndex } from './explore.interface'; +import { ExploreSearchIndex } from './ExplorePage.interface'; import { ExploreQuickFiltersProps } from './ExploreQuickFilters.interface'; const ExploreQuickFilters: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.interface.ts index 2754634fd401..caa75387b292 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { SearchedDataProps } from '../../searched-data/SearchedData.interface'; +import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; export interface ExploreSearchCardProps { id: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx index b5a693315bcf..54f001ff3053 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx @@ -37,7 +37,7 @@ import { getServiceIcon, getUsagePercentile, } from '../../../utils/TableUtils'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import TableDataCardBody from '../../TableDataCardBody/TableDataCardBody'; import { useTourProvider } from '../../TourProvider/TourProvider'; import './explore-search-card.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx index ddca6d390486..31b8612a5b1b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx @@ -31,30 +31,30 @@ import { isEmpty, isString, isUndefined, noop } from 'lodash'; import Qs from 'qs'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { useAdvanceSearch } from '../../components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component'; import AppliedFilterText from '../../components/Explore/AppliedFilterText/AppliedFilterText'; import EntitySummaryPanel from '../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import { - ExploreProps, - ExploreQuickFilterField, - ExploreSearchIndex, -} from '../../components/Explore/explore.interface'; -import { getSelectedValuesFromQuickFilter } from '../../components/Explore/Explore.utils'; import ExploreQuickFilters from '../../components/Explore/ExploreQuickFilters'; import SortingDropDown from '../../components/Explore/SortingDropDown'; -import SearchedData from '../../components/searched-data/SearchedData'; -import { SearchedDataProps } from '../../components/searched-data/SearchedData.interface'; import { tabsInfo } from '../../constants/explore.constants'; import { ERROR_PLACEHOLDER_TYPE, SORT_ORDER } from '../../enums/common.enum'; import { QueryFieldInterface, QueryFieldValueInterface, -} from '../../pages/explore/ExplorePage.interface'; +} from '../../pages/ExplorePage/ExplorePage.interface'; import { getDropDownItems } from '../../utils/AdvancedSearchUtils'; -import PageLayoutV1 from '../containers/PageLayoutV1'; +import { getSelectedValuesFromQuickFilter } from '../../utils/Explore.utils'; +import { + ExploreProps, + ExploreQuickFilterField, + ExploreSearchIndex, +} from '../Explore/ExplorePage.interface'; import Loader from '../Loader/Loader'; -import './ExploreV1.style.less'; +import PageLayoutV1 from '../PageLayoutV1/PageLayoutV1'; +import SearchedData from '../SearchedData/SearchedData'; +import { SearchedDataProps } from '../SearchedData/SearchedData.interface'; +import './exploreV1.less'; const ExploreV1: React.FC = ({ aggregations, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx index 61235824d6e7..ce4ead8150e8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx @@ -13,12 +13,12 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; +import { SearchIndex } from '../../enums/search.enum'; import { MOCK_EXPLORE_SEARCH_RESULTS, MOCK_EXPLORE_TAB_ITEMS, -} from '../../components/Explore/exlore.mock'; -import { ExploreSearchIndex } from '../../components/Explore/explore.interface'; -import { SearchIndex } from '../../enums/search.enum'; +} from '../Explore/Explore.mock'; +import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; import ExploreV1 from './ExploreV1.component'; jest.mock('react-router-dom', () => ({ @@ -29,7 +29,7 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.style.less b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/exploreV1.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/exploreV1.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx index cb82bd72329b..200acb18d482 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx @@ -36,8 +36,8 @@ import { HTMLToMarkdown, matcher } from '../../utils/FeedUtils'; import { LinkBlot } from '../../utils/QuillLink/QuillLink'; import { insertMention, insertRef } from '../../utils/QuillUtils'; import { getEntityIcon } from '../../utils/TableUtils'; -import { editorRef } from '../common/rich-text-editor/RichTextEditor.interface'; -import './FeedEditor.css'; +import { editorRef } from '../common/RichTextEditor/RichTextEditor.interface'; +import './feed-editor.less'; import { FeedEditorProp } from './FeedEditor.interface'; Quill.register('modules/markdownOptions', QuillMarkdown); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.css b/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/feed-editor.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.css rename to openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/feed-editor.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx index 6f21ccad4f47..97a363c76521 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ExploreSearchIndex } from '../../components/Explore/explore.interface'; +import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; export interface GlobalSearchContextType { searchCriteria: ExploreSearchIndex | ''; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx index db34a2465b17..084f2afae52b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx @@ -12,7 +12,7 @@ */ import React, { FC, ReactNode, useContext, useState } from 'react'; -import { ExploreSearchIndex } from '../../components/Explore/explore.interface'; +import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; import { GlobalSearchContextType } from './GlobalSearchProvider.interface'; export const GlobalSearchContext = React.createContext( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.less b/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.less rename to openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx index 152b645aa648..0820e7b01296 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.component.tsx @@ -29,9 +29,9 @@ import { } from '../../../interface/FormUtils.interface'; import { getEntityName } from '../../../utils/EntityUtils'; import { generateFormFields, getField } from '../../../utils/formUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import ResizablePanels from '../../common/ResizablePanels/ResizablePanels'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import { UserTag } from '../../common/UserTag/UserTag.component'; import { UserTagSize } from '../../common/UserTag/UserTag.interface'; import { AddGlossaryProps } from './AddGlossary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.interface.ts index 004552a032b4..54eb009b84c4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossary/AddGlossary.interface.ts @@ -12,7 +12,7 @@ */ import { CreateGlossary } from '../../../generated/api/data/createGlossary'; -import { TitleBreadcrumbProps } from '../../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface AddGlossaryProps { header: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx index 818b88655dad..b86762d44680 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/AddGlossaryTermForm/AddGlossaryTermForm.component.tsx @@ -34,7 +34,7 @@ import { formatSearchGlossaryTermResponse } from '../../../utils/APIUtils'; import { getEntityName } from '../../../utils/EntityUtils'; import { generateFormFields, getField } from '../../../utils/formUtils'; import { getEntityReferenceFromGlossaryTerm } from '../../../utils/GlossaryUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import { UserTag } from '../../common/UserTag/UserTag.component'; import { UserTagSize } from '../../common/UserTag/UserTag.interface'; import { AddGlossaryTermFormProps } from './AddGlossaryTermForm.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx index 4deb66f0426b..9450f6d2dd75 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx @@ -23,16 +23,16 @@ import { ChangeDescription } from '../../../generated/entity/type'; import { getFeedCounts } from '../../../utils/CommonUtils'; import { getEntityVersionByField } from '../../../utils/EntityVersionUtils'; import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import DescriptionV1 from '../../common/description/DescriptionV1'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; import TabsLabel from '../../TabsLabel/TabsLabel.component'; import GlossaryDetailsRightPanel from '../GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component'; import GlossaryHeader from '../GlossaryHeader/GlossaryHeader.component'; import GlossaryTermTab from '../GlossaryTermTab/GlossaryTermTab.component'; +import './glossary-details.less'; import { GlossaryDetailsProps, GlossaryTabs, } from './GlossaryDetails.interface'; -import './GlossaryDetails.style.less'; const GlossaryDetails = ({ permissions, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/glossary-details.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/glossary-details.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx index 6561ed850049..7e95bf72c416 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx @@ -39,7 +39,6 @@ import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; import { ReactComponent as StyleIcon } from '../../../assets/svg/style.svg'; import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; import StatusBadge from '../../../components/common/StatusBadge/StatusBadge.component'; -import { TitleBreadcrumbProps } from '../../../components/common/title-breadcrumb/title-breadcrumb.interface'; import { useEntityExportModalProvider } from '../../../components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; import { EntityHeader } from '../../../components/Entity/EntityHeader/EntityHeader.component'; import EntityDeleteModal from '../../../components/Modals/EntityDeleteModal/EntityDeleteModal'; @@ -74,7 +73,8 @@ import { } from '../../../utils/RouterUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; import StyleModal from '../../Modals/StyleModal/StyleModal.component'; export interface GlossaryHeaderProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.test.tsx index 3dd81c324b29..b2e7361bcd6c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.test.tsx @@ -40,7 +40,7 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../../common/description/DescriptionV1', () => { +jest.mock('../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockImplementation(() =>
Description
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx index 4ea94488a272..301f2e3bb927 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx @@ -35,9 +35,9 @@ import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { ReactComponent as DownUpArrowIcon } from '../../../assets/svg/ic-down-up-arrow.svg'; import { ReactComponent as UpDownArrowIcon } from '../../../assets/svg/ic-up-down-arrow.svg'; import { ReactComponent as PlusOutlinedIcon } from '../../../assets/svg/plus-outlined.svg'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { OwnerLabel } from '../../../components/common/OwnerLabel/OwnerLabel.component'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import StatusBadge from '../../../components/common/StatusBadge/StatusBadge.component'; import Loader from '../../../components/Loader/Loader'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx index d8a3e96b1207..e17861f47ec8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx @@ -53,14 +53,14 @@ jest.mock('../../../rest/glossaryAPI', () => ({ .mockImplementation(() => Promise.resolve({ data: mockedGlossaryTerms })), patchGlossaryTerm: jest.fn().mockImplementation(() => Promise.resolve()), })); -jest.mock('../../common/rich-text-editor/RichTextEditorPreviewer', () => +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() .mockImplementation(({ markdown }) => (

{markdown}

)) ); -jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest .fn() .mockImplementation(({ onClick }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts index 5c74cfcad940..a653b3d7ea3e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; -import { EntityDetailsObjectInterface } from '../../Explore/explore.interface'; +import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; import { VotingDataProps } from '../../Voting/voting.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx index 0b4db3c50548..2fbce865558d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx @@ -11,6 +11,7 @@ * limitations under the License. */ +import { FilterOutlined, PlusOutlined } from '@ant-design/icons'; import { Badge, Button, @@ -25,6 +26,7 @@ import { Tooltip, Typography, } from 'antd'; +import { AxiosError } from 'axios'; import classNames from 'classnames'; import { t } from 'i18next'; import { isEmpty, isObject } from 'lodash'; @@ -43,27 +45,24 @@ import { ASSET_MENU_KEYS, ASSET_SUB_MENU_FILTER, } from '../../../../constants/Assets.constants'; -import { PAGE_SIZE } from '../../../../constants/constants'; import { GLOSSARIES_DOCS } from '../../../../constants/docs.constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; import { EntityType } from '../../../../enums/entity.enum'; import { SearchIndex } from '../../../../enums/search.enum'; +import { usePaging } from '../../../../hooks/paging/usePaging'; import { searchData } from '../../../../rest/miscAPI'; import { getCountBadge, Transi18next } from '../../../../utils/CommonUtils'; +import { getEntityTypeFromSearchIndex } from '../../../../utils/SearchUtils'; +import { getEntityIcon } from '../../../../utils/TableUtils'; import { showErrorToast } from '../../../../utils/ToastUtils'; -import NextPrevious from '../../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../../common/next-previous/NextPrevious.interface'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard'; import { SearchedDataProps, SourceType, -} from '../../../searched-data/SearchedData.interface'; - -import { FilterOutlined, PlusOutlined } from '@ant-design/icons'; -import { AxiosError } from 'axios'; -import { getEntityTypeFromSearchIndex } from '../../../../utils/SearchUtils'; -import { getEntityIcon } from '../../../../utils/TableUtils'; -import ErrorPlaceHolder from '../../../common/error-with-placeholder/ErrorPlaceHolder'; +} from '../../../SearchedData/SearchedData.interface'; import './assets-tabs.less'; import { AssetsOfEntity, AssetsTabsProps } from './AssetsTabs.interface'; @@ -95,8 +94,16 @@ const AssetsTabs = forwardRef( const { fqn } = useParams<{ fqn: string }>(); const [isLoading, setIsLoading] = useState(true); const [data, setData] = useState([]); - const [total, setTotal] = useState(0); - const [currentPage, setCurrentPage] = useState(1); + const { + currentPage, + pageSize, + paging, + handlePageChange, + handlePageSizeChange, + handlePagingChange, + showPagination, + } = usePaging(); + const [selectedCard, setSelectedCard] = useState(); const [visible, setVisible] = useState(false); const [openKeys, setOpenKeys] = useState([]); @@ -125,7 +132,7 @@ const AssetsTabs = forwardRef( const fetchAssets = useCallback( async ({ index = activeFilter, - page = 1, + page = currentPage, }: { index?: SearchIndex[]; page?: number; @@ -135,7 +142,7 @@ const AssetsTabs = forwardRef( const res = await searchData( '', page, - PAGE_SIZE, + pageSize, queryParam, '', '', @@ -152,7 +159,7 @@ const AssetsTabs = forwardRef( )?.label; // Update states - setTotal(totalCount); + handlePagingChange({ total: totalCount }); entityType && setItemCount((prevCount) => ({ ...prevCount, @@ -168,7 +175,7 @@ const AssetsTabs = forwardRef( setIsLoading(false); } }, - [activeFilter, currentPage] + [activeFilter, currentPage, pageSize] ); const onOpenChange: MenuProps['onOpenChange'] = (keys) => { const latestOpenKey = keys.find( @@ -274,7 +281,7 @@ const AssetsTabs = forwardRef( }, [ getEntityIcon, - setCurrentPage, + handlePageChange, handleActiveFilter, setSelectedCard, activeFilter, @@ -434,15 +441,16 @@ const AssetsTabs = forwardRef( source={_source} /> ))} - {total > PAGE_SIZE && data.length > 0 && ( + {showPagination && ( - setCurrentPage(currentPage) + handlePageChange(currentPage) } + onShowSizeChange={handlePageSizeChange} /> )} @@ -451,12 +459,14 @@ const AssetsTabs = forwardRef( ), [ data, - total, + paging, currentPage, selectedCard, assetErrorPlaceHolder, setSelectedCard, - setCurrentPage, + handlePageChange, + showPagination, + handlePageSizeChange, ] ); @@ -475,7 +485,7 @@ const AssetsTabs = forwardRef( selectedKeys={activeFilter} style={{ width: 256, height: 340 }} onClick={(value) => { - setCurrentPage(1); + handlePageChange(1); handleActiveFilter(value.key as SearchIndex); setSelectedCard(undefined); }} @@ -534,7 +544,7 @@ const AssetsTabs = forwardRef( index: isEmpty(activeFilter) ? [SearchIndex.ALL] : activeFilter, page: currentPage, }); - }, [activeFilter, currentPage]); + }, [activeFilter, currentPage, pageSize]); useImperativeHandle(ref, () => ({ refreshAssets() { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts index 48b09acc7a3f..60b4e43cec76 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { EntityDetailsObjectInterface } from '../../../Explore/explore.interface'; +import { EntityDetailsObjectInterface } from '../../../Explore/ExplorePage.interface'; import { OperationPermission } from '../../../PermissionProvider/PermissionProvider.interface'; export enum AssetsOfEntity { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx index 89150582ee39..fe46c31462b3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx @@ -22,7 +22,7 @@ import { getEntityVersionByField, getEntityVersionTags, } from '../../../../utils/EntityVersionUtils'; -import DescriptionV1 from '../../../common/description/DescriptionV1'; +import DescriptionV1 from '../../../common/EntityDescription/DescriptionV1'; import { OperationPermission } from '../../../PermissionProvider/PermissionProvider.interface'; import TagsInput from '../../../TagsInput/TagsInput.component'; import GlossaryDetailsRightPanel from '../../GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.test.tsx index 555141908c66..6a6a8c19cb5a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.test.tsx @@ -29,7 +29,7 @@ jest.mock('./GlossaryTermReferences', () => { return jest.fn().mockReturnValue(

GlossaryTermReferences

); }); -jest.mock('../../../common/description/DescriptionV1', () => { +jest.mock('../../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockReturnValue(

Description

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx index 5aa906c0d056..7955d6233108 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx @@ -17,8 +17,8 @@ import { cloneDeep, isEmpty } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; +import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; import Loader from '../../components/Loader/Loader'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; import { HTTP_STATUS_CODE } from '../../constants/auth.constants'; import { API_RES_MAX_SIZE, @@ -48,7 +48,7 @@ import GlossaryDetails from './GlossaryDetails/GlossaryDetails.component'; import GlossaryTermModal from './GlossaryTermModal/GlossaryTermModal.component'; import GlossaryTermsV1 from './GlossaryTerms/GlossaryTermsV1.component'; import { GlossaryV1Props } from './GlossaryV1.interfaces'; -import './GlossaryV1.style.less'; +import './glossaryV1.less'; import ImportGlossary from './ImportGlossary/ImportGlossary'; const GlossaryV1 = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts index 3e4bb0aa5955..c8fab0e7ab83 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts @@ -11,10 +11,10 @@ * limitations under the License. */ import { LoadingState } from 'Models'; -import { EntityDetailsObjectInterface } from '../../components/Explore/explore.interface'; import { VotingDataProps } from '../../components/Voting/voting.interface'; import { Glossary } from '../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../generated/entity/data/glossaryTerm'; +import { EntityDetailsObjectInterface } from '../Explore/ExplorePage.interface'; export type GlossaryV1Props = { deleteStatus: LoadingState; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx index c8169da4bc79..7cb6da166d7e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx @@ -97,11 +97,11 @@ jest.mock('./GlossaryTerms/GlossaryTermsV1.component', () => { return jest.fn().mockReturnValue(<>Glossary-Term component); }); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => { +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest.fn().mockReturnValue(<>TitleBreadcrumb); }); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockReturnValue(
Breadcrumb
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx index 12b2b9ca4fc7..d579819a38a9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx @@ -30,8 +30,8 @@ import { getGlossaryVersionsPath, } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import PageLayoutV1 from '../../containers/PageLayoutV1'; import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import GlossaryV1Component from '../GlossaryV1.component'; interface GlossaryVersionProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.test.tsx index f48122b2a7eb..a0ee405936b9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.test.tsx @@ -60,7 +60,7 @@ jest.mock('../GlossaryV1.component', () => { return jest.fn().mockReturnValue(<>Glossary component); }); -jest.mock('../../containers/PageLayoutV1', () => { +jest.mock('../../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx index ae83330cadef..eddb32f3135c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx @@ -28,7 +28,7 @@ const mockCsvImportResult = { success,Entity created,,Glossary2 term2,Glossary2 term2,Description data.,,,,\r`, } as CSVImportResult; -jest.mock('../../common/title-breadcrumb/title-breadcrumb.component', () => +jest.mock('../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockReturnValue(
Breadcrumb
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.tsx index d9d7aac25a0f..39628da2edf6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.tsx @@ -20,10 +20,10 @@ import { importGlossaryInCSVFormat } from '../../../rest/glossaryAPI'; import { getGlossaryPath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import { EntityImport } from '../../common/EntityImport/EntityImport.component'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../../common/title-breadcrumb/title-breadcrumb.interface'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; import { GlossaryImportResult } from '../ImportResult/GlossaryImportResult.component'; -import './ImportGlossary.less'; +import './import-glossary.less'; interface Props { glossaryName: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.less b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/import-glossary.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.less rename to openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/import-glossary.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Glossary/glossaryV1.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx index 5372fd6d2694..79c80985e9e9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx @@ -17,11 +17,11 @@ import classNames from 'classnames'; import { isEmpty, lowerCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolderIngestion from '../../components/common/error-with-placeholder/ErrorPlaceHolderIngestion'; +import ErrorPlaceHolderIngestion from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import { getEncodedFqn } from '../../utils/StringsUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import Searchbar from '../common/searchbar/Searchbar'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; import EntityDeleteModal from '../Modals/EntityDeleteModal/EntityDeleteModal'; import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx index 015b4b29015e..847570b30441 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx @@ -67,7 +67,7 @@ const mockTriggerIngestion = jest .fn() .mockImplementation(() => Promise.resolve()); -jest.mock('../common/searchbar/Searchbar', () => { +jest.mock('../common/SearchBarComponent/SearchBar.component', () => { return jest.fn().mockImplementation(() =>
Searchbar
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx index 0d8525a91729..68a0d0e1dd71 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx @@ -14,16 +14,15 @@ import { Space, Tooltip, Typography } from 'antd'; import { ColumnsType } from 'antd/lib/table'; import cronstrue from 'cronstrue'; -import { isNil } from 'lodash'; -import React, { useMemo, useState } from 'react'; +import React, { useCallback, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import NextPrevious from '../../components/common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; import Table from '../../components/common/Table/Table'; -import { PAGE_SIZE } from '../../constants/constants'; import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { usePaging } from '../../hooks/paging/usePaging'; import { getEntityName } from '../../utils/EntityUtils'; import { getErrorPlaceHolder } from '../../utils/IngestionUtils'; +import NextPrevious from '../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; import { IngestionListTableProps } from './IngestionListTable.interface'; import { IngestionRecentRuns } from './IngestionRecentRun/IngestionRecentRuns.component'; import PipelineActions from './PipelineActions.component'; @@ -48,19 +47,31 @@ function IngestionListTable({ isLoading = false, }: IngestionListTableProps) { const { t } = useTranslation(); - const [ingestionCurrentPage, setIngestionCurrentPage] = useState(1); - const ingestionPagingHandler = ({ - cursorType, + const { currentPage, - }: PagingHandlerParams) => { - if (cursorType) { - const pagingString = `&${cursorType}=${paging[cursorType]}`; + pageSize, + handlePageChange, + handlePageSizeChange, + handlePagingChange, + showPagination, + } = usePaging(10); - onIngestionWorkflowsUpdate(pagingString); - setIngestionCurrentPage(currentPage); - } - }; + useEffect(() => { + handlePagingChange(paging); + }, [paging]); + + const ingestionPagingHandler = useCallback( + ({ cursorType, currentPage }: PagingHandlerParams) => { + if (cursorType) { + const pagingString = `&${cursorType}=${paging[cursorType]}`; + + onIngestionWorkflowsUpdate(pagingString); + handlePageChange(currentPage); + } + }, + [paging, handlePageChange, onIngestionWorkflowsUpdate] + ); const renderNameField = (text: string, record: IngestionPipeline) => { return airflowEndpoint ? ( @@ -175,13 +186,6 @@ function IngestionListTable({ ] ); - const showNextPrevious = useMemo( - () => - Boolean(!isNil(paging.after) || !isNil(paging.before)) && - paging.total > PAGE_SIZE, - [paging] - ); - return ( - {showNextPrevious && ( + {showPagination && ( )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx index b24f5d0e0abd..4177331c904c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { mockIngestionListTableProps } from '../../mocks/IngestionListTable.mock'; import IngestionListTable from './IngestionListTable.component'; -jest.mock('../../components/common/next-previous/NextPrevious', () => +jest.mock('../../components/common/NextPrevious/NextPrevious', () => jest.fn().mockImplementation(() =>
nextPrevious
) ); jest.mock('../../components/Loader/Loader', () => @@ -72,7 +72,7 @@ describe('IngestionListTable tests', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx index 21d62c91d83a..38e7e98f4d6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx @@ -19,12 +19,9 @@ import { IngestionPipelineList } from './IngestionPipelineList.component'; const mockGetIngestinoPipelines = jest.fn(); const mockBulkDeployPipelines = jest.fn(); -jest.mock( - '../../common/error-with-placeholder/ErrorPlaceHolderIngestion', - () => { - return jest.fn().mockImplementation(() =>

Airflow not available

); - } -); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion', () => { + return jest.fn().mockImplementation(() =>

Airflow not available

); +}); jest.mock('../../../hooks/useAirflowStatus', () => ({ ...jest.requireActual('../../../hooks/useAirflowStatus'), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx index c751fe6f7165..819f50d8151b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx @@ -28,15 +28,14 @@ import { deployIngestionPipelineById, getIngestionPipelines, } from '../../../rest/ingestionPipelineAPI'; -import { showPagination } from '../../../utils/CommonUtils'; import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityTypeFromServiceCategory } from '../../../utils/ServiceUtils'; import { FilterIcon } from '../../../utils/TableUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import ErrorPlaceHolderIngestion from '../../common/error-with-placeholder/ErrorPlaceHolderIngestion'; -import NextPrevious from '../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import ErrorPlaceHolderIngestion from '../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; import Loader from '../../Loader/Loader'; import { ColumnFilter } from '../../Table/ColumnFilter/ColumnFilter.component'; import { IngestionRecentRuns } from '../IngestionRecentRun/IngestionRecentRuns.component'; @@ -66,6 +65,7 @@ export const IngestionPipelineList = ({ handlePagingChange, pageSize, handlePageSizeChange, + showPagination, } = usePaging(); const { t } = useTranslation(); @@ -289,7 +289,7 @@ export const IngestionPipelineList = ({ /> - {showPagination(paging) && ( + {showPagination && ( { return jest.fn(() =>

Table

); }); -jest.mock('../../components/common/searchbar/Searchbar', () => { - return jest.fn().mockImplementation(() =>

Searchbar

); -}); +jest.mock( + '../../components/common/SearchBarComponent/SearchBar.component', + () => { + return jest.fn().mockImplementation(() =>

Searchbar

); + } +); describe('ListView component', () => { it('should render toggle button for card and table', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx index 653bf2b393d4..63d8e2e6f51f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx @@ -198,11 +198,11 @@ jest.mock('../../components/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description

); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); }); @@ -221,7 +221,7 @@ jest.mock('../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel', () => { return jest.fn().mockReturnValue(

ActivityThreadPanel

); }); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx index 19cf907a0c43..dfe68a568544 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx @@ -21,12 +21,12 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../components/Tag/TagsViewer/TagsViewer.interface'; @@ -47,7 +47,7 @@ import { getTagsWithoutTier, getTierTags } from '../../utils/TableUtils'; import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx index 5efc00685f1f..884626f2c464 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx @@ -122,7 +122,7 @@ jest.mock('../../utils/CommonUtils', () => ({ getHtmlForNonAdminAction: jest.fn().mockReturnValue('admin action'), })); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx index d7ce761fb8d0..43a744009628 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx @@ -22,7 +22,7 @@ import { EntityType } from '../../enums/entity.enum'; import { MlFeature } from '../../generated/entity/data/mlmodel'; import { TagSource } from '../../generated/type/schema'; import { createTagObject } from '../../utils/TagsUtils'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { MlModelFeaturesListProp } from './MlModel.interface'; import SourceList from './SourceList.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx index 40a9e64b3db5..446a9def07c4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx @@ -19,7 +19,7 @@ import { Link } from 'react-router-dom'; import { EntityType } from '../../enums/entity.enum'; import { MlFeature } from '../../generated/entity/data/mlmodel'; import { getEntityLink } from '../../utils/TableUtils'; -import './SourceList.style.less'; +import './source-list.less'; const SourceList = ({ feature }: { feature: MlFeature }) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.style.less b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/source-list.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/source-list.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx index 41ba615c5147..afbc3af46ffc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx @@ -26,9 +26,9 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import SourceList from '../../components/MlModelDetail/SourceList.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx index b77cf2d1d63e..3f0d557539f8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Mlmodel } from '../../generated/entity/data/mlmodel'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface MlModelVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx index 7650d66bfaa4..fbbeafc3a995 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx @@ -44,13 +44,12 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', - () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) +jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => + jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); jest.mock( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.test.tsx index bb759d76faf1..441d1cc3d268 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.test.tsx @@ -45,7 +45,7 @@ jest.mock('../../../utils/ToastUtils', () => ({ showSuccessToast: jest.fn(), })); -jest.mock('../../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../../common/RichTextEditor/RichTextEditor', () => { return jest.fn().mockReturnValue(
RichTextEditor
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx index ede13f0b2092..3fde8455af4f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx @@ -25,9 +25,9 @@ import { postThread } from '../../../rest/feedsAPI'; import { getTimeZone } from '../../../utils/date-time/DateTimeUtils'; import { getEntityFeedLink } from '../../../utils/EntityUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import RichTextEditor from '../../common/rich-text-editor/RichTextEditor'; -import './AnnouncementModal.less'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; +import './announcement-modal.less'; interface Props { open: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.test.tsx index 7799ded6e2f8..9a65548695e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.test.tsx @@ -25,7 +25,7 @@ jest.mock('../../../utils/EntityUtils', () => ({ getEntityFeedLink: jest.fn(), })); -jest.mock('../../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../../common/RichTextEditor/RichTextEditor', () => { return jest.fn().mockReturnValue(
RichTextEditor
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx index b2461f51d989..2943402b472c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/EditAnnouncementModal.tsx @@ -20,9 +20,9 @@ import { VALIDATION_MESSAGES } from '../../../constants/constants'; import { AnnouncementDetails } from '../../../generated/entity/feed/thread'; import { getTimeZone } from '../../../utils/date-time/DateTimeUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import RichTextEditor from '../../common/rich-text-editor/RichTextEditor'; +import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; import { CreateAnnouncement } from './AddAnnouncementModal'; -import './AnnouncementModal.less'; +import './announcement-modal.less'; interface Props { announcement: AnnouncementDetails; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AnnouncementModal.less b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/announcement-modal.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AnnouncementModal.less rename to openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/announcement-modal.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.test.tsx index c0daf8af4bb7..414015a55032 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.test.tsx @@ -20,7 +20,7 @@ const mockOnSave = jest.fn(); const mockOnCancel = jest.fn(); const mockValue = 'Test value'; -jest.mock('../../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(({ initialValue }, ref) => { return
{initialValue}MarkdownWithPreview component
; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx index 9228a99687e2..473c76c0f5f5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx @@ -16,13 +16,13 @@ import { AxiosError } from 'axios'; import React, { FunctionComponent, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { showErrorToast } from '../../../utils/ToastUtils'; -import RichTextEditor from '../../common/rich-text-editor/RichTextEditor'; +import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; import Loader from '../../Loader/Loader'; +import './modal-with-markdown-editor.less'; import { EditorContentRef, ModalWithMarkdownEditorProps, } from './ModalWithMarkdownEditor.interface'; -import './ModalWithMarkdownEditor.style.less'; export const ModalWithMarkdownEditor: FunctionComponent = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/modal-with-markdown-editor.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/modal-with-markdown-editor.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts index 5d9258d63588..060e2cb50801 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts @@ -12,7 +12,7 @@ */ import { HTMLAttributes } from 'react'; -import { SampleDataType } from '../../SampleDataTable/sample.interface'; +import { SampleDataType } from '../../SampleDataTable/SampleData.interface'; export interface SchemaModalProp extends HTMLAttributes { onClose: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx index 447c3cad8577..66e3c94189a8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx @@ -24,7 +24,7 @@ const mockProp = { data: {}, }; -jest.mock('../../schema-editor/SchemaEditor', () => { +jest.mock('../../SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(
SchemaEditor
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx index b70eecd5516f..65b1d41190af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx @@ -16,10 +16,10 @@ import classNames from 'classnames'; import { t } from 'i18next'; import { clone } from 'lodash'; import React, { FC, useEffect, useState } from 'react'; -import SchemaEditor from '../../schema-editor/SchemaEditor'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import CloseIcon from '../CloseIcon.component'; +import './schema-modal.less'; import { SchemaModalProp } from './SchemaModal.interface'; -import './SchemaModal.style.less'; const SchemaModal: FC = ({ className, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/schema-modal.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/schema-modal.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/ChangeLogs.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/ChangeLogs.tsx index 5651b00bd826..e32b1b6cb5cd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/ChangeLogs.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/ChangeLogs.tsx @@ -14,7 +14,7 @@ /* eslint-disable max-len */ import React from 'react'; -import RichTextEditorPreviewer from '../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; type Props = { data: { [name: string]: string }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/FeaturesCarousel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/FeaturesCarousel.tsx index b2ed066e46d9..e342d8d11965 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/FeaturesCarousel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/FeaturesCarousel.tsx @@ -14,7 +14,7 @@ import { Carousel } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; -import RichTextEditorPreviewer from '../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; import { FeaturesCarouselProps } from './FeaturesCarousel.interface'; const FeaturesCarousel = ({ data }: FeaturesCarouselProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component.tsx index 004c9542c2a9..5f134aa16747 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component.tsx @@ -22,10 +22,9 @@ import { ReactComponent as PlayIcon } from '../../../../assets/svg/ic-play-butto import { ReactComponent as StarIcon } from '../../../../assets/svg/ic-star.svg'; import { BLACK_COLOR, ROUTES } from '../../../../constants/constants'; import { useAuth } from '../../../../hooks/authHooks'; +import { getReleaseVersionExpiry } from '../../../../utils/WhatsNewModal.util'; import { COOKIE_VERSION, LATEST_VERSION_ID, WHATS_NEW } from '../whatsNewData'; import WhatsNewModal from '../WhatsNewModal'; -import '../WhatsNewModal.styles.less'; -import { getReleaseVersionExpiry } from '../WhatsNewModal.util'; const cookieStorage = new CookieStorage(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewModal.tsx index 1dd11f561b8f..98663cc84ba3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewModal.tsx @@ -17,14 +17,14 @@ import { CookieStorage } from 'cookie-storage'; import { t } from 'i18next'; import React, { FunctionComponent, useEffect, useState } from 'react'; import { DE_ACTIVE_COLOR, PRIMERY_COLOR } from '../../../constants/constants'; +import { getReleaseVersionExpiry } from '../../../utils/WhatsNewModal.util'; import CloseIcon from '../CloseIcon.component'; import { VersionIndicatorIcon } from '../VersionIndicatorIcon.component'; import ChangeLogs from './ChangeLogs'; import FeaturesCarousel from './FeaturesCarousel'; +import './whats-new-modal.less'; import { COOKIE_VERSION, LATEST_VERSION_ID, WHATS_NEW } from './whatsNewData'; import { ToggleType, WhatsNewModalProps } from './WhatsNewModal.interface'; -import './WhatsNewModal.styles.less'; -import { getReleaseVersionExpiry } from './WhatsNewModal.util'; const cookieStorage = new CookieStorage(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewModal.styles.less b/openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/whats-new-modal.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/WhatsNewModal.styles.less rename to openmetadata-ui/src/main/resources/ui/src/components/Modals/WhatsNewModal/whats-new-modal.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx index 1d6f72b6fbeb..3e060faa393d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.component.tsx @@ -17,12 +17,12 @@ import { useTranslation } from 'react-i18next'; import { NavLink } from 'react-router-dom'; import { ReactComponent as GovernIcon } from '../../../assets/svg/bank.svg'; import { ReactComponent as LogoutIcon } from '../../../assets/svg/logout.svg'; -import { useAuthContext } from '../../../components/authentication/auth-provider/AuthProvider'; import { SETTING_ITEM, SIDEBAR_GOVERN_LIST, } from '../../../constants/LeftSidebar.constants'; import leftSidebarClassBase from '../../../utils/LeftSidebarClassBase'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import './left-sidebar.less'; import LeftSidebarItem from './LeftSidebarItem.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx index b7ca4eba39d6..7f4af5776236 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx @@ -29,10 +29,10 @@ import { searchData } from '../../../rest/miscAPI'; import { Transi18next } from '../../../utils/CommonUtils'; import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityIcon, getEntityLink } from '../../../utils/TableUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import { SourceType } from '../../searched-data/SearchedData.interface'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { SourceType } from '../../SearchedData/SearchedData.interface'; import EntityListSkeleton from '../../Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; -import './MyDataWidget.less'; +import './my-data-widget.less'; const MyDataWidgetInternal = ({ isEditView = false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx index f771ca988cdf..33c29986b30a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx @@ -68,7 +68,7 @@ jest.mock('../../../utils/TableUtils', () => ({ getEntityIcon: jest.fn().mockImplementation((obj) => obj.name), })); -jest.mock('../../authentication/auth-provider/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/my-data-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/my-data-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx index fed7cd5cf382..bb8536f8bd8a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx @@ -21,7 +21,7 @@ import { WidgetCommonProps } from '../../../pages/CustomizablePage/CustomizableP import FeedCardBodyV1 from '../../ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1'; import FeedCardHeaderV1 from '../../ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeaderV1'; import Loader from '../../Loader/Loader'; -import './AnnouncementsWidget.less'; +import './announcements-widget.less'; export interface AnnouncementsWidgetProps extends WidgetCommonProps { isAnnouncementLoading?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/FollowingWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/FollowingWidget.tsx index 1c405a118017..f488a4f17ac7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/FollowingWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/FollowingWidget.tsx @@ -19,9 +19,9 @@ import { Link } from 'react-router-dom'; import { getUserPath } from '../../../constants/constants'; import { EntityReference } from '../../../generated/entity/type'; import { WidgetCommonProps } from '../../../pages/CustomizablePage/CustomizablePage.interface'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import { EntityListWithV1 } from '../../Entity/EntityList/EntityList'; -import './FollowingWidget.less'; +import './following-widget.less'; export interface FollowingWidgetProps extends WidgetCommonProps { followedData: EntityReference[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/announcements-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/announcements-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/FollowingWidget.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/following-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/FollowingWidget.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/following-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx index c09a2c23038d..a36ebe817f04 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/NavBar.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx @@ -40,13 +40,6 @@ import { ReactComponent as DropDownIcon } from '../../assets/svg/DropDown.svg'; import { ReactComponent as IconBell } from '../../assets/svg/ic-alert-bell.svg'; import { ReactComponent as DomainIcon } from '../../assets/svg/ic-domain.svg'; import { ReactComponent as Help } from '../../assets/svg/ic-help.svg'; -import { ActivityFeedTabs } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; -import SearchOptions from '../../components/AppBar/SearchOptions'; -import Suggestions from '../../components/AppBar/Suggestions'; -import BrandImage from '../../components/common/BrandImage/BrandImage'; -import { useDomainProvider } from '../../components/Domain/DomainProvider/DomainProvider'; -import { useGlobalSearchProvider } from '../../components/GlobalSearchProvider/GlobalSearchProvider'; -import WhatsNewAlert from '../../components/Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component'; import { globalSearchOptions, NOTIFICATION_READ_TIMER, @@ -74,11 +67,18 @@ import { isInPageSearchAllowed, } from '../../utils/RouterUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; +import { ActivityFeedTabs } from '../ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; +import SearchOptions from '../AppBar/SearchOptions'; +import Suggestions from '../AppBar/Suggestions'; +import BrandImage from '../common/BrandImage/BrandImage'; import CmdKIcon from '../common/CmdKIcon/CmdKIcon.component'; +import { useDomainProvider } from '../Domain/DomainProvider/DomainProvider'; +import { useGlobalSearchProvider } from '../GlobalSearchProvider/GlobalSearchProvider'; +import WhatsNewAlert from '../Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component'; import WhatsNewModal from '../Modals/WhatsNewModal/WhatsNewModal'; import NotificationBox from '../NotificationBox/NotificationBox.component'; import { UserProfileIcon } from '../Users/UserProfileIcon/UserProfileIcon.component'; -import { useWebSocketConnector } from '../web-scoket/web-scoket.provider'; +import { useWebSocketConnector } from '../WebSocketProvider/WebSocketProvider'; import './nav-bar.less'; import { NavBarProps } from './NavBar.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/nav-bar/nav-bar.less b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/nav-bar.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/nav-bar/nav-bar.less rename to openmetadata-ui/src/main/resources/ui/src/components/NavBar/nav-bar.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx index aa05d121d1b5..2e77ab5eab9c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx @@ -30,7 +30,7 @@ import { getFeedsWithFilter } from '../../rest/feedsAPI'; import { getEntityFQN, getEntityType } from '../../utils/FeedUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import Loader from '../Loader/Loader'; import './notification-box.less'; import { NotificationBoxProp } from './NotificationBox.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx index 569dfb4f52d5..a347f45d4036 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.component.tsx @@ -13,8 +13,8 @@ import { Typography } from 'antd'; import React from 'react'; +import './page-header.less'; import { HeaderProps } from './PageHeader.interface'; -import './PageHeader.style.less'; const PageHeader = ({ data: { header, subHeader } }: HeaderProps) => { return ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/PageHeader/PageHeader.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.style.less b/openmetadata-ui/src/main/resources/ui/src/components/PageHeader/page-header.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/header/PageHeader.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/PageHeader/page-header.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/containers/PageLayoutV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/containers/PageLayoutV1.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/containers/PageLayoutV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/containers/PageLayoutV1.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx index 18731075055d..21c9c4615cf3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx @@ -44,7 +44,7 @@ let currentUser: { id: string; name: string } | null = { name: 'Test User', }; -jest.mock('../authentication/auth-provider/AuthProvider', () => { +jest.mock('../Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn().mockImplementation(() => ({ currentUser, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx index ccbcfd1e959d..e7b2de2a46dc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx @@ -36,7 +36,7 @@ import { getOperationPermissions, getUIPermission, } from '../../utils/PermissionsUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import { EntityPermissionMap, PermissionContextType, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx index 637364ae1435..b6670f586405 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx @@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom'; import { Persona } from '../../../generated/entity/teams/persona'; import { getEntityName } from '../../../utils/EntityUtils'; import { getPersonaDetailsPath } from '../../../utils/RouterUtils'; -import RichTextEditorPreviewer from '../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; interface PersonaDetailsCardProps { persona: Persona; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx index 6aedebaad185..59ed64966fe1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx @@ -24,13 +24,12 @@ import { ReactComponent as ExternalLinkIcon } from '../../assets/svg/external-li import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component'; import ExecutionsTab from '../../components/Execution/Execution.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; import TableDescription from '../../components/TableDescription/TableDescription.component'; import TableTags from '../../components/TableTags/TableTags.component'; @@ -72,7 +71,8 @@ import { import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { withActivityFeed } from '../AppRouter/withActivityFeed'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx index 744757870819..97817294ddcc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx @@ -132,10 +132,10 @@ const PipelineDetailsProps = { onUpdateVote: jest.fn(), }; -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviwer

); }); @@ -153,7 +153,7 @@ jest.mock('../TasksDAGView/TasksDAGView', () => { return jest.fn().mockReturnValue(

Tasks DAG

); }); -jest.mock('../containers/PageLayoutV1', () => { +jest.mock('../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx index ce2f1ab14e30..d1da012059b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx @@ -18,8 +18,8 @@ import { t } from 'i18next'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts index a728aa8e9fe3..a20f366efa30 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Pipeline } from '../../generated/entity/data/pipeline'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface PipelineVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx index 2d003a0af5d3..07a8fd093d57 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx @@ -37,7 +37,7 @@ jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => ); jest.mock( - '../../components/common/rich-text-editor/RichTextEditorPreviewer', + '../../components/common/RichTextEditor/RichTextEditorPreviewer', () => jest.fn().mockImplementation(() =>
RichTextEditorPreviewer
) ); @@ -54,13 +54,12 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', - () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) +jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => + jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); jest.mock( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx index 51e18e6fde9c..177e225d4da4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx @@ -57,7 +57,7 @@ jest.mock('../../../hooks/authHooks', () => ({ jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: () => mockPermissionsData, })); -jest.mock('../../authentication/auth-provider/AuthProvider', () => { +jest.mock('../../Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ isAuthDisabled: mockAuthData.isAuthDisabled, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx index f04d286c711a..efb57ca40db1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx @@ -26,15 +26,14 @@ import { ReactComponent as IconCheckMark } from '../../../assets/svg/ic-check-ma import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; import EditTestCaseModal from '../../../components/AddDataQualityTest/EditTestCaseModal'; import AppBadge from '../../../components/common/Badge/Badge.component'; -import FilterTablePlaceHolder from '../../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +import FilterTablePlaceHolder from '../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import { StatusBox } from '../../../components/common/LastRunGraph/LastRunGraph.component'; -import NextPrevious from '../../../components/common/next-previous/NextPrevious'; import Table from '../../../components/common/Table/Table'; import { TestCaseStatusModal } from '../../../components/DataQuality/TestCaseStatusModal/TestCaseStatusModal.component'; import ConfirmationModal from '../../../components/Modals/ConfirmationModal/ConfirmationModal'; import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { getTableTabPath, PAGE_SIZE } from '../../../constants/constants'; +import { getTableTabPath } from '../../../constants/constants'; import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; import { TestCaseStatus } from '../../../generated/configuration/testResultNotificationConfiguration'; import { Operation } from '../../../generated/entity/policies/policy'; @@ -58,12 +57,13 @@ import { getEncodedFqn, replacePlus } from '../../../utils/StringsUtils'; import { getEntityFqnFromEntityLink } from '../../../utils/TableUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import DeleteWidgetModal from '../../common/DeleteWidget/DeleteWidgetModal'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; import { DataQualityTabProps, TableProfilerTab, TestCaseAction, } from '../profilerDashboard.interface'; -import './DataQualityTab.style.less'; +import './data-quality-tab.less'; import TestSummary from './TestSummary'; const DataQualityTab: React.FC = ({ @@ -75,6 +75,7 @@ const DataQualityTab: React.FC = ({ removeFromTestSuite, showTableColumn = true, afterDeleteAction, + showPagination, }) => { const { t } = useTranslation(); const { permissions } = usePermissionProvider(); @@ -418,15 +419,7 @@ const DataQualityTab: React.FC = ({ /> - {!isUndefined(pagingData) && pagingData.paging.total > PAGE_SIZE && ( - - )} + {pagingData && showPagination && } { return
ProfilerLatestValue
; }); }); -jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => { +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() => { return
ErrorPlaceHolder
; }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx index 5e426dcb5042..a28f98bfac7d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx @@ -30,7 +30,7 @@ import { tooltipFormatter, updateActiveChartFilter, } from '../../../utils/ChartUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { ProfilerDetailsCardProps } from '../profilerDashboard.interface'; import ProfilerLatestValue from './ProfilerLatestValue'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx index 3ebf25d39aab..d307ada74ce4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { getStatisticsDisplayValue } from '../../../utils/CommonUtils'; import { ProfilerLatestValueProps } from '../profilerDashboard.interface'; -import '../profilerDashboard.less'; +import '../profiler-dashboard.less'; const ProfilerLatestValue = ({ information, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx index 1d077c034950..a2aec0e33917 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx @@ -51,7 +51,7 @@ jest.mock('../../../components/DatePickerMenu/DatePickerMenu.component', () => { .fn() .mockImplementation(() =>
DatePickerMenu.component
); }); -jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => { +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest .fn() .mockImplementation(() =>
ErrorPlaceHolder.component
); @@ -59,7 +59,7 @@ jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => { jest.mock('../../Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader.component
); }); -jest.mock('../../schema-editor/SchemaEditor', () => { +jest.mock('../../SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>
SchemaEditor.component
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx index 542aaa24ed4a..00dc7d7d504b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx @@ -54,13 +54,13 @@ import { formatDateTime } from '../../../utils/date-time/DateTimeUtils'; import { getTestCaseDetailsPath } from '../../../utils/RouterUtils'; import { getEncodedFqn } from '../../../utils/StringsUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../common/rich-text-editor/RichTextEditorPreviewer'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; import DatePickerMenu from '../../DatePickerMenu/DatePickerMenu.component'; import Loader from '../../Loader/Loader'; -import SchemaEditor from '../../schema-editor/SchemaEditor'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import { TestSummaryProps } from '../profilerDashboard.interface'; -import './TestSummary.style.less'; +import './test-summary.less'; type ChartDataType = { information: { label: string; color: string }[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.style.less b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/data-quality-tab.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/data-quality-tab.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.style.less b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/test-summary.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/test-summary.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.less b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profiler-dashboard.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.less rename to openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profiler-dashboard.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts index a31f073c817c..d9cfbfa8432b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts @@ -12,7 +12,6 @@ */ import { CurveType } from 'recharts/types/shape/Curve'; -import { NextPreviousProps } from '../../components/common/next-previous/NextPrevious.interface'; import { Column, ColumnProfile, @@ -20,8 +19,8 @@ import { } from '../../generated/entity/data/table'; import { TestCase } from '../../generated/tests/testCase'; import { TestSuite } from '../../generated/tests/testSuite'; -import { Paging } from '../../generated/type/paging'; import { ListTestCaseParams } from '../../rest/testAPI'; +import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface'; import { DateRangeObject } from './component/TestSummary'; export interface ProfilerDashboardProps { @@ -106,15 +105,11 @@ export interface DataQualityTabProps { showTableColumn?: boolean; isLoading?: boolean; onTestCaseResultUpdate?: (data: TestCase) => void; - pagingData?: { - paging: Paging; - currentPage: number; - onPagingClick: NextPreviousProps['pagingHandler']; - isNumberBased?: boolean; - }; + pagingData?: NextPreviousProps; removeFromTestSuite?: { testSuite: TestSuite; }; + showPagination?: boolean; } export interface TestSummaryProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx index ffe0d4a357b7..d1f9a2e99fe0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx @@ -28,7 +28,7 @@ jest.mock('../../hooks/useImage', () => jest.fn().mockReturnValue({ image: null }) ); -jest.mock('../authentication/auth-provider/AuthProvider', () => ({ +jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx index aca385edb545..9e5ac1e5a0ac 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx @@ -20,7 +20,7 @@ import { REACTION_LIST } from '../../constants/reactions.constant'; import { ReactionOperation } from '../../enums/reactions.enum'; import { Reaction, ReactionType } from '../../generated/type/reaction'; import useImage from '../../hooks/useImage'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; interface EmojiProps { reaction: ReactionType; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx index 3df574489152..57f7f2eda2b4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx @@ -26,7 +26,7 @@ import { Reaction as ReactionProp, ReactionType, } from '../../generated/type/reaction'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import Emoji from './Emoji'; import Reaction from './Reaction'; import './reactions.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx index 51181ccb4d06..0bf45a0cdc62 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx @@ -13,7 +13,7 @@ import React, { Fragment, useState } from 'react'; import SchemaModal from '../Modals/SchemaModal/SchemaModal'; -import { SampleDataType } from './sample.interface'; +import { SampleDataType } from './SampleData.interface'; export const RowData = ({ data }: { data: SampleDataType }) => { const [isFullView, setIsFullView] = useState(false); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleData.interface.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleData.interface.ts index aadd31d03288..c3606bc9dc49 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleData.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ import { ColumnsType } from 'antd/lib/table'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; export type SampleDataType = | string diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx index b61260bb8f74..7e2fdb2ab0ce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx @@ -43,16 +43,16 @@ import { } from '../../rest/tableAPI'; import { getEntityDeleteMessage, Transi18next } from '../../utils/CommonUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Loader from '../Loader/Loader'; import { RowData } from './RowData'; +import './sample-data-table.less'; import { SampleData, SampleDataProps, SampleDataType, -} from './sample.interface'; -import './SampleDataTable.style.less'; +} from './SampleData.interface'; const SampleDataTable = ({ isTableDeleted, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx index e7a197cc3bfa..ba6f0269dd38 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx @@ -44,7 +44,7 @@ jest.mock('../../rest/tableAPI', () => ({ .mockImplementation(() => Promise.resolve(MOCK_TABLE)), })); -jest.mock('../common/error-with-placeholder/ErrorPlaceHolder', () => { +jest.mock('../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest .fn() .mockReturnValue( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.style.less b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample-data-table.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample-data-table.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.tsx index 0b0d52bdae1b..da346d32b71e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.tsx @@ -14,8 +14,8 @@ import { Collapse, Tag, Typography } from 'antd'; import React, { ReactNode, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import SchemaEditor from '../../components/schema-editor/SchemaEditor'; -import './MessageCard.less'; +import SchemaEditor from '../SchemaEditor/SchemaEditor'; +import './message-card.less'; const { Panel } = Collapse; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx index 90b9c9e1968b..b3d2ee15c2d0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx @@ -23,7 +23,7 @@ import { TopicSampleData } from '../../generated/entity/data/topic'; import { getSampleDataBySearchIndexId } from '../../rest/SearchIndexAPI'; import { getSampleDataByTopicId } from '../../rest/topicsAPI'; import { Transi18next } from '../../utils/CommonUtils'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import MessageCard from './MessageCard'; const SampleDataWithMessages: FC<{ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.less b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/message-card.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.less rename to openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/message-card.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/schema-editor/SchemaEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/schema-editor/SchemaEditor.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/schema-editor/SchemaEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/schema-editor/SchemaEditor.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.tsx index 70878c141ebd..0c05a30730db 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/schema-editor/SchemaEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.tsx @@ -26,7 +26,7 @@ import React, { useEffect, useState } from 'react'; import { Controlled as CodeMirror } from 'react-codemirror2'; import { JSON_TAB_SIZE } from '../../constants/constants'; import { CSMode } from '../../enums/codemirror.enum'; -import { getSchemaEditorValue } from './SchemaEditor.utils'; +import { getSchemaEditorValue } from '../../utils/SchemaEditor.utils'; type Mode = { name: CSMode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx index 67f25aef807c..a8aa7c449451 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx @@ -14,7 +14,7 @@ import { t } from 'i18next'; import { lowerCase } from 'lodash'; import React, { Fragment, FunctionComponent, useState } from 'react'; -import Searchbar from '../common/searchbar/Searchbar'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; import SchemaTable from '../SchemaTable/SchemaTable.component'; import { Props } from './SchemaTab.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx index 9a754fafcef4..d940ab8c32a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx @@ -30,7 +30,7 @@ import { EntityTags, TagFilterOptions } from 'Models'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as IconEdit } from '../../assets/svg/edit-new.svg'; -import FilterTablePlaceHolder from '../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import EntityNameModal from '../../components/Modals/EntityNameModal/EntityNameModal.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx index 785d010d8a9c..9b8d918d2652 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx @@ -132,7 +132,7 @@ jest.mock('../../hooks/authHooks', () => { }; }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); }); @@ -141,7 +141,7 @@ jest.mock('../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', () => ({ })); jest.mock( - '../../components/common/error-with-placeholder/FilterTablePlaceHolder', + '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder', () => { return jest.fn().mockReturnValue(

FilterTablePlaceHolder

); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts index 9309414a778a..f372c03c432f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ExploreSearchIndex } from '../Explore/explore.interface'; +import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; export interface SearchDropdownProps { label: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx index 5c55fcb96f99..1aeb040bd5ab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx @@ -44,11 +44,11 @@ import { getSelectedOptionLabelString, } from '../../utils/AdvancedSearchUtils'; import Loader from '../Loader/Loader'; +import './search-dropdown.less'; import { SearchDropdownOption, SearchDropdownProps, } from './SearchDropdown.interface'; -import './SearchDropdown.less'; const SearchDropdown: FC = ({ isSuggestionsLoading, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.less b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/search-dropdown.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.less rename to openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/search-dropdown.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts index c20742411c0c..4b5630903132 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts @@ -14,7 +14,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { SearchIndex } from '../../generated/entity/data/searchIndex'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface SearchIndexVersionProps { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx index 73505e19a922..cbf6797fd285 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx @@ -18,7 +18,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.interface.ts similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.interface.ts index 0a666f57f789..84e539ef9cfd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.interface.ts @@ -35,7 +35,7 @@ import { TopicSearchSource, UserSearchSource, } from '../../interface/search.interface'; -import { ExploreSearchIndex } from '../Explore/explore.interface'; +import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; type Fields = | 'name' diff --git a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx index fde55f05702c..3718d43a25fd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx @@ -91,11 +91,11 @@ jest.mock('../../components/TableDataCardBody/TableDataCardBody', () => { return jest.fn().mockReturnValue(

TableDataCardBody

); }); -jest.mock('../common/next-previous/NextPrevious', () => { +jest.mock('../common/NextPrevious/NextPrevious', () => { return jest.fn().mockReturnValue(

Pagination

); }); -jest.mock('../common/error-with-placeholder/ErrorPlaceHolderES', () => { +jest.mock('../common/ErrorWithPlaceholder/ErrorPlaceHolderES', () => { return jest.fn().mockReturnValue(

ErrorPlaceHolderES

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx index 48df98e322ab..a9853db2da2c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx @@ -16,13 +16,13 @@ import classNames from 'classnames'; import { isNumber, isUndefined } from 'lodash'; import Qs from 'qs'; import React, { useMemo } from 'react'; -import ExploreSearchCard from '../../components/ExploreV1/ExploreSearchCard/ExploreSearchCard'; import { PAGE_SIZE } from '../../constants/constants'; import { MAX_RESULT_HITS } from '../../constants/explore.constants'; import { ELASTICSEARCH_ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { pluralize } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; -import ErrorPlaceHolderES from '../common/error-with-placeholder/ErrorPlaceHolderES'; +import ErrorPlaceHolderES from '../common/ErrorWithPlaceholder/ErrorPlaceHolderES'; +import ExploreSearchCard from '../ExploreV1/ExploreSearchCard/ExploreSearchCard'; import Loader from '../Loader/Loader'; import { SearchedDataProps } from './SearchedData.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx index 6f0b04100eda..d76ac20d04b5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx @@ -19,10 +19,8 @@ import { isEmpty, map, startCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; -import NextPrevious from '../../components/common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; import { OwnerLabel } from '../../components/common/OwnerLabel/OwnerLabel.component'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { ListView } from '../../components/ListView/ListView.component'; import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; import { getServiceDetailsPath, pagingObject } from '../../constants/constants'; @@ -42,7 +40,7 @@ import { usePaging } from '../../hooks/paging/usePaging'; import { DatabaseServiceSearchSource } from '../../interface/search.interface'; import { ServicesType } from '../../interface/service.interface'; import { getServices, searchService } from '../../rest/serviceAPI'; -import { getServiceLogo, showPagination } from '../../utils/CommonUtils'; +import { getServiceLogo } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; import { checkPermission } from '../../utils/PermissionsUtils'; import { getAddServicePath } from '../../utils/RouterUtils'; @@ -53,9 +51,11 @@ import { } from '../../utils/ServiceUtils'; import { FilterIcon } from '../../utils/TableUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; -import PageHeader from '../header/PageHeader.component'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; +import PageHeader from '../PageHeader/PageHeader.component'; import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; interface ServicesProps { @@ -82,6 +82,7 @@ const Services = ({ serviceName }: ServicesProps) => { handlePageChange, pageSize, handlePageSizeChange, + showPagination, } = usePaging(); const { permissions } = usePermissionProvider(); @@ -464,7 +465,7 @@ const Services = ({ serviceName }: ServicesProps) => { /> - {showPagination(paging) && ( + {showPagination && ( >([]); - const [ingestionPipelines, setIngestionPipelines] = useState< - IngestionPipeline[] - >([]); - const [serviceDetails, setServiceDetails] = useState(); - const [airflowEndpoint, setAirflowEndpoint] = useState(); - const [ingestionPaging, setIngestionPaging] = useState({} as Paging); - - const serviceCategory = ServiceCategory.METADATA_SERVICES; - const serviceFQN = OPEN_METADATA; - - const getAirflowEndpoint = async () => { - try { - setIsLoading(true); - const res = await fetchAirflowConfig(); - setAirflowEndpoint(res.apiEndpoint); - } catch (err) { - showErrorToast( - err as AxiosError, - t('server.entity-fetch-error', { - entity: t('label.airflow-config-plural'), - }) - ); - } finally { - setIsLoading(false); - } - }; - - const getAllIngestionWorkflows = async (paging?: string) => { - setIsLoading(true); - try { - const res = await getIngestionPipelines({ - arrQueryFields: ['pipelineStatuses'], - serviceFilter: serviceFQN, - paging, - pipelineType: [pipelineType], - }); - - if (res.data) { - const pipelinesList = res.data.filter( - (pipeline) => pipeline.pipelineType === pipelineType - ); - setIngestionPipelines(pipelinesList); - handleIngestionPipelinesChange && - handleIngestionPipelinesChange(pipelinesList); - setIngestionPaging(res.paging); - } else { - setIngestionPaging({} as Paging); - showErrorToast( - t('server.entity-fetch-error', { - entity: t('label.ingestion-workflow-lowercase'), - }) - ); - } - } catch (error) { - showErrorToast( - error as AxiosError, - t('server.entity-fetch-error', { - entity: t('label.ingestion-workflow-lowercase'), - }) - ); - } finally { - setIsLoading(false); - } - }; - - const updateCurrentSelectedIngestion = ( - id: string, - data: IngestionPipeline | undefined, - updateKey: keyof IngestionPipeline, - isDeleted = false - ) => { - const rowIndex = ingestionPipelines.findIndex((row) => row.id === id); - - const updatedRow = !isUndefined(data) - ? { ...ingestionPipelines[rowIndex], [updateKey]: data[updateKey] } - : null; - - let updatedData: IngestionPipeline[]; - - if (isDeleted) { - updatedData = ingestionPipelines.filter((_, index) => index !== rowIndex); - } else { - updatedData = updatedRow - ? Object.assign([...ingestionPipelines], { [rowIndex]: updatedRow }) - : [...ingestionPipelines]; - } - - setIngestionPipelines(updatedData); - handleIngestionPipelinesChange && - handleIngestionPipelinesChange(updatedData); - }; - - const deployIngestion = async (id: string) => { - try { - const res = await deployIngestionPipelineById(id); - - if (res.data) { - setTimeout(() => { - updateCurrentSelectedIngestion(id, res.data, 'fullyQualifiedName'); - - setIsLoading(false); - }, 500); - } else { - throw t('server.entity-updating-error', { - entity: t('label.ingestion-workflow-lowercase'), - }); - } - } catch (err) { - showErrorToast( - err as AxiosError, - t('server.entity-updating-error', { - entity: t('label.ingestion-workflow-lowercase'), - }) - ); - } - }; - - const deleteIngestionById = async (id: string, displayName: string) => { - try { - await deleteIngestionPipelineById(id); - - setIngestionPipelines((ingestionPipeline) => { - const data = ingestionPipeline.filter((pipeline) => pipeline.id !== id); - handleIngestionPipelinesChange && handleIngestionPipelinesChange(data); - - return data; - }); - } catch (error) { - showErrorToast( - error as AxiosError, - t('server.ingestion-workflow-operation-error', { - operation: t('label.deleting-lowercase'), - displayName, - }) - ); - } finally { - setIsLoading(false); - } - }; - - const handleEnableDisableIngestion = async (id: string) => { - try { - const res = await enableDisableIngestionPipelineById(id); - if (res.data) { - updateCurrentSelectedIngestion(id, res.data, 'enabled'); - } else { - throw t('server.unexpected-response'); - } - } catch (err) { - showErrorToast(err as AxiosError, t('server.unexpected-response')); - } - }; - - const triggerIngestionById = async (id: string, displayName: string) => { - try { - const data = await triggerIngestionPipelineById(id); - - updateCurrentSelectedIngestion(id, data, 'pipelineStatuses'); - } catch (err) { - showErrorToast( - t('server.ingestion-workflow-operation-error', { - operation: t('label.triggering-lowercase'), - displayName, - }) - ); - } finally { - setIsLoading(false); - } - }; - - const fetchMetadataServiceDetails = async () => { - try { - setIsLoading(true); - const res = await getServiceByFQN(serviceCategory, serviceFQN); - if (res) { - setServiceDetails(res); - handleServiceDetailsChange && handleServiceDetailsChange(res); - } else { - showErrorToast( - t('server.entity-fetch-error', { - entity: t('label.service-detail-lowercase-plural'), - }) - ); - } - } catch (err) { - showErrorToast( - err as AxiosError, - t('server.entity-fetch-error', { - entity: t('label.service-detail-lowercase-plural'), - }) - ); - } finally { - setIsLoading(false); - } - }; - - useEffect(() => { - fetchMetadataServiceDetails(); - }, [serviceFQN, serviceCategory]); - - useEffect(() => { - if (isAirflowAvailable) { - getAllIngestionWorkflows(); - getAirflowEndpoint(); - } - }, [isAirflowAvailable]); - - if (isLoading || isFetchingStatus) { - return ; - } - - return isAirflowAvailable ? ( - - ) : ( - - ); -} - -export default SettingsIngestion; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SettingsIngestion/SettingsIngestion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SettingsIngestion/SettingsIngestion.interface.ts deleted file mode 100644 index 22275808d380..000000000000 --- a/openmetadata-ui/src/main/resources/ui/src/components/SettingsIngestion/SettingsIngestion.interface.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2023 Collate. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { PipelineType } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { ServicesType } from '../../interface/service.interface'; - -export interface SettingsIngestionProps { - pipelineType: PipelineType; - containerClassName?: string; - handleServiceDetailsChange?: (details: ServicesType) => void; - handleIngestionPipelinesChange?: (pipeline: Array) => void; - handleIngestionDataChange?: (data: Array) => void; -} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Explore/ExploreLeftPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Explore/ExploreLeftPanelSkeleton.component.tsx index 0b47632f0563..44c63441255e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Explore/ExploreLeftPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Explore/ExploreLeftPanelSkeleton.component.tsx @@ -13,9 +13,9 @@ import { Col, Row, Skeleton } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; +import { exploreMock } from '../../../utils/Skeleton.utils'; import LabelCountSkeleton from '../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; import { SkeletonInterface } from '../Skeleton.interfaces'; -import { exploreMock } from '../SkeletonUtils/Skeleton.utils'; const ExploreSkeleton = ({ children, loading }: SkeletonInterface) => { return loading ? ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx index c525722ecfc1..38d15bbe2bdc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx @@ -13,9 +13,9 @@ import { Col, Row, Skeleton } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; +import { getSkeletonMockData } from '../../../utils/Skeleton.utils'; import ButtonSkeleton from '../CommonSkeletons/ControlElements/ControlElements.component'; import { SkeletonInterface } from '../Skeleton.interfaces'; -import { getSkeletonMockData } from '../SkeletonUtils/Skeleton.utils'; const GlossaryV1Skeleton = ({ loading, children }: SkeletonInterface) => { return loading ? ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx index 06bcb62405a8..a1abfb692bdf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx @@ -13,12 +13,12 @@ import { uniqueId } from 'lodash'; import React from 'react'; -import LabelCountSkeleton from '../../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; -import { EntityListSkeletonProps } from '../../Skeleton.interfaces'; import { DEFAULT_SKELETON_DATA_LENGTH, getSkeletonMockData, -} from '../../SkeletonUtils/Skeleton.utils'; +} from '../../../../utils/Skeleton.utils'; +import LabelCountSkeleton from '../../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; +import { EntityListSkeletonProps } from '../../Skeleton.interfaces'; const EntityListSkeleton = ({ loading, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx index e5395dd06e3a..46f76f4040d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx @@ -16,7 +16,7 @@ import React from 'react'; import ButtonSkeleton from '../../../components/Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; import LabelCountSkeleton from '../../../components/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; import { SkeletonInterface } from '../../../components/Skeleton/Skeleton.interfaces'; -import { getSkeletonMockData } from '../../../components/Skeleton/SkeletonUtils/Skeleton.utils'; +import { getSkeletonMockData } from '../../../utils/Skeleton.utils'; const SummaryPanelSkeleton = ({ loading, children }: SkeletonInterface) => { return loading ? ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx index db4d70798e72..c643758fba03 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx @@ -13,10 +13,10 @@ import { Col, Row } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; +import { getSkeletonMockData } from '../../../utils/Skeleton.utils'; import ButtonSkeleton from '../CommonSkeletons/ControlElements/ControlElements.component'; import LabelCountSkeleton from '../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; import { SkeletonInterface } from '../Skeleton.interfaces'; -import { getSkeletonMockData } from '../SkeletonUtils/Skeleton.utils'; const TagsLeftPanelSkeleton = ({ loading, children }: SkeletonInterface) => { return loading ? ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx index 2d9838e3fee5..139c171d2b10 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx @@ -18,7 +18,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts index 9c6920b3b01c..48df1ff80119 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { StoredProcedure } from '../../generated/entity/data/storedProcedure'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface StoredProcedureVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx index 383f1686e983..0f6332093804 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx @@ -41,7 +41,7 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx index 3bef259b3f04..05aa6b10eaad 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx @@ -17,7 +17,7 @@ import { TAG_CONSTANT } from '../../constants/Tag.constants'; import TableDataCardBody from './TableDataCardBody'; jest.mock( - '../../components/common/rich-text-editor/RichTextEditorPreviewer', + '../../components/common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx index cc9f6e6dc609..16da937edd9f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx @@ -16,7 +16,7 @@ import { ExtraInfo } from 'Models'; import React, { FunctionComponent } from 'react'; import { useTranslation } from 'react-i18next'; import EntitySummaryDetails from '../../components/common/EntitySummaryDetails/EntitySummaryDetails'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import TagsViewer from '../../components/Tag/TagsViewer/TagsViewer'; import { TagLabel } from '../../generated/type/tagLabel'; import { getTagValue } from '../../utils/CommonUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx index 203221eb7fca..3f9f86d7fe60 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx @@ -15,7 +15,7 @@ import { Space } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { DE_ACTIVE_COLOR } from '../../constants/constants'; import { EntityField } from '../../constants/Feeds.constants'; import EntityTasks from '../../pages/TasksPage/EntityTasks/EntityTasks.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx index b2c038296919..68b15e3b0b55 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx @@ -53,7 +53,7 @@ jest.mock('../../../components/common/Table/Table', () => jest.mock('../../../utils/CommonUtils', () => ({ formatNumberWithComma: jest.fn(), })); -jest.mock('../../common/searchbar/Searchbar', () => { +jest.mock('../../common/SearchBarComponent/SearchBar.component', () => { return jest .fn() .mockImplementation(({ searchValue, onSearch }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx index 3084b99b613c..b12bdb7ab57b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx @@ -18,7 +18,7 @@ import Qs from 'qs'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory, useLocation } from 'react-router-dom'; -import FilterTablePlaceHolder from '../../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +import FilterTablePlaceHolder from '../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import Table from '../../../components/common/Table/Table'; import { TableProfilerTab } from '../../../components/ProfilerDashboard/profilerDashboard.interface'; import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; @@ -31,7 +31,7 @@ import { formatNumberWithComma } from '../../../utils/CommonUtils'; import { updateTestResults } from '../../../utils/DataQualityAndProfilerUtils'; import { getEncodedFqn } from '../../../utils/StringsUtils'; import { getTableExpandableConfig } from '../../../utils/TableUtils'; -import Searchbar from '../../common/searchbar/Searchbar'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import TestIndicator from '../../common/TestIndicator/TestIndicator'; import { ColumnProfileTableProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx index 995c5d1bab4b..c23e2e2435ed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx @@ -13,7 +13,7 @@ import { Space, Typography } from 'antd'; import { isEmpty } from 'lodash'; import React, { FC } from 'react'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import TagsViewer from '../../../components/Tag/TagsViewer/TagsViewer'; import { Column } from '../../../generated/entity/data/container'; import { getEntityName } from '../../../utils/EntityUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx index 47c768837dba..ffb8a104543a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx @@ -39,7 +39,6 @@ import React, { useState, } from 'react'; import { useTranslation } from 'react-i18next'; -import SchemaEditor from '../../../components/schema-editor/SchemaEditor'; import { DEFAULT_INCLUDE_PROFILE, INTERVAL_TYPE_OPTIONS, @@ -63,13 +62,14 @@ import { import { reducerWithoutAction } from '../../../utils/CommonUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import SliderWithInput from '../../SliderWithInput/SliderWithInput'; +import '../table-profiler.less'; import { ProfilerForm, ProfilerSettingModalState, ProfilerSettingsModalProps, } from '../TableProfiler.interface'; -import '../tableProfiler.less'; const ProfilerSettingsModal: React.FC = ({ tableId, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerV1.tsx index f20e99c5697b..1fa1d9a55b3f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerV1.tsx @@ -84,7 +84,7 @@ import { getAddDataQualityTableTestPath } from '../../utils/RouterUtils'; import { bytesToSize, getDecodedFqn } from '../../utils/StringsUtils'; import { generateEntityLink } from '../../utils/TableUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import PageHeader from '../header/PageHeader.component'; +import PageHeader from '../PageHeader/PageHeader.component'; import { TableProfilerTab } from '../ProfilerDashboard/profilerDashboard.interface'; import ColumnPickerMenu from './Component/ColumnPickerMenu'; import ColumnProfileTable from './Component/ColumnProfileTable'; @@ -92,12 +92,12 @@ import ColumnSummary from './Component/ColumnSummary'; import ProfilerSettingsModal from './Component/ProfilerSettingsModal'; import TableProfilerChart from './Component/TableProfilerChart'; import { QualityTab } from './QualityTab/QualityTab.component'; +import './table-profiler.less'; import { OverallTableSummeryType, TableProfilerProps, TableTestsType, } from './TableProfiler.interface'; -import './tableProfiler.less'; const TableProfilerV1: FC = ({ isTableDeleted, @@ -264,7 +264,7 @@ const TableProfilerV1: FC = ({ : '--', }, ]; - }, [profile, tableTests]); + }, [profile]); const tabOptions = [ { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/tableProfiler.less b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/table-profiler.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/tableProfiler.less rename to openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/table-profiler.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx index faecac47d0a5..1e09f7ce014f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx @@ -63,7 +63,7 @@ ORDER BY order_day ASC;`, checksum: '0232b0368458aadb29230ccc531462c9', } as Query; -jest.mock('../schema-editor/SchemaEditor', () => { +jest.mock('../SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(

SchemaEditor

); }); jest.mock('./QueryCardExtraOption/QueryCardExtraOption.component', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx index b20551e6965c..35ed81dc0935 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx @@ -34,7 +34,7 @@ import { useClipboard } from '../../hooks/useClipBoard'; import { customFormatDateTime } from '../../utils/date-time/DateTimeUtils'; import { parseSearchParams } from '../../utils/Query/QueryUtils'; import { getQueryPath } from '../../utils/RouterUtils'; -import SchemaEditor from '../schema-editor/SchemaEditor'; +import SchemaEditor from '../SchemaEditor/SchemaEditor'; import QueryCardExtraOption from './QueryCardExtraOption/QueryCardExtraOption.component'; import QueryUsedByOtherTable from './QueryUsedByOtherTable/QueryUsedByOtherTable.component'; import './table-queries.style.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx index 73977b704d27..2577356b0ef4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx @@ -28,7 +28,7 @@ import { AxiosError } from 'axios'; import ConfirmationModal from '../../../components/Modals/ConfirmationModal/ConfirmationModal'; import { deleteQuery } from '../../../rest/queryAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import './query-card-extra-option.style.less'; const QueryCardExtraOption = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx index 957b73e47b58..4ac48696d96f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx @@ -35,7 +35,7 @@ let mockUserData: User = { email: '', }; -jest.mock('../../authentication/auth-provider/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx index 364f0f5c7d02..53b5cc1e8d7c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx @@ -14,10 +14,10 @@ import { render, screen, waitForElement } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { MOCK_EXPLORE_SEARCH_RESULTS } from '../../../components/Explore/exlore.mock'; import { Query } from '../../../generated/entity/data/query'; import { MOCK_QUERIES } from '../../../mocks/Queries.mock'; import { searchData } from '../../../rest/miscAPI'; +import { MOCK_EXPLORE_SEARCH_RESULTS } from '../../Explore/Explore.mock'; import { QueryUsedByOtherTableProps } from '../TableQueries.interface'; import QueryUsedByOtherTable from './QueryUsedByOtherTable.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx index 8e7a748a4e9c..aad5c00e60c2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx @@ -31,7 +31,7 @@ const mockTableQueriesProp: TableQueriesProp = { jest.mock('./QueryCard', () => { return jest.fn().mockReturnValue(

QueryCard

); }); -jest.mock('../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); jest.mock('./TableQueryRightPanel/TableQueryRightPanel.component', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx index 4b4187b952fb..4c88700a8350 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx @@ -15,23 +15,15 @@ import { Button, Col, Row, Space, Tooltip, Typography } from 'antd'; import { AxiosError } from 'axios'; import { compare } from 'fast-json-patch'; import { isUndefined } from 'lodash'; -import { PagingResponse } from 'Models'; import Qs from 'qs'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; -import NextPrevious from '../../components/common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { - INITIAL_PAGING_VALUE, - PAGE_SIZE, - pagingObject, -} from '../../constants/constants'; import { USAGE_DOCS } from '../../constants/docs.constants'; import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; import { @@ -40,6 +32,7 @@ import { } from '../../constants/Query.constant'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { Query } from '../../generated/entity/data/query'; +import { usePaging } from '../../hooks/paging/usePaging'; import { getQueriesList, getQueryById, @@ -54,7 +47,9 @@ import { } from '../../utils/Query/QueryUtils'; import { getAddQueryPath } from '../../utils/RouterUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; import Loader from '../Loader/Loader'; import QueryCard from './QueryCard'; import { QueryVote, TableQueriesProp } from './TableQueries.interface'; @@ -75,19 +70,23 @@ const TableQueries: FC = ({ return searchData; }, [location]); - const [tableQueries, setTableQueries] = useState>({ - data: [], - paging: pagingObject, - }); + const [tableQueries, setTableQueries] = useState([]); const [isLoading, setIsLoading] = useState(QUERY_PAGE_LOADING_STATE); const [isError, setIsError] = useState(QUERY_PAGE_ERROR_STATE); const [selectedQuery, setSelectedQuery] = useState(); const [queryPermissions, setQueryPermissions] = useState( DEFAULT_ENTITY_PERMISSION ); - const [currentPage, setCurrentPage] = useState( - Number(searchParams.queryFrom) || INITIAL_PAGING_VALUE - ); + + const { + currentPage, + handlePageChange, + pageSize, + handlePageSizeChange, + paging, + handlePagingChange, + showPagination, + } = usePaging(); const { getEntityPermission, permissions } = usePermissionProvider(); @@ -133,7 +132,7 @@ const TableQueries: FC = ({ setTableQueries((pre) => { return { ...pre, - data: pre.data.map((query) => + data: pre.map((query) => query.id === updatedQuery.id ? { ...query, ...res } : query ), }; @@ -153,7 +152,7 @@ const TableQueries: FC = ({ setTableQueries((pre) => { return { ...pre, - data: pre.data.map((query) => + data: pre.map((query) => query.id === response.id ? response : query ), }; @@ -168,22 +167,22 @@ const TableQueries: FC = ({ ) => { setIsLoading((pre) => ({ ...pre, query: true })); try { - const queries = await getQueriesList({ + const { data: queries, paging } = await getQueriesList({ ...params, - limit: PAGE_SIZE, + limit: pageSize, entityId: tableId, fields: 'owner,votes,tags,queryUsedIn,users', }); - if (queries.data.length === 0) { + if (queries.length === 0) { setIsError((pre) => ({ ...pre, page: true })); } else { setTableQueries(queries); const selectedQueryData = searchParams.query - ? queries.data.find((query) => query.id === searchParams.query) ?? - queries.data[0] - : queries.data[0]; + ? queries.find((query) => query.id === searchParams.query) || + queries[0] + : queries[0]; setSelectedQuery(selectedQueryData); - + handlePagingChange(paging); history.push({ search: stringifySearchParams({ tableId, @@ -202,10 +201,9 @@ const TableQueries: FC = ({ }; const pagingHandler = ({ cursorType, currentPage }: PagingHandlerParams) => { - const { paging } = tableQueries; if (cursorType) { fetchTableQuery({ [cursorType]: paging[cursorType] }, currentPage); - setCurrentPage(currentPage); + handlePageChange(currentPage); } }; @@ -232,7 +230,7 @@ const TableQueries: FC = ({ setIsLoading((pre) => ({ ...pre, page: false, query: false })); setIsError(QUERY_PAGE_ERROR_STATE); } - }, [tableId, isTableDeleted]); + }, [tableId, pageSize]); const handleAddQueryClick = () => { history.push(getAddQueryPath(datasetFQN)); @@ -296,7 +294,7 @@ const TableQueries: FC = ({ ) : ( - tableQueries.data.map((query) => ( + tableQueries.map((query) => ( = ({ {isLoading.query ? : queryTabBody} - {tableQueries.paging.total > PAGE_SIZE && ( + {showPagination && ( )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx index 97872f9a0c4b..6e549035b328 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx @@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { ReactComponent as IconUser } from '../../../assets/svg/user.svg'; -import Description from '../../../components/common/description/Description'; +import Description from '../../../components/common/EntityDescription/Description'; import ProfilePicture from '../../../components/common/ProfilePicture/ProfilePicture'; import { UserTeamSelectableList } from '../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component'; import Loader from '../../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx index a29a8998eea7..05c036c903f8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx @@ -36,7 +36,7 @@ jest.mock( .mockImplementation(() =>
UserTeamSelectableList
), }) ); -jest.mock('../../../components/common/description/Description', () => { +jest.mock('../../../components/common/EntityDescription/Description', () => { return jest.fn().mockImplementation(() =>
Description.component
); }); jest.mock('../../../components/TagsInput/TagsInput.component', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx index 7dabfa92333d..0073d865fd98 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx @@ -18,7 +18,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts index e0686ee81da8..a89248441d6c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Table } from '../../generated/entity/data/table'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface TableVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx index 5e45b0fd146e..a1fe3eaad97e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx @@ -41,7 +41,7 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx index 3112cc8ad88d..a5e481602a81 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx @@ -68,7 +68,7 @@ import { TASK_ACTION_LIST, } from '../../../utils/TasksUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import './task-tab.less'; import { TaskTabProps } from './TaskTab.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx index b097414de0fc..11af780d0f95 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx @@ -25,7 +25,7 @@ import { getRoleWithFqnPath, } from '../../../utils/RouterUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; -import RichTextEditorPreviewer from '../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; const ListEntities = ({ list, diff --git a/openmetadata-ui/src/main/resources/ui/src/interface/teamsAndUsers.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.interface.ts similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/interface/teamsAndUsers.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.interface.ts index 0e4a80305c23..84607e6a6431 100644 --- a/openmetadata-ui/src/main/resources/ui/src/interface/teamsAndUsers.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.interface.ts @@ -13,18 +13,14 @@ import { Operation } from 'fast-json-patch'; import { FormErrorData } from 'Models'; -import { NextPreviousProps } from '../components/common/next-previous/NextPrevious.interface'; -import { OperationPermission } from '../components/PermissionProvider/PermissionProvider.interface'; -import { ERROR_PLACEHOLDER_TYPE } from '../enums/common.enum'; -import { EntityType } from '../enums/entity.enum'; -import { UserType } from '../enums/user.enum'; -import { Team } from '../generated/entity/teams/team'; -import { - EntityReference as UserTeams, - User, -} from '../generated/entity/teams/user'; -import { EntityReference } from '../generated/type/entityReference'; -import { Paging } from '../generated/type/paging'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; +import { EntityType } from '../../../enums/entity.enum'; +import { UserType } from '../../../enums/user.enum'; +import { Team } from '../../../generated/entity/teams/team'; +import { User } from '../../../generated/entity/teams/user'; +import { EntityReference } from '../../../generated/entity/type'; +import { Paging } from '../../../generated/type/paging'; +import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; export type TeamDeleteType = { team: Team | undefined; @@ -52,7 +48,6 @@ export interface TeamsAndUsersProps { userPaging: Paging; currentTeamUserPage: number; currentUserPage: number; - teamUsersSearchText: string; isDescriptionEditable: boolean; isRightPannelLoading: boolean; errorNewTeamData: FormErrorData | undefined; @@ -82,8 +77,8 @@ export interface TeamsAndUsersProps { handleJoinTeamClick: (id: string, data: Operation[]) => void; handleLeaveTeamClick: (id: string, data: Operation[]) => Promise; isAddingUsers: boolean; - getUniqueUserList: () => Array; - addUsersToTeam: (data: Array) => void; + getUniqueUserList: () => Array; + addUsersToTeam: (data: Array) => void; handleAddUser: (data: boolean) => void; removeUserFromTeam: (id: string) => Promise; handleUserSearchTerm: (value: string) => void; @@ -96,10 +91,6 @@ export interface TeamDetailsProp { assetsCount: number; currentTeam: Team; teams?: Team[]; - currentTeamUsers: User[]; - teamUserPaging: Paging; - currentTeamUserPage: number; - teamUsersSearchText: string; isDescriptionEditable: boolean; isTeamMemberLoading: number; isFetchingAdvancedDetails: boolean; @@ -108,10 +99,7 @@ export interface TeamDetailsProp { handleAddTeam: (value: boolean) => void; descriptionHandler: (value: boolean) => void; onDescriptionUpdate: (value: string) => Promise; - handleTeamUsersSearchAction: (text: string) => void; updateTeamHandler: (data: Team, fetchTeam?: boolean) => Promise; - handleCurrentUserPage: (value?: number) => void; - teamUserPagingHandler: NextPreviousProps['pagingHandler']; handleAddUser: (data: Array) => void; afterDeleteAction: (isSoftDeleted?: boolean) => void; removeUserFromTeam: (id: string) => Promise; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx index 6842c70cd94f..ef851827ba03 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx @@ -42,11 +42,9 @@ import { ReactComponent as ImportIcon } from '../../../assets/svg/ic-import.svg' import { ReactComponent as IconRestore } from '../../../assets/svg/ic-restore.svg'; import { ReactComponent as IconOpenLock } from '../../../assets/svg/open-lock.svg'; import { ReactComponent as IconTeams } from '../../../assets/svg/teams.svg'; -import { useAuthContext } from '../../../components/authentication/auth-provider/AuthProvider'; import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; import { useEntityExportModalProvider } from '../../../components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import { EntityDetailsObjectInterface } from '../../../components/Explore/explore.interface'; import AssetsTabs from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.component'; import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import { @@ -76,13 +74,8 @@ import { } from '../../../generated/entity/teams/user'; import { EntityReference } from '../../../generated/type/entityReference'; import { useAuth } from '../../../hooks/authHooks'; -import { - AddAttribute, - PlaceholderProps, - TeamDetailsProp, -} from '../../../interface/teamsAndUsers.interface'; import AddAttributeModal from '../../../pages/RolesPage/AddAttributeModal/AddAttributeModal'; -import { ImportType } from '../../../pages/teams/ImportTeamsPage/ImportTeamsPage.interface'; +import { ImportType } from '../../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.interface'; import { getSuggestions } from '../../../rest/miscAPI'; import { exportTeam, restoreTeam } from '../../../rest/teamsAPI'; import { Transi18next } from '../../../utils/CommonUtils'; @@ -97,18 +90,25 @@ import { getDeleteMessagePostFix, } from '../../../utils/TeamUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import Description from '../../common/description/Description'; -import ManageButton from '../../common/entityPageInfo/ManageButton/ManageButton'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import Searchbar from '../../common/searchbar/Searchbar'; -import TitleBreadcrumb from '../../common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../../common/title-breadcrumb/title-breadcrumb.interface'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import Description from '../../common/EntityDescription/Description'; +import ManageButton from '../../common/EntityPageInfos/ManageButton/ManageButton'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; import Loader from '../../Loader/Loader'; import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; import TabsLabel from '../../TabsLabel/TabsLabel.component'; import ListEntities from './RolesAndPoliciesList'; import { TeamsPageTab } from './team.interface'; +import { + AddAttribute, + PlaceholderProps, + TeamDetailsProp, +} from './TeamDetailsV1.interface'; import { getTabs } from './TeamDetailsV1.utils'; import TeamHierarchy from './TeamHierarchy'; import './teams.less'; @@ -119,10 +119,6 @@ import { UserTab } from './UserTab/UserTab.component'; const TeamDetailsV1 = ({ assetsCount, currentTeam, - currentTeamUsers, - teamUserPaging, - currentTeamUserPage, - teamUsersSearchText, isDescriptionEditable, isTeamMemberLoading, childTeams, @@ -133,9 +129,6 @@ const TeamDetailsV1 = ({ descriptionHandler, showDeletedTeam, onShowDeletedTeamChange, - handleTeamUsersSearchAction, - handleCurrentUserPage, - teamUserPagingHandler, handleJoinTeamClick, handleLeaveTeamClick, handleAddUser, @@ -453,10 +446,6 @@ const TeamDetailsV1 = ({ setSearchTerm(''); }, [childTeams, showDeletedTeam]); - useEffect(() => { - handleCurrentUserPage(); - }, []); - const removeUserBodyText = (leave: boolean) => { const text = leave ? t('message.leave-the-team-team-name', { @@ -723,31 +712,18 @@ const TeamDetailsV1 = ({ const userTabRender = useMemo( () => ( ), [ - currentTeamUserPage, currentTeam, isTeamMemberLoading, - teamUserPaging, entityPermissions, - teamUsersSearchText, - currentTeamUsers, handleAddUser, - teamUserPagingHandler, removeUserFromTeam, - handleTeamUsersSearchAction, ] ); @@ -1096,7 +1072,6 @@ const TeamDetailsV1 = ({ })), [ currentTeam, - teamUserPaging, searchTerm, teamCount, currentTab, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx index 18b77b9b6857..179a0becd36d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx @@ -21,7 +21,7 @@ import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import FilterTablePlaceHolder from '../../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +import FilterTablePlaceHolder from '../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import Table from '../../../components/common/Table/Table'; import { TABLE_CONSTANTS } from '../../../constants/Teams.constants'; import { TeamType } from '../../../generated/api/teams/createTeam'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx index 38ef95abebfb..cae5ddd99094 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx @@ -22,7 +22,7 @@ import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg' import { Team } from '../../../../generated/entity/teams/team'; import { useAuth } from '../../../../hooks/authHooks'; import { hasEditAccess } from '../../../../utils/CommonUtils'; -import { useAuthContext } from '../../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; import { TeamsHeadingLabelProps } from '../team.interface'; const TeamsHeadingLabel = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx index b6ea4c1bc484..92f4b56f18d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx @@ -24,7 +24,7 @@ import { EntityType } from '../../../../enums/entity.enum'; import { Team, TeamType } from '../../../../generated/entity/teams/team'; import { EntityReference } from '../../../../generated/entity/type'; import { useAuth } from '../../../../hooks/authHooks'; -import { useAuthContext } from '../../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; import { DomainLabel } from '../../../common/DomainLabel/DomainLabel.component'; import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; import TeamTypeSelect from '../../../common/TeamTypeSelect/TeamTypeSelect.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx index 135521e3bcc8..930686101572 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx @@ -16,48 +16,54 @@ import { ColumnsType } from 'antd/lib/table'; import classNames from 'classnames'; import { isEmpty, orderBy } from 'lodash'; import QueryString from 'qs'; -import React, { useCallback, useMemo, useState } from 'react'; +import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { ReactComponent as ExportIcon } from '../../../../assets/svg/ic-export.svg'; import { ReactComponent as ImportIcon } from '../../../../assets/svg/ic-import.svg'; import { ReactComponent as IconRemove } from '../../../../assets/svg/ic-remove.svg'; -import ManageButton from '../../../../components/common/entityPageInfo/ManageButton/ManageButton'; -import ErrorPlaceHolder from '../../../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import FilterTablePlaceHolder from '../../../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +import ErrorPlaceHolder from '../../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import FilterTablePlaceHolder from '../../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import { ManageButtonItemLabel } from '../../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import NextPrevious from '../../../../components/common/next-previous/NextPrevious'; -import Searchbar from '../../../../components/common/searchbar/Searchbar'; import Table from '../../../../components/common/Table/Table'; import { UserSelectableList } from '../../../../components/common/UserSelectableList/UserSelectableList.component'; import { useEntityExportModalProvider } from '../../../../components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; -import { commonUserDetailColumns } from '../../../../components/Users/Users.util'; -import { PAGE_SIZE_MEDIUM } from '../../../../constants/constants'; +import { + INITIAL_PAGING_VALUE, + PAGE_SIZE_BASE, + PAGE_SIZE_MEDIUM, +} from '../../../../constants/constants'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, } from '../../../../constants/GlobalSettings.constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; import { EntityAction } from '../../../../enums/entity.enum'; +import { SearchIndex } from '../../../../enums/search.enum'; import { User } from '../../../../generated/entity/teams/user'; import { EntityReference } from '../../../../generated/entity/type'; -import { ImportType } from '../../../../pages/teams/ImportTeamsPage/ImportTeamsPage.interface'; +import { Paging } from '../../../../generated/type/paging'; +import { usePaging } from '../../../../hooks/paging/usePaging'; +import { SearchResponse } from '../../../../interface/search.interface'; +import { ImportType } from '../../../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.interface'; +import { searchData } from '../../../../rest/miscAPI'; import { exportUserOfTeam } from '../../../../rest/teamsAPI'; +import { getUsers } from '../../../../rest/userAPI'; +import { formatUsersResponse } from '../../../../utils/APIUtils'; import { getEntityName } from '../../../../utils/EntityUtils'; import { getSettingsPathWithFqn } from '../../../../utils/RouterUtils'; +import { getDecodedFqn, getEncodedFqn } from '../../../../utils/StringsUtils'; +import { commonUserDetailColumns } from '../../../../utils/Users.util'; +import ManageButton from '../../../common/EntityPageInfos/ManageButton/ManageButton'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; +import Searchbar from '../../../common/SearchBarComponent/SearchBar.component'; import { UserTabProps } from './UserTab.interface'; export const UserTab = ({ - users, - searchText, - isLoading, permission, currentTeam, - onSearchUsers, onAddUser, - paging, - onChangePaging, - currentPage, onRemoveUser, }: UserTabProps) => { const { t } = useTranslation(); @@ -69,6 +75,103 @@ export const UserTab = ({ const user = currentTeam.users?.find((u) => u.id === id); setDeletingUser(user); }; + const [isLoading, setIsLoading] = useState(true); + const [users, setUsers] = useState([]); + const [searchText, setSearchText] = useState(''); + const { + currentPage, + pageSize, + paging, + handlePageChange, + handlePageSizeChange, + handlePagingChange, + showPagination, + } = usePaging(PAGE_SIZE_MEDIUM); + + /** + * Make API call to fetch current team user data + */ + const getCurrentTeamUsers = (team: string, paging: Partial = {}) => { + setIsLoading(true); + getUsers({ + fields: 'teams,roles', + limit: PAGE_SIZE_BASE, + team: getDecodedFqn(team), + ...paging, + }) + .then((res) => { + if (res.data) { + setUsers(res.data); + handlePagingChange(res.paging); + } + }) + .catch(() => { + setUsers([]); + handlePagingChange({ total: 0 }); + }) + .finally(() => { + setIsLoading(false); + }); + }; + + const searchUsers = (text: string, currentPage: number) => { + setIsLoading(true); + searchData( + text, + currentPage, + PAGE_SIZE_BASE, + `(teams.id:${currentTeam?.id})`, + '', + '', + SearchIndex.USER + ) + .then((res) => { + const data = formatUsersResponse( + (res.data as SearchResponse).hits.hits + ); + setUsers(data); + handlePagingChange({ + total: res.data.hits.total.value, + }); + }) + .catch(() => { + setUsers([]); + }) + .finally(() => setIsLoading(false)); + }; + + const userPagingHandler = ({ + cursorType, + currentPage, + }: PagingHandlerParams) => { + if (searchText) { + handlePageChange(currentPage); + searchUsers(searchText, currentPage); + } else if (cursorType) { + handlePageChange(currentPage); + getCurrentTeamUsers(currentTeam.name, { + [cursorType]: paging[cursorType], + }); + } + }; + + const handleCurrentUserPage = (value?: number) => { + handlePageChange(value ?? INITIAL_PAGING_VALUE); + }; + + const handleUsersSearchAction = (text: string) => { + setSearchText(text); + handleCurrentUserPage(INITIAL_PAGING_VALUE); + if (text) { + searchUsers(text, INITIAL_PAGING_VALUE); + } else { + getCurrentTeamUsers(currentTeam.name); + } + }; + + useEffect(() => { + getCurrentTeamUsers(getEncodedFqn(currentTeam.name)); + }, [currentTeam]); const isTeamDeleted = useMemo( () => currentTeam.deleted ?? false, @@ -194,7 +297,7 @@ export const UserTab = ({ : t('message.no-permission-for-action'); }, [permission, isTeamDeleted]); - if (isEmpty(users) && !searchText && isLoading <= 0) { + if (isEmpty(users) && !searchText && !isLoading) { return ( {!currentTeam.deleted && ( @@ -278,7 +381,7 @@ export const UserTab = ({ className="teams-list-table" columns={columns} dataSource={sortedUser} - loading={isLoading > 0} + loading={isLoading} locale={{ emptyText: , }} @@ -286,13 +389,14 @@ export const UserTab = ({ rowKey="name" size="small" /> - {paging.total > PAGE_SIZE_MEDIUM && ( + {showPagination && ( )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts index a52ba40f07bd..9e96a4762148 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts @@ -10,23 +10,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { NextPreviousProps } from '../../../../components/common/next-previous/NextPrevious.interface'; import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; import { Team } from '../../../../generated/entity/teams/team'; -import { User } from '../../../../generated/entity/teams/user'; import { EntityReference } from '../../../../generated/type/entityReference'; -import { Paging } from '../../../../generated/type/paging'; export interface UserTabProps { - users: User[]; - searchText: string; - isLoading: number; permission: OperationPermission; currentTeam: Team; - onSearchUsers: (text: string) => void; onAddUser: (data: EntityReference[]) => void; - paging: Paging; - onChangePaging: NextPreviousProps['pagingHandler']; - currentPage: number; onRemoveUser: (id: string) => Promise; } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx index 9a41bbd7b77c..4f593f4bd8d6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx @@ -10,55 +10,46 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { - act, - findByText, - fireEvent, - render, - screen, -} from '@testing-library/react'; +import { render, screen } from '@testing-library/react'; import React from 'react'; import { BrowserRouter } from 'react-router-dom'; import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; -import { pagingObject } from '../../../../constants/constants'; import { Team } from '../../../../generated/entity/teams/team'; -import { User } from '../../../../generated/entity/teams/user'; import { MOCK_MARKETING_TEAM } from '../../../../mocks/Teams.mock'; +import { getUsers } from '../../../../rest/userAPI'; import { UserTab } from './UserTab.component'; import { UserTabProps } from './UserTab.interface'; +const mockOnRemoveUser = jest.fn().mockResolvedValue('removed'); + const props: UserTabProps = { - users: MOCK_MARKETING_TEAM.users as User[], - searchText: '', - isLoading: 0, permission: { EditAll: true, } as OperationPermission, currentTeam: MOCK_MARKETING_TEAM as Team, - onSearchUsers: jest.fn(), onAddUser: jest.fn(), - paging: pagingObject, - onChangePaging: jest.fn(), - currentPage: 1, - onRemoveUser: jest.fn().mockResolvedValue('removed'), + onRemoveUser: mockOnRemoveUser, }; jest.mock( - '../../../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); } ); -jest.mock('../../../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious
); }); -jest.mock('../../../../components/common/searchbar/Searchbar', () => { - return jest.fn().mockImplementation(() =>
Searchbar
); -}); +jest.mock( + '../../../../components/common/SearchBarComponent/SearchBar.component', + () => { + return jest.fn().mockImplementation(() =>
Searchbar
); + } +); jest.mock('../../../../components/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); jest.mock( - '../../../../components/common/entityPageInfo/ManageButton/ManageButton', + '../../../../components/common/EntityPageInfos/ManageButton/ManageButton', () => { return jest.fn().mockImplementation(() =>
ManageButton
); } @@ -74,6 +65,13 @@ jest.mock( }) ); +jest.mock('../../../../rest/userAPI', () => ({ + getUsers: jest.fn().mockResolvedValue({ + data: [{ id: 'test', name: 'testing' }], + paging: { total: 10 }, + }), +})); + describe('UserTab', () => { it('Component should render', async () => { render( @@ -82,7 +80,8 @@ describe('UserTab', () => { ); - expect(await screen.findByRole('table')).toBeInTheDocument(); + expect(getUsers).toHaveBeenCalled(); + // expect(await screen.findByRole('table')).toBeInTheDocument(); expect( await screen.findByTestId('user-selectable-list') ).toBeInTheDocument(); @@ -92,9 +91,13 @@ describe('UserTab', () => { }); it('Error placeholder should visible if there is no data', async () => { + (getUsers as jest.Mock).mockRejectedValueOnce({ + data: [], + paging: { total: 0 }, + }); render( - + ); @@ -104,11 +107,10 @@ describe('UserTab', () => { it('Loader should visible if data is loading', async () => { render( - + ); - expect(await screen.findByTestId('skeleton-table')).toBeInTheDocument(); expect(screen.queryByRole('table')).toBeInTheDocument(); expect( await screen.findByTestId('user-selectable-list') @@ -118,38 +120,16 @@ describe('UserTab', () => { }); it('Pagination should visible if total value is greater then 25', async () => { - render( - - - - ); - - expect(await screen.findByText('NextPrevious')).toBeInTheDocument(); - }); - - it('Remove user flow', async () => { + (getUsers as jest.Mock).mockResolvedValueOnce({ + data: [{ id: 'test', name: 'testing' }], + paging: { total: 30 }, + }); render( ); - const removeBtn = await screen.findByTestId('remove-user-btn'); - - expect(removeBtn).toBeInTheDocument(); - await act(async () => { - fireEvent.click(removeBtn); - }); - const confirmationModal = await screen.findByTestId('confirmation-modal'); - const confirmBtn = await findByText(confirmationModal, 'label.confirm'); - - expect(confirmationModal).toBeInTheDocument(); - expect(confirmBtn).toBeInTheDocument(); - - await act(async () => { - fireEvent.click(confirmBtn); - }); - - expect(props.onRemoveUser).toHaveBeenCalledWith(props.users[0].id); + expect(await screen.findByText('NextPrevious')).toBeInTheDocument(); }); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx index b98f75a17358..c4618258514b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx @@ -31,7 +31,7 @@ jest.mock('react-router-dom', () => ({ })), })); -jest.mock('../../common/rich-text-editor/RichTextEditor', () => +jest.mock('../../common/RichTextEditor/RichTextEditor', () => jest.fn().mockReturnValue(<>RichTextEditor) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx index c0d7e19fae87..7ed9873c7205 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx @@ -15,7 +15,7 @@ import { Button, Form, Input, Space } from 'antd'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import RichTextEditor from '../../../components/common/rich-text-editor/RichTextEditor'; +import RichTextEditor from '../../../components/common/RichTextEditor/RichTextEditor'; import Loader from '../../../components/Loader/Loader'; import { PAGE_SIZE_MEDIUM, @@ -26,7 +26,7 @@ import { TestSuite } from '../../../generated/tests/testSuite'; import { DataQualityPageTabs } from '../../../pages/DataQuality/DataQualityPage.interface'; import { getListTestSuites } from '../../../rest/testAPI'; import { getDataQualityPagePath } from '../../../utils/RouterUtils'; -import { AddTestSuiteFormProps } from '../TestSuiteStepper/testSuite.interface'; +import { AddTestSuiteFormProps } from '../TestSuiteStepper/TestSuiteStepper.interface'; const AddTestSuiteForm: React.FC = ({ onSubmit, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx index 3050e53ce1e4..9e06603cf765 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx @@ -20,8 +20,8 @@ import React, { Fragment, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; import { ReactComponent as ExternalLinkIcon } from '../../../assets/svg/external-links.svg'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import ErrorPlaceHolderIngestion from '../../../components/common/error-with-placeholder/ErrorPlaceHolderIngestion'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import ErrorPlaceHolderIngestion from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; import Table from '../../../components/common/Table/Table'; import { IngestionRecentRuns } from '../../../components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component'; import Loader from '../../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/testSuite.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/testSuite.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx index 650fc56a7d32..8ce79258a540 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx @@ -55,7 +55,7 @@ jest.mock('../../../components/AddDataQualityTest/TestSuiteIngestion', () => { return jest.fn().mockReturnValue(
TestSuiteIngestion
); }); -jest.mock('../../../components/common/success-screen/SuccessScreen', () => { +jest.mock('../../../components/common/SuccessScreen/SuccessScreen', () => { return jest.fn().mockReturnValue(
SuccessScreen
); }); @@ -76,13 +76,13 @@ jest.mock('../../../components/common/ResizablePanels/ResizablePanels', () => ); jest.mock( - '../../../components/common/title-breadcrumb/title-breadcrumb.component', + '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest.fn().mockReturnValue(
Title Breadcrumb
); } ); -jest.mock('../../../components/containers/PageLayoutV1', () => +jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ children, leftPanel, rightPanel }) => (
{leftPanel} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx index 187b1e298c03..b2372507515a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx @@ -20,8 +20,6 @@ import RightPanel from '../../../components/AddDataQualityTest/components/RightP import { getRightPanelForAddTestSuitePage } from '../../../components/AddDataQualityTest/rightPanelData'; import { AddTestCaseList } from '../../../components/AddTestCaseList/AddTestCaseList.component'; import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; -import SuccessScreen from '../../../components/common/success-screen/SuccessScreen'; -import TitleBreadcrumb from '../../../components/common/title-breadcrumb/title-breadcrumb.component'; import IngestionStepper from '../../../components/IngestionStepper/IngestionStepper.component'; import { HTTP_STATUS_CODE } from '../../../constants/auth.constants'; import { @@ -38,7 +36,9 @@ import { import { getTestSuitePath } from '../../../utils/RouterUtils'; import { getEncodedFqn } from '../../../utils/StringsUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import SuccessScreen from '../../common/SuccessScreen/SuccessScreen'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import AddTestSuiteForm from '../AddTestSuiteForm/AddTestSuiteForm'; const TestSuiteStepper = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx index 4d48357180a0..1130377d2c60 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx @@ -19,15 +19,15 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import QueryViewer from '../../components/common/QueryViewer/QueryViewer.component'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; +import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import SampleDataWithMessages from '../../components/SampleDataWithMessages/SampleDataWithMessages'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; @@ -52,7 +52,7 @@ import { getTagsWithoutTier, getTierTags } from '../../utils/TableUtils'; import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; import { TopicDetailsProps } from './TopicDetails.interface'; import TopicSchemaFields from './TopicSchema/TopicSchema'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx index 8f5edfab043f..d717b53f1eb6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx @@ -80,19 +80,19 @@ jest.mock( } ); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => { +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest.fn().mockReturnValue(

Breadcrumb

); }); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviwer

); }); @@ -110,7 +110,7 @@ jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ .mockReturnValue(

CustomPropertyTable.component

), })); -jest.mock('../schema-editor/SchemaEditor', () => { +jest.mock('../SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(

SchemaEditor

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx index 8502e84a4c7b..e7b26b283bcd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx @@ -49,7 +49,7 @@ jest.mock('../../../utils/GlossaryUtils', () => ({ getGlossaryTermsList: jest.fn().mockImplementation(() => Promise.resolve([])), })); -jest.mock('../../common/rich-text-editor/RichTextEditorPreviewer', () => +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() .mockReturnValue( @@ -74,7 +74,7 @@ jest.mock('../../TableTags/TableTags.component', () => )) ); -jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest .fn() .mockImplementation(() => ( @@ -82,7 +82,7 @@ jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => )) ); -jest.mock('../../schema-editor/SchemaEditor', () => +jest.mock('../../SchemaEditor/SchemaEditor', () => jest .fn() .mockImplementation(() => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx index f53fbe804680..84dd1596bc36 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx @@ -28,10 +28,9 @@ import { cloneDeep, groupBy, isEmpty, isUndefined, uniqBy } from 'lodash'; import { EntityTags, TagFilterOptions } from 'Models'; import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import SchemaEditor from '../../../components/schema-editor/SchemaEditor'; import { ColumnFilter } from '../../../components/Table/ColumnFilter/ColumnFilter.component'; import TableDescription from '../../../components/TableDescription/TableDescription.component'; import TableTags from '../../../components/TableTags/TableTags.component'; @@ -53,6 +52,7 @@ import { updateFieldDescription, updateFieldTags, } from '../../../utils/TableUtils'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import { SchemaViewType, TopicSchemaFieldsProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx index 60b2fba65f44..42e6150e825d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx @@ -18,7 +18,7 @@ import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; import Loader from '../../components/Loader/Loader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts index d185d451671c..8e6c6cb18f2e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Topic } from '../../generated/entity/data/topic'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface TopicVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx index 2e0960da3673..92c4829228d4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx @@ -42,13 +42,12 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', - () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) +jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => + jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); jest.mock( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx index fdd71574993e..91be2930ff00 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx @@ -47,11 +47,11 @@ import { getEpochMillisForPastDays, } from '../../utils/date-time/DateTimeUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import '../DataInsightDetail/DataInsightDetail.less'; +import '../DataInsightDetail/data-insight-detail.less'; import { EmptyGraphPlaceholder } from '../DataInsightDetail/EmptyGraphPlaceholder'; import TotalEntityInsightSummary from '../DataInsightDetail/TotalEntityInsightSummary.component'; +import './total-data-assets-widget.less'; import { TotalDataAssetsWidgetProps } from './TotalDataAssetsWidget.interface'; -import './TotalDataAssetsWidget.less'; const TotalDataAssetsWidget = ({ isEditView = false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.less b/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/total-data-assets-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.less rename to openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/total-data-assets-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.test.tsx deleted file mode 100644 index 02ae70cf7e77..000000000000 --- a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.test.tsx +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright 2023 Collate. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { cleanup, render, screen } from '@testing-library/react'; -import React from 'react'; -import { MemoryRouter } from 'react-router-dom'; -import { act } from 'react-test-renderer'; -import { MOCK_USER_DATA } from '../../pages/UserListPage/mockUserData'; -import UserListV1 from './UserListV1'; - -jest.mock('../../rest/userAPI', () => ({ - updateUser: jest.fn().mockImplementation(() => Promise.resolve()), -})); - -jest.mock('../../generated/api/teams/createUser', () => ({ - CreateUser: jest.fn().mockImplementation(() => Promise.resolve()), -})); - -jest.mock('../../utils/ToastUtils', () => ({ - showErrorToast: jest.fn(), - showSuccessToast: jest.fn(), -})); - -jest.mock('../common/DeleteWidget/DeleteWidgetModal', () => { - return jest.fn().mockImplementation(() =>
DeleteWidgetModal
); -}); - -jest.mock('../common/error-with-placeholder/ErrorPlaceHolder', () => { - return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); -}); - -jest.mock('../common/next-previous/NextPrevious', () => { - return jest.fn().mockImplementation(() =>
NextPrevious
); -}); - -jest.mock('../header/PageHeader.component', () => { - return jest.fn().mockImplementation(() =>
PageHeader
); -}); - -jest.mock('../Loader/Loader', () => { - return jest.fn().mockImplementation(() =>
Loader
); -}); - -jest.mock('../common/searchbar/Searchbar', () => { - return jest - .fn() - .mockImplementation((prop) => ( - prop.onSearch(e.target.value)} - /> - )); -}); - -const mockFunction = jest.fn(); - -const MOCK_PROPS_DATA = { - data: MOCK_USER_DATA.data, - paging: MOCK_USER_DATA.paging, - searchTerm: '', - currentPage: 1, - isDataLoading: false, - showDeletedUser: false, - onSearch: mockFunction, - onShowDeletedUserChange: mockFunction, - onPagingChange: mockFunction, - afterDeleteAction: mockFunction, - isAdminPage: false, -}; - -describe('Test UserListV1 component', () => { - beforeEach(() => { - cleanup(); - }); - - it('Should render component', async () => { - await act(async () => { - render(, { - wrapper: MemoryRouter, - }); - }); - - const userListComponent = await screen.findByTestId( - 'user-list-v1-component' - ); - const pageHeader = await screen.findByText('PageHeader'); - - expect(userListComponent).toBeInTheDocument(); - expect(pageHeader).toBeInTheDocument(); - }); - - it('Should render ErrorPlaceHolder', async () => { - await act(async () => { - render(, { - wrapper: MemoryRouter, - }); - }); - - const emptyComponent = await screen.findByText('ErrorPlaceHolder'); - - expect(emptyComponent).toBeInTheDocument(); - }); - - it('Should render Users table', async () => { - await act(async () => { - render(, { - wrapper: MemoryRouter, - }); - }); - - const userListComponent = await screen.findByTestId( - 'user-list-v1-component' - ); - - expect(userListComponent).toBeInTheDocument(); - - const table = await screen.findByTestId('user-list-table'); - - expect(table).toBeInTheDocument(); - - const userName = await screen.findByText('label.username'); - const teams = await screen.findByText('label.team-plural'); - const role = await screen.findByText('label.role-plural'); - - expect(userName).toBeInTheDocument(); - expect(teams).toBeInTheDocument(); - expect(role).toBeInTheDocument(); - - const rows = await screen.findAllByRole('row'); - - expect(rows).toHaveLength(MOCK_PROPS_DATA.data.length + 1); - }); - - it('Should not render data when bot is search', async () => { - await act(async () => { - render(, { - wrapper: MemoryRouter, - }); - }); - - const userListComponent = await screen.findByTestId( - 'user-list-v1-component' - ); - - expect(userListComponent).toBeInTheDocument(); - - const table = await screen.findByTestId('user-list-table'); - - const noDataTable = await screen.findByText('ErrorPlaceHolder'); - - expect(table).toBeInTheDocument(); - expect(noDataTable).toBeInTheDocument(); - }); -}); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx deleted file mode 100644 index 6793df7a492d..000000000000 --- a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx +++ /dev/null @@ -1,317 +0,0 @@ -/* - * Copyright 2022 Collate. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Button, Col, Modal, Row, Space, Switch, Tooltip } from 'antd'; -import { ColumnsType } from 'antd/lib/table'; -import { AxiosError } from 'axios'; -import { isEmpty, isUndefined } from 'lodash'; -import React, { FC, useMemo, useState } from 'react'; -import { useTranslation } from 'react-i18next'; -import { useHistory } from 'react-router-dom'; -import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg'; -import { ReactComponent as IconRestore } from '../../assets/svg/ic-restore.svg'; -import FilterTablePlaceHolder from '../../components/common/error-with-placeholder/FilterTablePlaceHolder'; -import { NextPreviousProps } from '../../components/common/next-previous/NextPrevious.interface'; -import Table from '../../components/common/Table/Table'; -import { PAGE_SIZE_BASE, ROUTES } from '../../constants/constants'; -import { ADMIN_ONLY_ACTION } from '../../constants/HelperTextUtil'; -import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; -import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; -import { CreateUser } from '../../generated/api/teams/createUser'; -import { User } from '../../generated/entity/teams/user'; -import { Paging } from '../../generated/type/paging'; -import { useAuth } from '../../hooks/authHooks'; -import { updateUser } from '../../rest/userAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import DeleteWidgetModal from '../common/DeleteWidget/DeleteWidgetModal'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../common/next-previous/NextPrevious'; -import Searchbar from '../common/searchbar/Searchbar'; -import PageHeader from '../header/PageHeader.component'; -import { commonUserDetailColumns } from '../Users/Users.util'; -import './usersList.less'; - -interface UserListV1Props { - data: User[]; - paging: Paging; - searchTerm: string; - currentPage: number; - isDataLoading: boolean; - showDeletedUser: boolean; - onPagingChange: NextPreviousProps['pagingHandler']; - onShowDeletedUserChange: (value: boolean) => void; - onSearch: (text: string) => void; - afterDeleteAction: () => void; - isAdminPage: boolean | undefined; -} - -const UserListV1: FC = ({ - data, - paging, - searchTerm, - currentPage, - isDataLoading, - showDeletedUser, - onSearch, - onShowDeletedUserChange, - onPagingChange, - afterDeleteAction, - isAdminPage, -}) => { - const { isAdminUser } = useAuth(); - const { t } = useTranslation(); - const history = useHistory(); - const [selectedUser, setSelectedUser] = useState(); - const [showDeleteModal, setShowDeleteModal] = useState(false); - const [showReactiveModal, setShowReactiveModal] = useState(false); - const showRestore = showDeletedUser && !isDataLoading; - const [isLoading, setIsLoading] = useState(false); - - const handleAddNewUser = () => { - history.push(ROUTES.CREATE_USER); - }; - - const handleReactiveUser = async () => { - if (isUndefined(selectedUser)) { - return; - } - setIsLoading(true); - const updatedUserData: CreateUser = { - description: selectedUser.description, - displayName: selectedUser.displayName, - email: selectedUser.email, - isAdmin: selectedUser.isAdmin, - name: selectedUser.name, - profile: selectedUser.profile, - roles: selectedUser.roles?.map((role) => role.id), - teams: selectedUser.teams?.map((team) => team.id), - }; - - try { - const { data } = await updateUser(updatedUserData); - if (data) { - afterDeleteAction(); - showSuccessToast( - t('message.entity-restored-success', { entity: t('label.user') }) - ); - setShowReactiveModal(false); - } else { - throw t('server.entity-updating-error', { entity: t('label.user') }); - } - } catch (error) { - showErrorToast( - error as AxiosError, - t('server.entity-updating-error', { entity: t('label.user') }) - ); - } finally { - setIsLoading(false); - } - setSelectedUser(undefined); - }; - - const columns: ColumnsType = useMemo(() => { - return [ - ...commonUserDetailColumns(), - { - title: t('label.action-plural'), - dataIndex: 'actions', - key: 'actions', - width: 90, - render: (_, record) => ( - - {showRestore && ( - -
- - - {t('label.deleted')} - - - - - - - ), - [isAdminUser, showDeletedUser] - ); - - if (isEmpty(data) && !showDeletedUser && !isDataLoading && !searchTerm) { - return errorPlaceHolder; - } - - return ( - - - - - - - - - {t('label.deleted')} - - - {isAdminUser && ( - - )} - - - - - - - -
, - }} - pagination={false} - rowKey="id" - size="small" - /> - - - {paging.total > PAGE_SIZE_BASE && ( - - )} - - - { - setShowReactiveModal(false); - setSelectedUser(undefined); - }} - onOk={handleReactiveUser}> -

- {t('message.are-you-want-to-restore', { - entity: getEntityName(selectedUser), - })} -

- - - { - setShowDeleteModal(false); - setSelectedUser(undefined); - }} - /> - - ); -}; - -export default UserListV1; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx index 8cc32c1a9ab7..bf4ca1e66c13 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx @@ -35,8 +35,8 @@ import { EntityReference } from '../../../generated/entity/type'; import { getEntityName } from '../../../utils/EntityUtils'; import i18n from '../../../utils/i18next/LocalUtil'; import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import Avatar from '../../common/avatar/Avatar'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import Avatar from '../../common/AvatarComponent/Avatar'; import './user-profile-icon.less'; type ListMenuItemProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx index 6af28687fe87..a6579f827d12 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx @@ -68,7 +68,7 @@ jest.mock('./UsersProfile/UserProfileTeams/UserProfileTeams.component', () => { return jest.fn().mockReturnValue(
UserProfileTeams
); }); -jest.mock('../../components/searched-data/SearchedData', () => { +jest.mock('../../components/SearchedData/SearchedData', () => { return jest.fn().mockReturnValue(

SearchedData

); }); @@ -112,7 +112,7 @@ jest.mock('../../rest/teamsAPI', () => ({ getTeams: jest.fn().mockImplementation(() => Promise.resolve(mockTeamsData)), })); -jest.mock('../containers/PageLayoutV1', () => +jest.mock('../PageLayoutV1/PageLayoutV1', () => jest .fn() .mockImplementation( @@ -134,7 +134,7 @@ jest.mock('../containers/PageLayoutV1', () => ) ); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description

); }); const updateUserDetails = jest.fn(); @@ -153,7 +153,7 @@ jest.mock('../../rest/userAPI', () => ({ checkValidImage: jest.fn().mockImplementation(() => Promise.resolve(true)), })); -jest.mock('../containers/PageLayoutV1', () => +jest.mock('../PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ children, leftPanel, rightPanel }) => (
{leftPanel} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx index 671904728f17..57a73c267088 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx @@ -30,20 +30,20 @@ import { useAuth } from '../../hooks/authHooks'; import { searchData } from '../../rest/miscAPI'; import { getEntityName } from '../../utils/EntityUtils'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import Chip from '../common/Chip/Chip.component'; -import DescriptionV1 from '../common/description/DescriptionV1'; -import PageLayoutV1 from '../containers/PageLayoutV1'; +import DescriptionV1 from '../common/EntityDescription/DescriptionV1'; import EntitySummaryPanel from '../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import { EntityDetailsObjectInterface } from '../Explore/explore.interface'; +import { EntityDetailsObjectInterface } from '../Explore/ExplorePage.interface'; import AssetsTabs from '../Glossary/GlossaryTerms/tabs/AssetsTabs.component'; import { AssetNoDataPlaceholderProps, AssetsOfEntity, } from '../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; +import PageLayoutV1 from '../PageLayoutV1/PageLayoutV1'; import { PersonaSelectableList } from '../Persona/PersonaSelectableList/PersonaSelectableList.component'; import { Props, UserPageTabs } from './Users.interface'; -import './Users.style.less'; +import './users.less'; import UserProfileDetails from './UsersProfile/UserProfileDetails/UserProfileDetails.component'; import UserProfileInheritedRoles from './UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component'; import UserProfileRoles from './UsersProfile/UserProfileRoles/UserProfileRoles.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx index 2b3823405941..744a1c81a4ca 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx @@ -17,7 +17,6 @@ import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; -import { useAuthContext } from '../../../../components/authentication/auth-provider/AuthProvider'; import InlineEdit from '../../../../components/InlineEdit/InlineEdit.component'; import ChangePasswordForm from '../../../../components/Users/ChangePasswordForm'; import { @@ -35,6 +34,7 @@ import { useAuth } from '../../../../hooks/authHooks'; import { changePassword } from '../../../../rest/auth-API'; import { getEntityName } from '../../../../utils/EntityUtils'; import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; import Chip from '../../../common/Chip/Chip.component'; import { PersonaSelectableList } from '../../../Persona/PersonaSelectableList/PersonaSelectableList.component'; import UserProfileImage from '../UserProfileImage/UserProfileImage.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx index eb2c4331cf59..37455111270b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx @@ -16,7 +16,7 @@ import { MemoryRouter } from 'react-router-dom'; import { AuthProvider } from '../../../../generated/settings/settings'; import { useAuth } from '../../../../hooks/authHooks'; import { USER_DATA } from '../../../../mocks/User.mock'; -import { useAuthContext } from '../../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; import UserProfileDetails from './UserProfileDetails.component'; import { UserProfileDetailsProps } from './UserProfileDetails.interface'; @@ -34,19 +34,16 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock( - '../../../../components/authentication/auth-provider/AuthProvider', - () => ({ - useAuthContext: jest.fn(() => ({ - authConfig: { - provider: AuthProvider.Basic, - }, - currentUser: { - name: 'test', - }, - })), - }) -); +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ + useAuthContext: jest.fn(() => ({ + authConfig: { + provider: AuthProvider.Basic, + }, + currentUser: { + name: 'test', + }, + })), +})); jest.mock('../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: true }), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx index 50d16cd93386..2c7c6aa9ae81 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx @@ -18,9 +18,9 @@ import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { User } from '../../../generated/entity/teams/user'; import { EntityReference } from '../../../generated/entity/type'; import { getUserById } from '../../../rest/userAPI'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; +import { commonUserDetailColumns } from '../../../utils/Users.util'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Table from '../../common/Table/Table'; -import { commonUserDetailColumns } from '../Users.util'; interface UsersTabProps { users: EntityReference[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts b/openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts index c8ad90937eb5..a7ba55acf253 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts @@ -11,7 +11,6 @@ * limitations under the License. */ -import { SearchedDataProps } from '../../../components/searched-data/SearchedData.interface'; import { SearchIndex } from '../../../enums/search.enum'; import { DashboardServiceType } from '../../../generated/entity/data/dashboard'; import { @@ -20,6 +19,7 @@ import { TableSearchSource, TopicSearchSource, } from '../../../interface/search.interface'; +import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; export const mockUserData = { id: 'd6764107-e8b4-4748-b256-c86fecc66064', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Users/users.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/Users.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Users/users.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx index 5309b55b4207..f93faca90a66 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx @@ -16,7 +16,7 @@ import { ColumnsType } from 'antd/lib/table'; import { isUndefined } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import FilterTablePlaceHolder from '../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import { NO_DATA_PLACEHOLDER } from '../../constants/constants'; import { TABLE_SCROLL_VALUE } from '../../constants/Table.constants'; import { TableConstraint } from '../../generated/api/data/createTable'; @@ -32,8 +32,8 @@ import { makeData, prepareConstraintIcon, } from '../../utils/TableUtils'; -import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer'; -import Searchbar from '../common/searchbar/Searchbar'; +import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; +import Searchbar from '../common/SearchBarComponent/SearchBar.component'; import TagsViewer from '../Tag/TagsViewer/TagsViewer'; import { VersionTableProps } from './VersionTable.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WebAnalytics/WebAnalyticsProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WebAnalytics/WebAnalyticsProvider.tsx index bb8ef609bbc9..d937a2709fbe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WebAnalytics/WebAnalyticsProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/WebAnalytics/WebAnalyticsProvider.tsx @@ -14,7 +14,7 @@ import React, { ReactNode } from 'react'; import { AnalyticsProvider } from 'use-analytics'; import { getAnalyticInstance } from '../../utils/WebAnalyticsUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; interface WebAnalyticsProps { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/web-scoket/web-scoket.provider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WebSocketProvider/WebSocketProvider.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/web-scoket/web-scoket.provider.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/WebSocketProvider/WebSocketProvider.tsx index 4b13667c5e36..4091bdad1193 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/web-scoket/web-scoket.provider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/WebSocketProvider/WebSocketProvider.tsx @@ -21,7 +21,7 @@ import React, { } from 'react'; import { io, Socket } from 'socket.io-client'; import { ROUTES } from '../../constants/constants'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; export const WebSocketContext = React.createContext<{ socket?: Socket }>({}); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx index 0669cf72aa99..6840e3006b22 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx @@ -21,7 +21,7 @@ import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { ROUTES } from '../../constants/constants'; import { getEntityName } from '../../utils/EntityUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import './welcome-screen.style.less'; const { Paragraph, Text } = Typography; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx index c01b16e14d5b..07ce3397b2ba 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx @@ -31,9 +31,9 @@ import { WidgetCommonProps } from '../../../pages/CustomizablePage/CustomizableP import { getFeedsWithFilter } from '../../../rest/feedsAPI'; import { getCountBadge, getEntityDetailLink } from '../../../utils/CommonUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import FeedsFilterPopover from '../../common/FeedsFilterPopover/FeedsFilterPopover.component'; -import './FeedsWidget.less'; +import './feeds-widget.less'; const FeedsWidget = ({ isEditView = false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.less b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/feeds-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.less rename to openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/feeds-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx index 14528caaa58f..2e2033a67c2e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx @@ -26,7 +26,7 @@ import { import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityIcon, getEntityLink } from '../../../utils/TableUtils'; import EntityListSkeleton from '../../Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; -import './RecentlyViewed.less'; +import './recently-viewed.less'; const RecentlyViewed = ({ isEditView, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.less b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/recently-viewed.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.less rename to openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/recently-viewed.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/avatar/Avatar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/AvatarComponent/Avatar.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/avatar/Avatar.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/AvatarComponent/Avatar.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/avatar/Avatar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/AvatarComponent/Avatar.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/avatar/Avatar.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/AvatarComponent/Avatar.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CronEditor/CronEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CronEditor/CronEditor.tsx index 4d6aab57afa4..754ce93baf4e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CronEditor/CronEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CronEditor/CronEditor.tsx @@ -23,6 +23,7 @@ import { getQuartzCronExpression, getStateValue, } from '../../../utils/CronUtils'; +import './cron-editor.less'; import { getDayOptions, getHourOptions, diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/x-custom/CronEditor.css b/openmetadata-ui/src/main/resources/ui/src/components/common/CronEditor/cron-editor.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/styles/x-custom/CronEditor.css rename to openmetadata-ui/src/main/resources/ui/src/components/common/CronEditor/cron-editor.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx index a6482675fd00..9432e48b578a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx @@ -46,7 +46,7 @@ jest.mock('./PropertyValue', () => ({ PropertyValue: jest.fn().mockReturnValue(
PropertyValue
), })); -jest.mock('../error-with-placeholder/ErrorPlaceHolder', () => { +jest.mock('../ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockReturnValue(
ErrorPlaceHolder.component
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx index 43b55eb5d2d9..8ded0a767e5a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx @@ -40,7 +40,7 @@ import { OperationPermission, ResourceEntity, } from '../../PermissionProvider/PermissionProvider.interface'; -import ErrorPlaceHolder from '../error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../ErrorWithPlaceholder/ErrorPlaceHolder'; import Table from '../Table/Table'; import { CustomPropertyProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx index 3e5f61892c6c..4dc1e31362b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/ExtensionTable.tsx @@ -15,7 +15,7 @@ import { ColumnsType } from 'antd/lib/table'; import { isString, map } from 'lodash'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; import { ExtentionEntities, ExtentionEntitiesKeys, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx index 40eedadbee9e..49330b42df09 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.test.tsx @@ -15,7 +15,7 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; import { PropertyValue } from './PropertyValue'; -jest.mock('../../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest .fn() .mockReturnValue( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx index 37c8a94c9c7b..ecabf8d9aec3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyValue.tsx @@ -20,7 +20,7 @@ import { ReactComponent as EditIconComponent } from '../../../assets/svg/edit-ne import { Table } from '../../../generated/entity/data/table'; import { EntityReference } from '../../../generated/type/entityReference'; import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; import { PropertyInput } from './PropertyInput'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.test.tsx similarity index 99% rename from openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.test.tsx index c2fc3ddd3d09..39438ffa686d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.test.tsx @@ -76,7 +76,7 @@ jest.mock( ), }) ); -jest.mock('../rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../RichTextEditor/RichTextEditorPreviewer', () => { return jest .fn() .mockReturnValue( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.tsx index 4afc4e2278bd..00839be44c09 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/description/Description.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/Description.tsx @@ -35,7 +35,7 @@ import { } from '../../../utils/TasksUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; import { DescriptionProps } from './Description.interface'; const Description: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/description/DescriptionV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/DescriptionV1.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/description/DescriptionV1.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/DescriptionV1.tsx index 9ea6de2ae08b..404b8b1e4361 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/description/DescriptionV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityDescription/DescriptionV1.tsx @@ -30,7 +30,7 @@ import { TASK_ENTITIES, } from '../../../utils/TasksUtils'; import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; const { Text } = Typography; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.less b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer.tsx index c1451efff3a7..1e551d31b3e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementDrawer/AnnouncementDrawer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer.tsx @@ -28,7 +28,7 @@ import { getEntityFeedLink } from '../../../../utils/EntityUtils'; import { deletePost, updateThreadData } from '../../../../utils/FeedUtils'; import { showErrorToast } from '../../../../utils/ToastUtils'; import ActivityThreadPanelBody from '../../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody'; -import { useAuthContext } from '../../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; import AddAnnouncementModal from '../../../Modals/AnnouncementModal/AddAnnouncementModal'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.less b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.tsx index 83a316cc40e6..aed54840408b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/ManageButton/ManageButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityPageInfos/ManageButton/ManageButton.tsx @@ -23,15 +23,15 @@ import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.s import { ReactComponent as IconRestore } from '../../../../assets/svg/ic-restore.svg'; import { ReactComponent as IconSetting } from '../../../../assets/svg/ic-settings-gray.svg'; import { ReactComponent as IconDropdown } from '../../../../assets/svg/menu.svg'; -import { ManageButtonItemLabel } from '../../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import EntityNameModal from '../../../../components/Modals/EntityNameModal/EntityNameModal.component'; -import { EntityName } from '../../../../components/Modals/EntityNameModal/EntityNameModal.interface'; import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; import { DROPDOWN_ICON_SIZE_PROPS } from '../../../../constants/ManageButton.constants'; import { EntityType } from '../../../../enums/entity.enum'; import { ANNOUNCEMENT_ENTITIES } from '../../../../utils/AnnouncementsUtils'; +import EntityNameModal from '../../../Modals/EntityNameModal/EntityNameModal.component'; +import { EntityName } from '../../../Modals/EntityNameModal/EntityNameModal.interface'; import { DeleteOption } from '../../DeleteWidget/DeleteWidget.interface'; import DeleteWidgetModal from '../../DeleteWidget/DeleteWidgetModal'; +import { ManageButtonItemLabel } from '../../ManageButtonContentItem/ManageButtonContentItem.component'; import './ManageButton.less'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx index ce516d6d565a..6ae6155972f6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx @@ -33,7 +33,7 @@ import ProfilePicture from '../ProfilePicture/ProfilePicture'; import TierCard from '../TierCard/TierCard'; import { UserSelectableList } from '../UserSelectableList/UserSelectableList.component'; import { UserTeamSelectableList } from '../UserTeamSelectableList/UserTeamSelectableList.component'; -import './EntitySummaryDetails.style.less'; +import './entity-summary-details.style.less'; export interface GetInfoElementsProps { data: ExtraInfo; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.style.less b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/entity-summary-details.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/entity-summary-details.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/AssignErrorPlaceHolder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/AssignErrorPlaceHolder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/AssignErrorPlaceHolder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/AssignErrorPlaceHolder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/CreateErrorPlaceHolder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/CreateErrorPlaceHolder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/CreateErrorPlaceHolder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/CreateErrorPlaceHolder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/CustomNoDataPlaceHolder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/CustomNoDataPlaceHolder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/CustomNoDataPlaceHolder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/CustomNoDataPlaceHolder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolder.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolder.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolder.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolder.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderES.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderES.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderES.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderES.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderES.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderIngestion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderIngestion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderIngestion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/ErrorPlaceHolderIngestion.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/FilterErrorPlaceHolder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/FilterErrorPlaceHolder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/FilterErrorPlaceHolder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/FilterErrorPlaceHolder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/FilterTablePlaceHolder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/FilterTablePlaceHolder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/FilterTablePlaceHolder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/FilterTablePlaceHolder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/NoDataPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/NoDataPlaceholder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/NoDataPlaceholder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/NoDataPlaceholder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/PermissionErrorPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/PermissionErrorPlaceholder.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/PermissionErrorPlaceholder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/PermissionErrorPlaceholder.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/placeholder.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/placeholder.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/error-with-placeholder/placeholder.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/placeholder.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FeedsFilterPopover/FeedsFilterPopover.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FeedsFilterPopover/FeedsFilterPopover.component.tsx index 342fabb9833b..55e9a03c6034 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/FeedsFilterPopover/FeedsFilterPopover.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FeedsFilterPopover/FeedsFilterPopover.component.tsx @@ -15,7 +15,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as FilterIcon } from '../../../assets/svg/ic-feeds-filter.svg'; import { FeedFilter } from '../../../enums/mydata.enum'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import './feeds-filter-popover.less'; import { FeedsFilterPopoverProps } from './FeedsFilterPopover.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/InheritedRolesCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/InheritedRolesCard.component.tsx index 2b062cbfea96..76ef614bfa2b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/InheritedRolesCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/InheritedRolesCard.component.tsx @@ -17,8 +17,8 @@ import React, { Fragment } from 'react'; import { useTranslation } from 'react-i18next'; import { getEntityName } from '../../../utils/EntityUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; +import './inherited-roles-card.style.less'; import { InheritedRolesCardProps } from './InheritedRolesCard.interface'; -import './InheritedRolesCard.style.less'; const InheritedRolesCard = ({ userData }: InheritedRolesCardProps) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/InheritedRolesCard.style.less b/openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/inherited-roles-card.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/InheritedRolesCard.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/InheritedRolesCard/inherited-roles-card.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/next-previous/NextPrevious.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/next-previous/NextPrevious.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/next-previous/NextPrevious.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/next-previous/NextPrevious.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/next-previous/NextPrevious.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/next-previous/NextPrevious.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/NextPrevious/NextPrevious.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx index fb3efa7bbeac..8766ca7f8619 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx @@ -44,7 +44,7 @@ import { getTopicByFqn } from '../../../rest/topicsAPI'; import { getTableFQNFromColumnFQN } from '../../../utils/CommonUtils'; import { getEntityName } from '../../../utils/EntityUtils'; import { getDecodedFqn, getEncodedFqn } from '../../../utils/StringsUtils'; -import { EntityUnion } from '../../Explore/explore.interface'; +import { EntityUnion } from '../../Explore/ExplorePage.interface'; import ExploreSearchCard from '../../ExploreV1/ExploreSearchCard/ExploreSearchCard'; import Loader from '../../Loader/Loader'; import './popover-card.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.test.tsx index 5d05a1038867..2185c851c0a4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.test.tsx @@ -17,7 +17,7 @@ import AppState from '../../../AppState'; import { getUserProfilePic } from '../../../utils/UserDataUtils'; import ProfilePicture from './ProfilePicture'; -jest.mock('../avatar/Avatar', () => { +jest.mock('../AvatarComponent/Avatar', () => { return jest.fn().mockImplementation(() =>
Avatar
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx index cae0c3a873d8..6e8d336435a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx @@ -23,7 +23,7 @@ import { getUserProfilePic } from '../../../utils/UserDataUtils'; import Loader from '../../Loader/Loader'; import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; -import Avatar from '../avatar/Avatar'; +import Avatar from '../AvatarComponent/Avatar'; type UserData = Pick; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx index 213005068e89..2f17c9758f66 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx @@ -16,9 +16,9 @@ import { split } from 'lodash'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as CopyIcon } from '../../../assets/svg/icon-copy.svg'; -import SchemaEditor from '../../../components/schema-editor/SchemaEditor'; import { CSMode } from '../../../enums/codemirror.enum'; import { useClipboard } from '../../../hooks/useClipBoard'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import './query-viewer.style.less'; const QueryViewer = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx index 7a06799b5ba2..578c27bdf4ba 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx @@ -15,8 +15,8 @@ import React from 'react'; import { ReflexContainer, ReflexElement, ReflexSplitter } from 'react-reflex'; import DocumentTitle from '../../../components/DocumentTitle/DocumentTitle'; import PanelContainer from './PanelContainer/PanelContainer'; +import './resizable-panels.less'; import { ResizablePanelsProps } from './ResizablePanels.interface'; -import './ResizablePanels.less'; const ResizablePanels: React.FC = ({ className, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.less b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/resizable-panels.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/resizable-panels.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/CustomHtmlRederer/CustomHtmlRederer.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/CustomHtmlRederer/CustomHtmlRederer.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/CustomHtmlRederer/CustomHtmlRederer.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/CustomHtmlRederer/CustomHtmlRederer.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/CustomHtmlRederer/CustomHtmlRederer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/CustomHtmlRederer/CustomHtmlRederer.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/CustomHtmlRederer/CustomHtmlRederer.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/CustomHtmlRederer/CustomHtmlRederer.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/EditorToolBar.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/EditorToolBar.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/EditorToolBar.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/EditorToolBar.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.tsx index 6ea8e86001ac..d1ae94353a67 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.tsx @@ -24,7 +24,7 @@ import React, { useState, } from 'react'; import { EDITOR_TOOLBAR_ITEMS } from './EditorToolBar'; -import './RichTextEditor.css'; +import './rich-text-editor.less'; import { editorRef, RichTextEditorProp } from './RichTextEditor.interface'; const RichTextEditor = forwardRef( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx index f8826e25aad1..51c16bafb07c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewer.tsx @@ -21,8 +21,8 @@ import { DESCRIPTION_MAX_PREVIEW_CHARACTERS } from '../../../constants/constants import { formatContent, isHTMLString } from '../../../utils/BlockEditorUtils'; import { getTrimmedContent } from '../../../utils/CommonUtils'; import { customHTMLRenderer } from './CustomHtmlRederer/CustomHtmlRederer'; +import './rich-text-editor-previewer.less'; import { PreviewerProp } from './RichTextEditor.interface'; -import './RichTextEditorPreviewer.less'; const RichTextEditorPreviewer = ({ markdown = '', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.less b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor-previewer.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditorPreviewer.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor-previewer.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.css b/openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/rich-text-editor/RichTextEditor.css rename to openmetadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/rich-text-editor.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/RolesCard/RolesCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RolesCard/RolesCard.component.tsx index ebe64c80382a..d6c4f7fa9af7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/RolesCard/RolesCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RolesCard/RolesCard.component.tsx @@ -20,7 +20,7 @@ import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { TERM_ADMIN } from '../../../constants/constants'; import { useAuth } from '../../../hooks/authHooks'; import { getEntityName } from '../../../utils/EntityUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import RolesElement from '../RolesElement/RolesElement.component'; import { RolesComponentProps } from './RolesCard.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/RolesElement.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/RolesElement.component.tsx index 9a2ac9af9ba1..d572c1cc0657 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/RolesElement.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/RolesElement.component.tsx @@ -18,8 +18,8 @@ import { useTranslation } from 'react-i18next'; import { TERM_ADMIN } from '../../../constants/constants'; import { getEntityName } from '../../../utils/EntityUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; +import './roles-element.styles.less'; import { RolesElementProps } from './RolesElement.interface'; -import './RolesElement.styles.less'; const RolesElement = ({ userData }: RolesElementProps) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/RolesElement.styles.less b/openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/roles-element.styles.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/RolesElement.styles.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/RolesElement/roles-element.styles.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/searchbar/Searchbar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/SearchBar.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/searchbar/Searchbar.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/SearchBar.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/searchbar/Searchbar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/searchbar/Searchbar.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx index be7764527f35..e8e047c0a400 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/searchbar/Searchbar.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx @@ -19,7 +19,7 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import Searchbar from './Searchbar'; +import Searchbar from './SearchBar.component'; jest.useRealTimers(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx index 352e45230c2d..eff1b856d929 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx @@ -24,7 +24,7 @@ import { EntityReference } from '../../../generated/entity/data/table'; import { Paging } from '../../../generated/type/paging'; import { getEntityName } from '../../../utils/EntityUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; -import Searchbar from '../searchbar/Searchbar'; +import Searchbar from '../SearchBarComponent/SearchBar.component'; import '../UserSelectableList/user-select-dropdown.less'; import { UserTag } from '../UserTag/UserTag.component'; import { SelectableListProps } from './SelectableList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx index 680f3ca8bc31..2b94ea3b4a54 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx @@ -19,7 +19,7 @@ jest.mock('../../../components/Loader/Loader', () => ); jest.mock( - '../../../components/common/rich-text-editor/RichTextEditorPreviewer', + '../../../components/common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx index 6a5931c0c07d..9164e9229c75 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx @@ -22,8 +22,8 @@ import { PipelineType } from '../../../generated/entity/services/ingestionPipeli import { fetchMarkdownFile } from '../../../rest/miscAPI'; import { SupportedLocales } from '../../../utils/i18next/i18nextUtil'; import Loader from '../../Loader/Loader'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; -import './ServiceDocPanel.less'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; +import './service-doc-panel.less'; interface ServiceDocPanelProp { serviceName: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.less b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/service-doc-panel.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/service-doc-panel.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/success-screen/SuccessScreen.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/success-screen/SuccessScreen.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/success-screen/SuccessScreen.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/success-screen/SuccessScreen.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx index 7ceeda00ce4d..8ebbb5798323 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/success-screen/SuccessScreen.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx @@ -17,11 +17,11 @@ import React, { ReactNode, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as IconCollateSupport } from '../../../assets/svg/ic-collate-support.svg'; import { ReactComponent as IconSuccessBadge } from '../../../assets/svg/success-badge.svg'; -import Loader from '../../../components/Loader/Loader'; import { AIRFLOW_DOCS } from '../../../constants/docs.constants'; import { PIPELINE_SERVICE_PLATFORM } from '../../../constants/Services.constant'; import { FormSubmitType } from '../../../enums/form.enum'; import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; +import Loader from '../../Loader/Loader'; import AirflowMessageBanner from '../AirflowMessageBanner/AirflowMessageBanner'; export type SuccessScreenProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryTagsDescription/SummaryTagsDescription.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryTagsDescription/SummaryTagsDescription.component.tsx index 2b60319042c9..7794764585a7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryTagsDescription/SummaryTagsDescription.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SummaryTagsDescription/SummaryTagsDescription.component.tsx @@ -13,10 +13,10 @@ import { Col, Divider, Row, Typography } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { EntityUnion } from '../../../components/Explore/explore.interface'; import TagsViewer from '../../../components/Tag/TagsViewer/TagsViewer'; import { TagLabel } from '../../../generated/type/tagLabel'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; +import { EntityUnion } from '../../Explore/ExplorePage.interface'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; const SummaryTagsDescription = ({ tags, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.less b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx index 64eecca9ff41..b683d86685b4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx @@ -32,7 +32,7 @@ import { } from '../../../utils/EntityUtils'; import { getServiceIcon, getUsagePercentile } from '../../../utils/TableUtils'; import { EntityHeader } from '../../Entity/EntityHeader/EntityHeader.component'; -import { SearchedDataProps } from '../../searched-data/SearchedData.interface'; +import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; import TableDataCardBody from '../../TableDataCardBody/TableDataCardBody'; import './TableDataCardV2.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/ConnectionStepCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/ConnectionStepCard.tsx index ae688d38c146..cf6cff7fe85c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/ConnectionStepCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/ConnectionStepCard.tsx @@ -22,7 +22,7 @@ import { ReactComponent as SuccessIcon } from '../../../../assets/svg/success-ba import { TestConnectionStepResult } from '../../../../generated/entity/automations/workflow'; import { TestConnectionStep } from '../../../../generated/entity/services/connections/testConnectionDefinition'; import { requiredField } from '../../../../utils/CommonUtils'; -import './ConnectionStepCard.less'; +import './connection-step-card.less'; const { Panel } = Collapse; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/ConnectionStepCard.less b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/connection-step-card.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/ConnectionStepCard.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/ConnectionStepCard/connection-step-card.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx index b22c62cdb2e8..d0d8cf01607a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx @@ -15,7 +15,7 @@ import { Space } from 'antd'; import classNames from 'classnames'; import React from 'react'; import { TestIndicatorProps } from '../../TableProfiler/TableProfiler.interface'; -import './testIndicator.less'; +import './test-indicator.less'; const TestIndicator: React.FC = ({ value, type }) => { return ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/testIndicator.less b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/test-indicator.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/testIndicator.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/test-indicator.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx index 1108815befd8..c53cbd1f328d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx @@ -79,7 +79,7 @@ jest.mock('antd', () => ({ }), })); -jest.mock('../rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(
RichTextEditorPreviewer
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx index 45f6b5e39e67..391b702c0c6c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx @@ -29,7 +29,7 @@ import { getTags } from '../../../rest/tagAPI'; import { getEntityName } from '../../../utils/EntityUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import Loader from '../../Loader/Loader'; -import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; import './tier-card.style.less'; import { CardWithListItems, TierCardProps } from './TierCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.test.tsx index fdb03ba5e672..a35a1e46b5ff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.test.tsx @@ -14,7 +14,7 @@ import { getAllByTestId, getByTestId, render } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import TitleBreadcrumb from './title-breadcrumb.component'; +import TitleBreadcrumb from './TitleBreadcrumb.component'; describe('Test Breadcrumb Component', () => { const links = [ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx index 76e1cfbcdf24..e29d3d0baf35 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx @@ -22,7 +22,7 @@ import React, { import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import TitleBreadcrumbSkeleton from '../../Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component'; -import { TitleBreadcrumbProps } from './title-breadcrumb.interface'; +import { TitleBreadcrumbProps } from './TitleBreadcrumb.interface'; const TitleBreadcrumb: FunctionComponent = ({ titleLinks, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/common/title-breadcrumb/title-breadcrumb.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts index 14f90b5f6db9..14f2f493e7ad 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/explore.constants.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ExploreSearchIndex } from '../components/Explore/explore.interface'; +import { ExploreSearchIndex } from '../components/Explore/ExplorePage.interface'; import { SortingField } from '../components/Explore/SortingDropDown'; import { SearchIndex } from '../enums/search.enum'; import i18n from '../utils/i18next/LocalUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/hooks/paging/usePaging.ts b/openmetadata-ui/src/main/resources/ui/src/hooks/paging/usePaging.ts index 2c0aede7be0a..d187b3322882 100644 --- a/openmetadata-ui/src/main/resources/ui/src/hooks/paging/usePaging.ts +++ b/openmetadata-ui/src/main/resources/ui/src/hooks/paging/usePaging.ts @@ -10,14 +10,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { useState } from 'react'; -import { PAGE_SIZE_BASE, pagingObject } from '../../constants/constants'; +import { useCallback, useMemo, useState } from 'react'; +import { + INITIAL_PAGING_VALUE, + PAGE_SIZE_BASE, + pagingObject, +} from '../../constants/constants'; import { Paging } from '../../generated/type/paging'; -export const usePaging = () => { +export const usePaging = (defaultPageSize = PAGE_SIZE_BASE) => { const [paging, setPaging] = useState(pagingObject); - const [currentPage, setCurrentPage] = useState(1); - const [pageSize, setPageSize] = useState(PAGE_SIZE_BASE); + const [currentPage, setCurrentPage] = useState(INITIAL_PAGING_VALUE); + const [pageSize, setPageSize] = useState(defaultPageSize); + + const handlePageSize = useCallback( + (page: number) => { + setPageSize(page); + setCurrentPage(INITIAL_PAGING_VALUE); + }, + [setPageSize, setCurrentPage] + ); + + const paginationVisible = useMemo(() => { + return paging.total > pageSize || pageSize !== defaultPageSize; + }, [defaultPageSize, paging, pageSize]); return { paging, @@ -25,6 +41,7 @@ export const usePaging = () => { currentPage, handlePageChange: setCurrentPage, pageSize, - handlePageSizeChange: setPageSize, + handlePageSizeChange: handlePageSize, + showPagination: paginationVisible, }; }; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx index e35c3c7517b8..f3e115954f10 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddAlertPage/AddAlertPage.tsx @@ -35,7 +35,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { AsyncSelect } from '../../components/AsyncSelect/AsyncSelect'; -import RichTextEditor from '../../components/common/rich-text-editor/RichTextEditor'; +import RichTextEditor from '../../components/common/RichTextEditor/RichTextEditor'; import { HTTP_STATUS_CODE } from '../../constants/auth.constants'; import { GlobalSettingOptions, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddDataInsightReportAlert/AddDataInsightReportAlert.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddDataInsightReportAlert/AddDataInsightReportAlert.test.tsx index cfd59aa5f28c..d2380c7b8c6b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddDataInsightReportAlert/AddDataInsightReportAlert.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddDataInsightReportAlert/AddDataInsightReportAlert.test.tsx @@ -21,7 +21,7 @@ let fqn = ''; const mockPush = jest.fn(); const mockBack = jest.fn(); -jest.mock('../../components/common/rich-text-editor/RichTextEditor', () => { +jest.mock('../../components/common/RichTextEditor/RichTextEditor', () => { return jest.fn().mockImplementation(({ initialValue }) => (