Merge branch 'main' into feed-improvements

.github/actions/prepare-for-docker-build-and-push/action.yml

@@ -16,6 +16,12 @@ inputs:
     description: true if we are building an Ingestion image, false otherwise
     required: true
     default: "false"
+  dockerhub_username:
+    description: Dockerhub Username
+    required: true
+  dockerhub_token:
+    description: Dockerhub Token
+    required: true
 
 outputs:
   tags:
@@ -34,17 +40,17 @@ runs:
     - name: Login to DockerHub
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
+        username: ${{ inputs.dockerhub_username }}
+        password: ${{ inputs.dockerhub_token }}
 
     - name: Install Ubuntu dependencies
-      if: ${{ inputs.is_ingestion == "true" }}
+      if: inputs.is_ingestion == true
       shell: bash
       run: |
         sudo apt-get install -y python3-venv
 
     - name: Install open-metadata dependencies
-      if: ${{ inputs.is_ingestion == "true" }}
+      if: inputs.is_ingestion == true
       shell: bash
       run: |
         python3 -m venv env
@@ -57,7 +63,7 @@ runs:
       id:  generate-tags
       shell: bash
       run: |
-          if ${{ inputs.push_latest == "true" }}; then
+          if ${{ inputs.push_latest == 'true' }}; then
               echo "tags=${{ inputs.image }}:${{ inputs.tag }},${{ inputs.image }}:latest" >> $GITHUB_OUTPUT
           else
               echo "tags=${{ inputs.image }}:${{ inputs.tag }}" >> $GITHUB_OUTPUT

.github/workflows/docker-openmetadata-db.yml

@@ -35,6 +35,8 @@ jobs:
           image: openmetadata/db
           tag: ${{ inputs.tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
+          dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
 
 
       - name: Build and push if event is workflow_dispatch and input is checked

.github/workflows/docker-openmetadata-ingestion-base-slim.yml

@@ -36,6 +36,8 @@ jobs:
           tag: ${{ inputs.tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
+          dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
 
       - name: Build and push if event is workflow_dispatch and input is checked
         uses: docker/build-push-action@v3

.github/workflows/docker-openmetadata-ingestion-base.yml

@@ -36,6 +36,8 @@ jobs:
           tag: ${{ inputs.tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
+          dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
 
       - name: Build and push if event is workflow_dispatch and input is checked
         uses: docker/build-push-action@v3

.github/workflows/docker-openmetadata-ingestion.yml

@@ -36,6 +36,8 @@ jobs:
           tag: ${{ inputs.tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
+          dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
 
       - name: Build and push if event is workflow_dispatch and input is checked
         uses: docker/build-push-action@v3

.github/workflows/docker-openmetadata-postgres.yml

@@ -34,7 +34,9 @@ jobs:
         with:
           image: openmetadata/postgresql
           tag: ${{ inputs.tag }}
-          push_latest: ${{ inputs.push_latest_tag_to_release }}
+          push_latest: ${{ inputs.p
+          dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}ush_latest_tag_to_release }}
 
       - name: Build and push if event is workflow_dispatch and input is checked
         uses: docker/build-push-action@v3

.github/workflows/docker-openmetadata-server.yml

@@ -101,7 +101,9 @@ jobs:
         with:
           image: openmetadata/server
           tag: ${{ inputs.DOCKER_RELEASE_TAG }}
-          push_latest: ${{ inputs.push_latest_tag_to_release }}
+          push_latest: ${{ inputs.push_
+          dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}latest_tag_to_release }}
 
       - name: Build and push if event is workflow_dispatch and input is checked
         uses: docker/build-push-action@v3

openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.test.tsx

@@ -52,7 +52,24 @@ jest.mock('../../hooks/useApplicationStore', () => {
   };
 });
 
+jest.mock('../../components/common/Loader/Loader', () => {
+  return jest.fn().mockImplementation(() => <p>Loader</p>);
+});
+
 describe('PermissionProvider', () => {
+  it('Should render loader and call getLoggedInUserPermissions', async () => {
+    render(
+      <PermissionProvider>
+        <div data-testid="children">Children</div>
+      </PermissionProvider>
+    );
+
+    // Verify that the API methods were called
+    expect(getLoggedInUserPermissions).toHaveBeenCalled();
+
+    expect(screen.getByText('Loader')).toBeInTheDocument();
+  });
+
   it('Should render children and call apis when current user is present', async () => {
     render(
       <PermissionProvider>
@@ -82,5 +99,8 @@ describe('PermissionProvider', () => {
     expect(getEntityPermissionById).not.toHaveBeenCalled();
     expect(getEntityPermissionByFqn).not.toHaveBeenCalled();
     expect(getResourcePermission).not.toHaveBeenCalled();
+
+    expect(screen.queryByText('Loader')).not.toBeInTheDocument();
+    expect(await screen.findByTestId('children')).toBeInTheDocument();
   });
 });

openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.tsx

@@ -67,7 +67,7 @@ const PermissionProvider: FC<PermissionProviderProps> = ({ children }) => {
   const { currentUser } = useApplicationStore();
   const cookieStorage = new CookieStorage();
   const history = useHistory();
-  const [loading, setLoading] = useState(false);
+  const [loading, setLoading] = useState(true);
 
   const [entitiesPermission, setEntitiesPermission] =
     useState<EntityPermissionMap>({} as EntityPermissionMap);
@@ -89,7 +89,6 @@ const PermissionProvider: FC<PermissionProviderProps> = ({ children }) => {
    */
   const fetchLoggedInUserPermissions = useCallback(async () => {
     try {
-      setLoading(true);
       const response = await getLoggedInUserPermissions();
       setPermissions(getUIPermission(response.data || []));
       redirectToStoredPath();
@@ -173,6 +172,8 @@ const PermissionProvider: FC<PermissionProviderProps> = ({ children }) => {
      */
     if (!isEmpty(currentUser)) {
       fetchLoggedInUserPermissions();
+    } else {
+      setLoading(false);
     }
     if (isEmpty(currentUser)) {
       resetPermissions();

scripts/update_version.py

@@ -37,7 +37,7 @@ def update_dockerfile_arg(arg, file_path, value):
     regex_sub(
         file_path,
         rf"(ARG\s+{arg}=).+",
-        rf"\1={value}",
+        rf'\1"{value}"',
 
     )