Commit 6ec7521e authored by Dannon Baker's avatar Dannon Baker
Browse files

Merge remote-tracking branch 'upstream/release_24.0' into release_24.1

parents 9421bcd0 8a52443a

.github/workflows/lint_openapi_schema.yml

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ jobs: 
      - uses: actions/setup-python@v5

        with:

          python-version: ${{ matrix.python-version }}

      - uses: actions/setup-node@v4

        with:

          node-version: '18.12.1'

          cache: 'yarn'

          cache-dependency-path: 'galaxy root/client/yarn.lock'

      - name: Get full Python version

        id: full-python-version

        shell: bash

client/src/utils/mountVueComponent.js

+11 −14
Original line number Diff line number Diff line
@@ -26,24 +26,21 @@ function getOrCreatePinia() { 
    // We sometimes use this utility mounting function in a context where there

    // is no existing vue application or pinia store (e.g. individual charts

    // displayed in an iframe).

    // To support both use cases, we will create a new pinia store and attach it to the

    // vue application that is created for the component.

    let pinia = getActivePinia();

    if (!pinia) {

        pinia = createPinia();

    }

    return pinia;

    // To support both use cases, we will create a new pinia store and attach it

    // to the vue application that is created for the component if missing.

    return getActivePinia() || createPinia();

}



export const mountVueComponent = (ComponentDefinition) => {

export function mountVueComponent(ComponentDefinition) {

    const component = Vue.extend(ComponentDefinition);

    return (propsData, el) => new component({ propsData, el, pinia: getOrCreatePinia() });

    return function (propsData, el) {

        return new component({ propsData, el, pinia: getOrCreatePinia() });

    };

}



export const replaceChildrenWithComponent = (el, ComponentDefinition, propsData = {}) => {

export function replaceChildrenWithComponent(el, ComponentDefinition, propsData = {}) {

    const container = document.createElement("div");

    el.replaceChildren(container);

    const component = Vue.extend(ComponentDefinition);

    const mountFn = (propsData, el) => new component({ propsData, el, pinia: getOrCreatePinia() });

    const mountFn = mountVueComponent(ComponentDefinition);

    return mountFn(propsData, container);

};
 
}

config/job_conf.yml.interactivetools

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ execution: 


      #docker_cmd: /usr/local/custom_docker/docker

      #docker_host:

      #docker_container_id_override: busybox:ubuntu-14.04

      #docker_default_container_id: busybox:ubuntu-14.04

      #docker_container_id_override: busybox:1.36.1-glibc

      #docker_default_container_id: busybox:1.36.1-glibc

      #require_container: true

      #container_monitor: true

      #container_monitor_result: file

doc/source/admin/jobs.md

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ execution: 
      k8s_namespace: default

      runner: pulsar_k8s

      docker_enabled: true

      docker_default_container_id: busybox:ubuntu-14.04

      docker_default_container_id: busybox:1.36.1-glibc

      pulsar_app_config:

        message_queue_url: 'amqp://guest:guest@host.docker.internal:5672//'

    local_environment:

doc/source/admin/special_topics/interactivetools.rst

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ An example ``job_conf.yml`` file as seen in ``config/job_conf.yml.interactivetoo 


          #docker_cmd: /usr/local/custom_docker/docker

          #docker_host:

          #docker_container_id_override: busybox:ubuntu-14.04

          #docker_default_container_id: busybox:ubuntu-14.04

          #docker_container_id_override: busybox:1.36.1-glibc

          #docker_default_container_id: busybox:1.36.1-glibc

          #require_container: true

          #container_monitor: true

          #container_monitor_result: file