change feed filters to better version

CESNET · May 24, 2024 · f4331c7 · f4331c7
1 parent 195bd57
commit f4331c7
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 11 deletions.
diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php
@@ -70,12 +70,14 @@ public function store(StoreFederation $request)
     {
         $this->authorize('create', Federation::class);
 
+
         $validated = $request->validated();
         $id = generateFederationID($validated['name']);
+
+
+
         $federation = DB::transaction(function () use ($validated, $id) {
             $federation = Federation::create(array_merge($validated, [
-                'tagfile' => "$id.tag",
-                'cfgfile' => "$id.cfg",
                 'xml_id' => $id,
                 'xml_name' => "urn:mace:cesnet.cz:$id",
                 'filters' => $id,
@@ -164,9 +166,23 @@ public function update(UpdateFederation $request, Federation $federation)
                     ->with('status', __('federations.approved', ['name' => $federation->name]));
 
             case 'update':
+
+
                 $this->authorize('update', $federation);
 
                 $validated = $request->validated();
+                $id = generateFederationID($validated['name']);
+
+                $additionalFilters = $request->input('sp_and_ip_feed', 0);
+                $filters = $id;
+
+                if($additionalFilters){
+                    $filters .= ', '.$id.'+idp';
+                    $filters .= ', '.$id.'+sp';
+                }
+                $validated['filters'] = $filters;
+                $validated['additional_filters'] = $additionalFilters;
+
                 $federation->update($validated);
 
                 if (! $federation->wasChanged()) {

diff --git a/lang/cs/common.php b/lang/cs/common.php
@@ -130,4 +130,5 @@
     'metadata' => 'Metadata',
     'confirm' => 'Potvrdit',
     'organization' => 'Organizace',
+    'add_sp_idp' => 'Přidat IdP a Sp feedy',
 ];
diff --git a/lang/cs/federations.php b/lang/cs/federations.php
@@ -44,4 +44,5 @@
     'updated' => 'Federace byla úspěšně upravena.',
     'xml_id' => 'Atribut XML ID',
     'xml_name' => 'Atribut XML Name',
+    'add_sp_and_idp' => 'Přidat SP & IDP',
 ];
diff --git a/lang/en/common.php b/lang/en/common.php
@@ -130,4 +130,5 @@
     'metadata' => 'Metadata',
     'confirm' => 'Confirm',
     'organization' => 'Organization',
+    'add_sp_idp' => 'Add additional IdP and Sp  feeds',
 ];
diff --git a/lang/en/federations.php b/lang/en/federations.php
@@ -44,4 +44,5 @@
     'updated' => 'Federation has been successfully updated.',
     'xml_id' => 'XML ID attribute',
     'xml_name' => 'XML Name attribute',
+    'add_sp_and_idp' => 'Add SP & IDP',
 ];
diff --git a/resources/views/federations/create.blade.php b/resources/views/federations/create.blade.php
@@ -20,6 +20,7 @@
 
     </x-forms.section.form-body-section>
 
+
     <x-forms.section.form-body-section
         name="common.description"
         label="name"
@@ -43,5 +44,22 @@
 
     </x-forms.section.form-body-section>
 
+
+
+{{--
+
+    <x-forms.section.form-body-section
+        name="common.add_sp_idp"
+        label="add_sp_and_idp_section"
+    >
+        <label for="use_sp">
+            <input type="checkbox" name="sp_and_ip_feed" id="sp_and_ip_feed" value="1" {{ old('sp_and_ip_feed') ? 'checked' : '' }}>
+            {{ __('federations.add_sp_and_idp') }}
+        </label>
+    </x-forms.section.form-body-section>
+
+--}}
+
+
 @endsection
 
diff --git a/resources/views/federations/edit.blade.php b/resources/views/federations/edit.blade.php
@@ -60,15 +60,17 @@
     </x-forms.section.form-body-section>
 
     <x-forms.section.form-body-section
-        name="federations.filters"
-        label="filters"
+        name="common.add_sp_idp"
+        label="add_sp_and_idp_section"
     >
-        <x-forms.element.input err="filters">
-            type="text" name="filters" id="filters" maxlength="32"
-            placeholder="{{ __('federations.name_placeholder') }}"
-            value="{{ $federation->filters }}" required
-        </x-forms.element.input>
+        <label for="use_sp">
+
+            <input type="checkbox" name="sp_and_ip_feed" id="sp_and_ip_feed" value="1"  {{ $federation->additional_filters == 1 ? 'checked' : '' }}>
+            <span class="{{ $federation->additional_filters == 1 ? 'checked-label' : 'unchecked-label' }}">
+                {{ __('federations.add_sp_and_idp') }}
+            </span>
 
+        </label>
     </x-forms.section.form-body-section>
 
 @endsection
diff --git a/resources/views/federations/show.blade.php b/resources/views/federations/show.blade.php
@@ -67,6 +67,9 @@
 
 @section('admin_section')
 
+
+
+
     <x-element.body-section>
         <x-slot name="dt">
             {{ __('federations.tagfile') }}
@@ -91,16 +94,24 @@
         </x-slot>
     </x-element.body-section>
 
+
     <x-element.body-section>
         <x-slot name="dt">
-            {{ __('federations.filters') }}
+            {{ __('common.add_sp_idp') }}
         </x-slot>
 
         <x-slot name="dd">
-            {{ $federation->filters }}
+            <label for="use_sp" class="checkbox-label">
+                <input type="checkbox" name="sp_and_ip_feed" id="sp_and_ip_feed" value="1" disabled {{ $federation->additional_filters == 1 ? 'checked' : '' }}>
+                <span class="{{ $federation->additional_filters == 1 ? 'checked-label' : 'unchecked-label' }}">
+                {{ __('federations.add_sp_and_idp') }}
+            </span>
+            </label>
         </x-slot>
     </x-element.body-section>
 
+
+
 @endsection
 
 @section('specific_condition')