Compare commits
No commits in common. "9d3bb4e4e323c95ede546007529a8da795e627fe" and "1451991d0358d704c66891ae940915a601f56507" have entirely different histories.
9d3bb4e4e3
...
1451991d03
@ -22,7 +22,6 @@
|
|||||||
"svelte-filepond": "0.0.1",
|
"svelte-filepond": "0.0.1",
|
||||||
"svelte-focus-trap": "1.0.1",
|
"svelte-focus-trap": "1.0.1",
|
||||||
"svelte-i18n": "3.3.0",
|
"svelte-i18n": "3.3.0",
|
||||||
"svelte-select": "^3.16.1",
|
|
||||||
"tailwindcss": "2.0.2",
|
"tailwindcss": "2.0.2",
|
||||||
"tinro": "0.5.12",
|
"tinro": "0.5.12",
|
||||||
"toastify-js": "1.9.3",
|
"toastify-js": "1.9.3",
|
||||||
|
@ -1,41 +1,14 @@
|
|||||||
<script>
|
<script>
|
||||||
import { _ } from "svelte-i18n";
|
import { _ } from "svelte-i18n";
|
||||||
import { RunnerService,RunnerTeamService,
|
import { RunnerService } from "@odit/lfk-client-js";
|
||||||
RunnerOrganizationService, } from "@odit/lfk-client-js";
|
|
||||||
import store from "../store";
|
import store from "../store";
|
||||||
import RunnersEmptyState from "./RunnersEmptyState.svelte";
|
import RunnersEmptyState from "./RunnersEmptyState.svelte";
|
||||||
import Select from 'svelte-select';
|
|
||||||
$: searchvalue = "";
|
$: searchvalue = "";
|
||||||
$: active_deletes = [];
|
$: active_deletes = [];
|
||||||
export let current_runners = [];
|
export let current_runners = [];
|
||||||
const runners_promise = RunnerService.runnerControllerGetAll().then((val) => {
|
const runners_promise = RunnerService.runnerControllerGetAll().then((val) => {
|
||||||
current_runners = val;
|
current_runners = val;
|
||||||
});
|
});
|
||||||
$: selectedFilter_teams = null;
|
|
||||||
$: selectedFilter = null;
|
|
||||||
$: filter__teams = selectedFilter_teams||[];
|
|
||||||
$: filter__orgs = selectedFilter||[];
|
|
||||||
$:filterGroupIDs=filter__teams.concat(filter__orgs).map(i=>i.value)
|
|
||||||
$: teams = [];
|
|
||||||
$: orgs = [];
|
|
||||||
$:mappedteams=teams.map(function(g){
|
|
||||||
return {value:g.id,label:g.parentGroup.name+" > "+g.name}
|
|
||||||
})
|
|
||||||
$:selectgroups=(orgs.map(function(g){
|
|
||||||
return {value:g.id,label:g.name}
|
|
||||||
})).concat(mappedteams)
|
|
||||||
RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
|
|
||||||
teams = val;
|
|
||||||
});
|
|
||||||
RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
|
|
||||||
orgs = val;
|
|
||||||
});
|
|
||||||
function should_display_based_on_id(id) {
|
|
||||||
if(searchvalue.toString().slice(-1)==="*"){
|
|
||||||
return id.toString().startsWith(searchvalue.replace("*",""))
|
|
||||||
}
|
|
||||||
return id.toString()===searchvalue;
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:GET')}
|
{#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:GET')}
|
||||||
@ -56,12 +29,6 @@
|
|||||||
placeholder={$_('datatable.search')}
|
placeholder={$_('datatable.search')}
|
||||||
aria-label={$_('datatable.search')}
|
aria-label={$_('datatable.search')}
|
||||||
class="gridjs-input gridjs-search-input mb-4" />
|
class="gridjs-input gridjs-search-input mb-4" />
|
||||||
<div class="block mb-1">
|
|
||||||
<label for="country" class="text-sm font-medium text-gray-700">Filter by Organization/ Team</label>
|
|
||||||
<Select on:select={(event)=>{
|
|
||||||
selectedFilter=event.detail
|
|
||||||
}} selectedValue={selectedFilter} placeholder="Filter by Organization/ Team" containerClasses="mt-1 py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" items={selectgroups} isMulti={true}></Select>
|
|
||||||
</div>
|
|
||||||
<div
|
<div
|
||||||
class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
|
class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
|
||||||
<table class="divide-y divide-gray-200 w-full">
|
<table class="divide-y divide-gray-200 w-full">
|
||||||
@ -94,9 +61,11 @@
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody class="divide-y divide-gray-200">
|
<tbody class="divide-y divide-gray-200">
|
||||||
{#each current_runners as runner}
|
{#each current_runners as runner}
|
||||||
{#if runner.firstname.toLowerCase().includes(searchvalue.toLowerCase())||runner.middlename.toLowerCase().includes(searchvalue.toLowerCase())||runner.lastname.toLowerCase().includes(searchvalue.toLowerCase())||should_display_based_on_id(runner.id)}
|
{#if Object.values(runner)
|
||||||
{#if filterGroupIDs.includes(runner.group.id)||filterGroupIDs.includes(runner.group.parentGroup?.id)||filterGroupIDs.length===0}
|
.toString()
|
||||||
<tr data-rowid="user_{runner.id}" data-groupid={runner.group.id}>
|
.toLowerCase()
|
||||||
|
.includes(searchvalue)}
|
||||||
|
<tr data-rowid="user_{runner.id}">
|
||||||
<td class="px-6 py-4 whitespace-nowrap">
|
<td class="px-6 py-4 whitespace-nowrap">
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
<div class="ml-4">
|
<div class="ml-4">
|
||||||
@ -169,7 +138,6 @@
|
|||||||
</td>
|
</td>
|
||||||
{/if}
|
{/if}
|
||||||
</tr>
|
</tr>
|
||||||
{/if}
|
|
||||||
{/if}
|
{/if}
|
||||||
{/each}
|
{/each}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user