diff --git a/.github/workflows/build-dev-artifacts.yml b/.github/workflows/build-dev-artifacts.yml index 4b35f796..6869a5e5 100644 --- a/.github/workflows/build-dev-artifacts.yml +++ b/.github/workflows/build-dev-artifacts.yml @@ -29,7 +29,7 @@ jobs: run: | echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Configure Composer cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/assets/src/dashboard/parts/connected/settings/FilterControl.js b/assets/src/dashboard/parts/connected/settings/FilterControl.js index 19e43b56..b1ab9bf7 100644 --- a/assets/src/dashboard/parts/connected/settings/FilterControl.js +++ b/assets/src/dashboard/parts/connected/settings/FilterControl.js @@ -102,10 +102,11 @@ const FilterControl = ({ }; }); + const defaultFilterOperator = optimoleDashboardApp.strings.options_strings.filter_operator_contains; const [ filterType, setFilterType ] = useState( FILTER_TYPES.FILENAME ); const [ filterOperator, setFilterOperator ] = useState( optimoleDashboardApp.strings.options_strings.filter_operator_contains ); const [ filterValue, setFilterValue ] = useState( '' ); - const [ filterMatchType, setFilterMatchType ] = useState( optimoleDashboardApp.strings.options_strings.filter_operator_contains ); + const [ filterMatchType, setFilterMatchType ] = useState( defaultFilterOperator ); const [ lengthError, setLengthError ] = useState( false ); const changeFilterType = value => { @@ -127,6 +128,7 @@ const FilterControl = ({ setLengthError( false ); setFilterValue( selectedValue ); setFilterType( value ); + setFilterMatchType( filterValue ); }; const updateFilterValue = value => {